Replace DockerClientFactory with DockerClientBuilder

Marcus Linke · Marcus Linke · commit 4efff138c0f2 · 2014-09-13T11:59:27.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -56,7 +56,7 @@ public static DockerClientImpl getInstance(String serverUrl) {
     	return new DockerClientImpl(serverUrl);
     }
     
-    public DockerClient withDockerCmdExecFactory(
+    public DockerClientImpl withDockerCmdExecFactory(
     		DockerCmdExecFactory dockerCmdExecFactory) {
     	Preconditions.checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");
 		this.dockerCmdExecFactory = dockerCmdExecFactory;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/jaxrs/DockerClientBuilder.java
@@ -0,0 +1,46 @@
+package com.github.dockerjava.jaxrs;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.DockerCmdExecFactory;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.DockerClientImpl;
+
+public class DockerClientBuilder {
+
+	private DockerClientImpl dockerClient = null;
+
+	private DockerClientBuilder(DockerClientImpl dockerClient) {
+		this.dockerClient = dockerClient;
+	}
+
+	public static DockerClientBuilder getInstance() {
+		return new DockerClientBuilder(withDefaultDockerCmdExecFactory(DockerClientImpl.getInstance()));
+	}
+
+	public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) {
+		return new DockerClientBuilder(withDefaultDockerCmdExecFactory(DockerClientImpl
+				.getInstance(dockerClientConfig)));
+	}
+
+	public static DockerClientBuilder getInstance(String serverUrl) {
+		return new DockerClientBuilder(withDefaultDockerCmdExecFactory(DockerClientImpl
+				.getInstance(serverUrl)));
+	}
+
+	private static DockerClientImpl withDefaultDockerCmdExecFactory(
+			DockerClientImpl dockerClient) {
+		return dockerClient
+				.withDockerCmdExecFactory(new DockerCmdExecFactoryImpl());
+	}
+
+	public DockerClientBuilder withDockerCmdExecFactory(
+			DockerCmdExecFactory dockerCmdExecFactory) {
+		dockerClient = dockerClient
+				.withDockerCmdExecFactory(dockerCmdExecFactory);
+		return this;
+	}
+
+	public DockerClient build() {
+		return dockerClient;
+	}
+}
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerClientFactory.java b/src/main/java/com/github/dockerjava/jaxrs/DockerClientFactory.java
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -3,7 +3,7 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.jaxrs.DockerClientFactory;
+import com.github.dockerjava.jaxrs.DockerClientBuilder;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
@@ -35,7 +35,7 @@ public abstract class AbstractDockerClientTest extends Assert {
 	public void beforeTest()  {
 		LOG.info("======================= BEFORETEST =======================");
 		LOG.info("Connecting to Docker server");
-		dockerClient = DockerClientFactory.getInstance();
+		dockerClient = DockerClientBuilder.getInstance().build();
 
 		LOG.info("Pulling image 'busybox'");
 		// need to block until image is pulled completely
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -15,7 +15,7 @@
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.jaxrs.DockerClientFactory;
+import com.github.dockerjava.jaxrs.DockerClientBuilder;
 
 public class AuthCmdImplTest extends AbstractDockerClientTest {
 
@@ -47,7 +47,7 @@ public void testAuth() throws Exception {
 	@Test
 	public void testAuthInvalid() throws Exception {
 		DockerClientConfig config = DockerClientConfig.createDefaultConfigBuilder().withPassword("garbage").build();
-		DockerClient client = DockerClientFactory.getInstance(config);
+		DockerClient client = DockerClientBuilder.getInstance(config).build();
         
 		try {
 			client.authCmd().exec();

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public static DockerClientImpl getInstance(String serverUrl) {`
`56`	`56`	`return new DockerClientImpl(serverUrl);`
`57`	`57`	`}`
`58`	`58`
`59`		`- public DockerClient withDockerCmdExecFactory(`
	`59`	`+ public DockerClientImpl withDockerCmdExecFactory(`
`60`	`60`	`DockerCmdExecFactory dockerCmdExecFactory) {`
`61`	`61`	`Preconditions.checkNotNull(dockerCmdExecFactory, "dockerCmdExecFactory was not specified");`
`62`	`62`	`this.dockerCmdExecFactory = dockerCmdExecFactory;`