Merge pull request #83 from sabre1041/custom-exec-factory

marcuslinke · marcuslinke · commit a7a1b91bf84d · 2014-10-28T07:15:38.000+01:00
Loading of custom DockerCmdExecFactory
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -11,36 +11,28 @@ 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(withDefaultDockerCmdExecFactory(DockerClientImpl.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(withDefaultDockerCmdExecFactory(DockerClientImpl
-				.getInstance(dockerClientConfig)));
+		return new DockerClientBuilder(DockerClientImpl
+				.getInstance(dockerClientConfig));
 	}
 
 	public static DockerClientBuilder getInstance(String serverUrl) {
-		return new DockerClientBuilder(withDefaultDockerCmdExecFactory(DockerClientImpl
-				.getInstance(serverUrl)));
-	}
-
-	private static DockerClientImpl withDefaultDockerCmdExecFactory(
-			DockerClientImpl dockerClient) {
-		
-		DockerCmdExecFactory dockerCmdExecFactory = getDefaultDockerCmdExecFactory();
-		
-		return dockerClient
-				.withDockerCmdExecFactory(dockerCmdExecFactory);
+		return new DockerClientBuilder(DockerClientImpl
+				.getInstance(serverUrl));
 	}
 
 	public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
@@ -53,12 +45,18 @@ public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
 
 	public DockerClientBuilder withDockerCmdExecFactory(
 			DockerCmdExecFactory dockerCmdExecFactory) {
-		dockerClient = dockerClient
-				.withDockerCmdExecFactory(dockerCmdExecFactory);
+		this.dockerCmdExecFactory = dockerCmdExecFactory;
 		return this;
 	}
 
 	public DockerClient build() {
+	        if(dockerCmdExecFactory != null) {
+	            dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory);
+	        }
+	        else {
+	            dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory());
+	        }
+	        
 		return dockerClient;
 	}
 }
