Move DockerClientBuilder to core

Marcus Linke · Marcus Linke · commit 7a5df6386561 · 2014-10-02T21:04:54.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -1,11 +1,13 @@
-package com.github.dockerjava.jaxrs;
+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;
-import com.github.dockerjava.core.DockerClientImpl;
 
 public class DockerClientBuilder {
+	
+	private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);
 
 	private DockerClientImpl dockerClient = null;
 
@@ -29,8 +31,19 @@ public static DockerClientBuilder getInstance(String serverUrl) {
 
 	private static DockerClientImpl withDefaultDockerCmdExecFactory(
 			DockerClientImpl dockerClient) {
+		
+		DockerCmdExecFactory dockerCmdExecFactory = getDefaultDockerCmdExecFactory();
+		
 		return dockerClient
-				.withDockerCmdExecFactory(new DockerCmdExecFactoryImpl());
+				.withDockerCmdExecFactory(dockerCmdExecFactory);
+	}
+
+	public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
+		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(
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
@@ -0,0 +1 @@
+com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -16,9 +16,8 @@
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.TestDockerCmdExecFactory;
-import com.github.dockerjava.jaxrs.DockerClientBuilder;
-import com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl;
 
 public abstract class AbstractDockerClientTest extends Assert {
 	
@@ -27,7 +26,7 @@ public abstract class AbstractDockerClientTest extends Assert {
 	
 	protected DockerClient dockerClient;
 
-	protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(new DockerCmdExecFactoryImpl());
+	protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory());
 
 	public void beforeTest()  {
 		LOG.info("======================= BEFORETEST =======================");
diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -13,8 +13,8 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.UnauthorizedException;
 import com.github.dockerjava.client.AbstractDockerClientTest;
+import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.jaxrs.DockerClientBuilder;
 
 public class AuthCmdImplTest extends AbstractDockerClientTest {
 
@@ -53,8 +53,6 @@ public void testAuthInvalid() throws Exception {
             fail("Expected a UnauthorizedException caused by a bad password.");
 		} catch (UnauthorizedException e) {
 			
-		} finally {
-			client.close();
-		}
+		} 
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl`