Renames Config to DockerClientConfig

mfulgo · mfulgo · commit b7bbcfe73c71 · 2014-08-01T17:39:32.000-04:00
Having a slightly less generic class name is probably a good thing...
diff --git a/src/main/java/com/github/dockerjava/client/DockerClient.java b/src/main/java/com/github/dockerjava/client/DockerClient.java
@@ -70,55 +70,55 @@ public class DockerClient implements Closeable {
 
 
 	public DockerClient() {
-		this(Config.createDefaultConfigBuilder().build());
+		this(DockerClientConfig.createDefaultConfigBuilder().build());
 	}
 
 	public DockerClient(String serverUrl) {
 		this(configWithServerUrl(serverUrl));
 	}
 
 
-	private static Config configWithServerUrl(String serverUrl) {
-		return Config.createDefaultConfigBuilder()
+	private static DockerClientConfig configWithServerUrl(String serverUrl) {
+		return DockerClientConfig.createDefaultConfigBuilder()
                 .withUri(serverUrl)
                 .build();
 	}
 
 
-    public DockerClient(Config config) {
-        this(config, new DefaultCommandFactory());
+    public DockerClient(DockerClientConfig dockerClientConfig) {
+        this(dockerClientConfig, new DefaultCommandFactory());
     }
 
-	public DockerClient(Config config, CommandFactory cmdFactory) {
+	public DockerClient(DockerClientConfig dockerClientConfig, CommandFactory cmdFactory) {
         this.cmdFactory = cmdFactory;
 
-        HttpClient httpClient = getPoolingHttpClient(config);
+        HttpClient httpClient = getPoolingHttpClient(dockerClientConfig);
         ClientConfig clientConfig = new DefaultClientConfig();
 		client = new ApacheHttpClient4(new ApacheHttpClient4Handler(httpClient,
 				null, false), clientConfig);
 
-		if(config.getReadTimeout() != null) {
-			client.setReadTimeout(config.getReadTimeout());
+		if(dockerClientConfig.getReadTimeout() != null) {
+			client.setReadTimeout(dockerClientConfig.getReadTimeout());
 		}
 
 		client.addFilter(new JsonClientFilter());
 
-		if (config.isLoggingFilterEnabled())
+		if (dockerClientConfig.isLoggingFilterEnabled())
 			client.addFilter(new SelectiveLoggingFilter());
 
-		WebResource webResource = client.resource(config.getUri());
+		WebResource webResource = client.resource(dockerClientConfig.getUri());
 
-		if(config.getVersion() != null) {
-			baseResource = webResource.path("v" + config.getVersion());
+		if(dockerClientConfig.getVersion() != null) {
+			baseResource = webResource.path("v" + dockerClientConfig.getVersion());
 		} else {
 			baseResource = webResource;
 		}
 	}
 
 
-    private HttpClient getPoolingHttpClient(Config config) {
+    private HttpClient getPoolingHttpClient(DockerClientConfig dockerClientConfig) {
         SchemeRegistry schemeRegistry = new SchemeRegistry();
-        schemeRegistry.register(new Scheme("http", config.getUri().getPort(),
+        schemeRegistry.register(new Scheme("http", dockerClientConfig.getUri().getPort(),
                 PlainSocketFactory.getSocketFactory()));
         schemeRegistry.register(new Scheme("https", 443, SSLSocketFactory
                 .getSocketFactory()));
@@ -162,11 +162,11 @@ public AuthConfig authConfig() throws DockerException {
 	private static AuthConfig authConfigFromProperties() throws DockerException {
 		final AuthConfig a = new AuthConfig();
 
-        // TODO This should probably come from the Config used to create the DockerClient.
-        Config defaultConfig = Config.createDefaultConfigBuilder().build();
-		a.setUsername(defaultConfig.getUsername());
-		a.setPassword(defaultConfig.getPassword());
-		a.setEmail(defaultConfig.getEmail());
+        // TODO This should probably come from the DockerClientConfig used to create the DockerClient.
+        DockerClientConfig defaultDockerClientConfig = DockerClientConfig.createDefaultConfigBuilder().build();
+		a.setUsername(defaultDockerClientConfig.getUsername());
+		a.setPassword(defaultDockerClientConfig.getPassword());
+		a.setEmail(defaultDockerClientConfig.getEmail());
 
 		if (a.getUsername() == null) {
 			throw new IllegalStateException("username is null");
diff --git a/src/main/java/com/github/dockerjava/client/DockerClientConfig.java b/src/main/java/com/github/dockerjava/client/DockerClientConfig.java
@@ -8,13 +8,13 @@
 
 import com.google.common.base.Preconditions;
 
-public class Config {
+public class DockerClientConfig {
     private final URI uri;
     private final String version, username, password, email;
     private final Integer readTimeout;
     private final boolean loggingFilterEnabled;
 
-    private Config(DockerClientConfigBuilder builder) {
+    private DockerClientConfig(DockerClientConfigBuilder builder) {
         this.uri = builder.uri;
         this.version = builder.version;
         this.username = builder.username;
@@ -55,7 +55,7 @@ public boolean isLoggingFilterEnabled() {
     public static Properties loadIncludedDockerProperties() {
         try {
             Properties p = new Properties();
-            p.load(Config.class.getResourceAsStream("/docker.io.properties"));
+            p.load(DockerClientConfig.class.getResourceAsStream("/docker.io.properties"));
             return p;
         } catch (IOException e) {
             throw new DockerException(e);
@@ -170,8 +170,8 @@ public final DockerClientConfigBuilder withLoggingFilter(boolean loggingFilterEn
             this.loggingFilterEnabled = loggingFilterEnabled;
             return this;
         }
-        public Config build() {
-            return new Config(this);
+        public DockerClientConfig build() {
+            return new DockerClientConfig(this);
         }
     }
 }
