Merge branch 'master' into master-vuminhkh

vuminhkh · vuminhkh · commit 28c6f94a2d98 · 2015-10-30T18:13:02.000+01:00
* master: Update CHANGELOG.md issue #349
diff --git 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 
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);
