Merge branch 'master' into issue-246

Marcus Linke · Marcus Linke · commit 9fcfee3fe3fc · 2015-11-04T16:44:33.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 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
 * [#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 
diff --git 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:
 
@@ -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
diff --git 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.3-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
diff --git 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,28 +32,14 @@ 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) {
         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);
