From 2e315103591ab8cea58b218cb7b2804b58e18af9 Mon Sep 17 00:00:00 2001 From: Marcus Linke Date: Sun, 26 Jul 2015 20:16:48 +0200 Subject: [PATCH] Remove JAXRS/ApacheConnector implementation specific properties from DockerClientConfig --- .../dockerjava/core/DockerClientConfig.java | 112 +----------------- .../jaxrs/DockerCmdExecFactoryImpl.java | 86 +++++++++++--- .../filter}/FollowRedirectsFilter.java | 2 +- .../filter}/JsonClientFilter.java | 2 +- .../util => jaxrs/filter}/LoggingFilter.java | 2 +- .../ResponseStatusExceptionFilter.java | 2 +- .../filter}/SelectiveLoggingFilter.java | 2 +- .../core/DockerClientConfigTest.java | 11 +- .../dockerjava/core/DockerClientImplTest.java | 3 +- 9 files changed, 85 insertions(+), 137 deletions(-) rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/FollowRedirectsFilter.java (96%) rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/JsonClientFilter.java (94%) rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/LoggingFilter.java (99%) rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/ResponseStatusExceptionFilter.java (98%) rename src/main/java/com/github/dockerjava/{core/util => jaxrs/filter}/SelectiveLoggingFilter.java (96%) diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index a96f61556..800ed5772 100644 --- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -40,22 +40,10 @@ public class DockerClientConfig implements Serializable { private static final String DOCKER_IO_SERVER_ADDRESS_PROPERTY = "docker.io.serverAddress"; - private static final String DOCKER_IO_READ_TIMEOUT_PROPERTY = "docker.io.readTimeout"; - - // this is really confusing, as there are two ways to spell it - private static final String DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY = "docker.io.enableLoggingFilter"; - - private static final String DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY = "docker.io.followRedirectsFilter"; - private static final String DOCKER_IO_DOCKER_CERT_PATH_PROPERTY = "docker.io.dockerCertPath"; private static final String DOCKER_IO_DOCKER_CFG_PATH_PROPERTY = "docker.io.dockerCfgPath"; - // connection pooling properties - private static final String DOCKER_IO_MAX_PER_ROUTE_PROPERTY = "docker.io.perRouteConnections"; - - private static final String DOCKER_IO_MAX_TOTAL_PROPERTY = "docker.io.totalConnections"; - /** * A map from the environment name to the interval name. */ @@ -69,9 +57,6 @@ public class DockerClientConfig implements Serializable { m.put("DOCKER_PASSWORD", DOCKER_IO_PASSWORD_PROPERTY); m.put("DOCKER_EMAIL", DOCKER_IO_EMAIL_PROPERTY); m.put("DOCKER_SERVER_ADDRESS", DOCKER_IO_SERVER_ADDRESS_PROPERTY); - m.put("DOCKER_READ_TIMEOUT", DOCKER_IO_READ_TIMEOUT_PROPERTY); - m.put("DOCKER_LOGGING_FILTER_ENABLED", DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY); - m.put("DOCKER_FOLLOW_REDIRECTS_FILTER_ENABLED", DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY); m.put(DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY); m.put("DOCKER_CFG_PATH", DOCKER_IO_DOCKER_CFG_PATH_PROPERTY); ENV_NAME_TO_IO_NAME = Collections.unmodifiableMap(m); @@ -83,21 +68,10 @@ public class DockerClientConfig implements Serializable { private final String version, username, password, email, serverAddress, dockerCfgPath; - private final Integer readTimeout; - - private final boolean loggingFilterEnabled; - - private final boolean followRedirectsFilterEnabled; - private final SSLConfig sslConfig; - private final Integer maxTotalConnections; - - private final Integer maxPerRouteConnections; - DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress, - String dockerCfgPath, Integer readTimeout, boolean loggingFilterEnabled, - boolean followRedirectsFilterEnabled, SSLConfig sslConfig, Integer maxTotalConns, Integer maxPerRouteConns) { + String dockerCfgPath, SSLConfig sslConfig) { this.uri = uri; this.version = version; this.username = username; @@ -105,12 +79,7 @@ public class DockerClientConfig implements Serializable { this.email = email; this.serverAddress = serverAddress; this.dockerCfgPath = dockerCfgPath; - this.readTimeout = readTimeout; - this.loggingFilterEnabled = loggingFilterEnabled; - this.followRedirectsFilterEnabled = followRedirectsFilterEnabled; this.sslConfig = sslConfig; - this.maxTotalConnections = maxTotalConns; - this.maxPerRouteConnections = maxPerRouteConns; } private static Properties loadIncludedDockerProperties(Properties systemProperties) { @@ -208,8 +177,7 @@ private static Properties overrideDockerPropertiesWithSystemProperties(Propertie for (String key : new String[] { DOCKER_IO_URL_PROPERTY, DOCKER_IO_VERSION_PROPERTY, DOCKER_IO_USERNAME_PROPERTY, DOCKER_IO_PASSWORD_PROPERTY, DOCKER_IO_EMAIL_PROPERTY, - DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_READ_TIMEOUT_PROPERTY, - DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY, + DOCKER_IO_SERVER_ADDRESS_PROPERTY, DOCKER_IO_DOCKER_CERT_PATH_PROPERTY, DOCKER_IO_DOCKER_CFG_PATH_PROPERTY, }) { if (systemProperties.containsKey(key)) { overriddenProperties.setProperty(key, systemProperties.getProperty(key)); @@ -261,18 +229,6 @@ public String getServerAddress() { return serverAddress; } - public Integer getReadTimeout() { - return readTimeout; - } - - public boolean isLoggingFilterEnabled() { - return loggingFilterEnabled; - } - - public boolean followRedirectsFilterEnabled() { - return followRedirectsFilterEnabled; - } - public SSLConfig getSslConfig() { return sslConfig; } @@ -281,14 +237,6 @@ public String getDockerCfgPath() { return dockerCfgPath; } - public Integer getMaxTotalConnections() { - return maxTotalConnections; - } - - public Integer getMaxPerRoutConnections() { - return maxPerRouteConnections; - } - private AuthConfig getAuthConfig() { AuthConfig authConfig = null; if (getUsername() != null && getPassword() != null && getEmail() != null && getServerAddress() != null) { @@ -352,8 +300,6 @@ public boolean equals(Object o) { DockerClientConfig that = (DockerClientConfig) o; - if (loggingFilterEnabled != that.loggingFilterEnabled) - return false; if (sslConfig != null ? !sslConfig.equals(that.sslConfig) : that.sslConfig != null) return false; if (dockerCfgPath != null ? !dockerCfgPath.equals(that.dockerCfgPath) : that.dockerCfgPath != null) @@ -362,8 +308,6 @@ public boolean equals(Object o) { return false; if (password != null ? !password.equals(that.password) : that.password != null) return false; - if (readTimeout != null ? !readTimeout.equals(that.readTimeout) : that.readTimeout != null) - return false; if (serverAddress != null ? !serverAddress.equals(that.serverAddress) : that.serverAddress != null) return false; if (uri != null ? !uri.equals(that.uri) : that.uri != null) @@ -386,8 +330,6 @@ public int hashCode() { result = 31 * result + (serverAddress != null ? serverAddress.hashCode() : 0); result = 31 * result + (dockerCfgPath != null ? dockerCfgPath.hashCode() : 0); result = 31 * result + (sslConfig != null ? sslConfig.hashCode() : 0); - result = 31 * result + (readTimeout != null ? readTimeout.hashCode() : 0); - result = 31 * result + (loggingFilterEnabled ? 1 : 0); return result; } @@ -396,8 +338,7 @@ public String toString() { return "DockerClientConfig{" + "uri=" + uri + ", version='" + version + '\'' + ", username='" + username + '\'' + ", password='" + password + '\'' + ", email='" + email + '\'' + ", serverAddress='" + serverAddress + '\'' + ", dockerCfgPath='" + dockerCfgPath + '\'' + ", sslConfig='" + sslConfig + '\'' - + ", readTimeout=" + readTimeout + ", loggingFilterEnabled=" + loggingFilterEnabled - + ", followRedirectsFilterEnabled=" + followRedirectsFilterEnabled + '}'; + + '}'; } public static class DockerClientConfigBuilder { @@ -405,10 +346,6 @@ public static class DockerClientConfigBuilder { private String version, username, password, email, serverAddress, dockerCfgPath; - private Integer readTimeout, maxTotalConnections, maxPerRouteConnections; - - private boolean loggingFilterEnabled, followRedirectsFilterEnabled; - private SSLConfig sslConfig; /** @@ -424,21 +361,8 @@ public DockerClientConfigBuilder withProperties(Properties p) { .withPassword(p.getProperty(DOCKER_IO_PASSWORD_PROPERTY)) .withEmail(p.getProperty(DOCKER_IO_EMAIL_PROPERTY)) .withServerAddress(p.getProperty(DOCKER_IO_SERVER_ADDRESS_PROPERTY)) - .withReadTimeout(Integer.valueOf(p.getProperty(DOCKER_IO_READ_TIMEOUT_PROPERTY, "0"))) - .withLoggingFilter(Boolean.valueOf(p.getProperty(DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, "true"))) - .withFollowRedirectsFilter( - Boolean.valueOf(p.getProperty(DOCKER_IO_FOLLOW_REDIRECTS_FILTER_PROPERTY, "false"))) .withDockerCertPath(p.getProperty(DOCKER_IO_DOCKER_CERT_PATH_PROPERTY)) - .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY)) - .withMaxPerRouteConnections(integerValue(p.getProperty(DOCKER_IO_MAX_PER_ROUTE_PROPERTY))) - .withMaxTotalConnections(integerValue(p.getProperty(DOCKER_IO_MAX_TOTAL_PROPERTY))); - } - - private Integer integerValue(String value) { - if (value != null) - return Integer.valueOf(value); - else - return null; + .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY)); } public final DockerClientConfigBuilder withUri(String uri) { @@ -472,31 +396,6 @@ public DockerClientConfigBuilder withServerAddress(String serverAddress) { return this; } - public final DockerClientConfigBuilder withReadTimeout(Integer readTimeout) { - this.readTimeout = readTimeout; - return this; - } - - public final DockerClientConfigBuilder withMaxTotalConnections(Integer maxTotalConnections) { - this.maxTotalConnections = maxTotalConnections; - return this; - } - - public final DockerClientConfigBuilder withMaxPerRouteConnections(Integer maxPerRouteConnections) { - this.maxPerRouteConnections = maxPerRouteConnections; - return this; - } - - public final DockerClientConfigBuilder withLoggingFilter(boolean loggingFilterEnabled) { - this.loggingFilterEnabled = loggingFilterEnabled; - return this; - } - - public final DockerClientConfigBuilder withFollowRedirectsFilter(boolean followRedirectsFilterEnabled) { - this.followRedirectsFilterEnabled = followRedirectsFilterEnabled; - return this; - } - public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) { if (dockerCertPath != null) { this.sslConfig = new LocalDirectorySSLConfig(dockerCertPath); @@ -516,8 +415,7 @@ public final DockerClientConfigBuilder withSSLConfig(SSLConfig config) { public DockerClientConfig build() { return new DockerClientConfig(uri, version, username, password, email, serverAddress, dockerCfgPath, - readTimeout, loggingFilterEnabled, followRedirectsFilterEnabled, sslConfig, maxTotalConnections, - maxPerRouteConnections); + sslConfig); } } diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java index cb08f8d8b..f3ad427f5 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java +++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java @@ -8,6 +8,8 @@ import javax.net.ssl.SSLContext; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.client.ClientResponseFilter; import javax.ws.rs.client.WebTarget; import org.apache.http.config.RegistryBuilder; @@ -62,13 +64,13 @@ import com.github.dockerjava.api.command.VersionCmd; import com.github.dockerjava.api.command.WaitContainerCmd; import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.core.util.FollowRedirectsFilter; -import com.github.dockerjava.core.util.JsonClientFilter; -import com.github.dockerjava.core.util.ResponseStatusExceptionFilter; -import com.github.dockerjava.core.util.SelectiveLoggingFilter; //import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; // see https://github.com/docker-java/docker-java/issues/196 import com.github.dockerjava.jaxrs.connector.ApacheConnectorProvider; +import com.github.dockerjava.jaxrs.filter.FollowRedirectsFilter; +import com.github.dockerjava.jaxrs.filter.JsonClientFilter; +import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter; +import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter; public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory { @@ -78,6 +80,18 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory { private WebTarget baseResource; + private Integer readTimeout = null; + + private Integer connectTimeout = null; + + private Integer maxTotalConnections = null; + + private Integer maxPerRouteConnections = null; + + private ClientRequestFilter[] clientRequestFilters = null; + + private ClientResponseFilter[] clientResponseFilters = null; + @Override public void init(DockerClientConfig dockerClientConfig) { checkNotNull(dockerClientConfig, "config was not specified"); @@ -90,20 +104,30 @@ public void init(DockerClientConfig dockerClientConfig) { clientConfig.register(JsonClientFilter.class); clientConfig.register(JacksonJsonProvider.class); - if (dockerClientConfig.followRedirectsFilterEnabled()) { - clientConfig.register(FollowRedirectsFilter.class); + // logging may disabled via log level + clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); + + if (readTimeout != null) { + clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout); } - if (dockerClientConfig.isLoggingFilterEnabled()) { - clientConfig.register(new SelectiveLoggingFilter(LOGGER, true)); + if (connectTimeout != null) { + clientConfig.property(ClientProperties.CONNECT_TIMEOUT, connectTimeout); } - if (dockerClientConfig.getReadTimeout() != null) { - int readTimeout = dockerClientConfig.getReadTimeout(); - clientConfig.property(ClientProperties.READ_TIMEOUT, readTimeout); + if (clientResponseFilters != null) { + for (ClientResponseFilter clientResponseFilter : clientResponseFilters) { + if (clientResponseFilter != null) + clientConfig.register(clientResponseFilter); + } } - // clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 10000); + if (clientRequestFilters != null) { + for (ClientRequestFilter clientRequestFilter : clientRequestFilters) { + if(clientRequestFilter != null) + clientConfig.register(clientRequestFilter); + } + } URI originalUri = dockerClientConfig.getUri(); @@ -120,10 +144,10 @@ public void init(DockerClientConfig dockerClientConfig) { PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry( originalUri, sslContext)); - if (dockerClientConfig.getMaxTotalConnections() != null) - connManager.setMaxTotal(dockerClientConfig.getMaxTotalConnections()); - if (dockerClientConfig.getMaxPerRoutConnections() != null) - connManager.setDefaultMaxPerRoute(dockerClientConfig.getMaxPerRoutConnections()); + if (maxTotalConnections != null) + connManager.setMaxTotal(maxTotalConnections); + if (maxPerRouteConnections != null) + connManager.setDefaultMaxPerRoute(maxPerRouteConnections); clientConfig.property(ApacheClientProperties.CONNECTION_MANAGER, connManager); @@ -353,4 +377,34 @@ public void close() throws IOException { client.close(); } + public DockerCmdExecFactoryImpl withReadTimeout(Integer readTimeout) { + this.readTimeout = readTimeout; + return this; + } + + public DockerCmdExecFactoryImpl withConnectTimeout(Integer connectTimeout) { + this.connectTimeout = connectTimeout; + return this; + } + + public DockerCmdExecFactoryImpl withMaxTotalConnections(Integer maxTotalConnections) { + this.maxTotalConnections = maxTotalConnections; + return this; + } + + public DockerCmdExecFactoryImpl withMaxPerRouteConnections(Integer maxPerRouteConnections) { + this.maxPerRouteConnections = maxPerRouteConnections; + return this; + } + + public DockerCmdExecFactoryImpl withClientResponseFilters(ClientResponseFilter... clientResponseFilter) { + this.clientResponseFilters = clientResponseFilter; + return this; + } + + public DockerCmdExecFactoryImpl withClientRequestFilters(ClientRequestFilter... clientRequestFilters) { + this.clientRequestFilters = clientRequestFilters; + return this; + } + } diff --git a/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java similarity index 96% rename from src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java rename to src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java index e4ba60f90..be079d430 100644 --- a/src/main/java/com/github/dockerjava/core/util/FollowRedirectsFilter.java +++ b/src/main/java/com/github/dockerjava/jaxrs/filter/FollowRedirectsFilter.java @@ -1,4 +1,4 @@ -package com.github.dockerjava.core.util; +package com.github.dockerjava.jaxrs.filter; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java similarity index 94% rename from src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java rename to src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java index fe8207cd9..2abc20618 100644 --- a/src/main/java/com/github/dockerjava/core/util/JsonClientFilter.java +++ b/src/main/java/com/github/dockerjava/jaxrs/filter/JsonClientFilter.java @@ -1,4 +1,4 @@ -package com.github.dockerjava.core.util; +package com.github.dockerjava.jaxrs.filter; import java.io.IOException; diff --git a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java similarity index 99% rename from src/main/java/com/github/dockerjava/core/util/LoggingFilter.java rename to src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java index 96b028b5f..0ba33ec82 100644 --- a/src/main/java/com/github/dockerjava/core/util/LoggingFilter.java +++ b/src/main/java/com/github/dockerjava/jaxrs/filter/LoggingFilter.java @@ -1,4 +1,4 @@ -package com.github.dockerjava.core.util; +package com.github.dockerjava.jaxrs.filter; /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. diff --git a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java similarity index 98% rename from src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java rename to src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java index 24f31fb14..fc01327c2 100644 --- a/src/main/java/com/github/dockerjava/core/util/ResponseStatusExceptionFilter.java +++ b/src/main/java/com/github/dockerjava/jaxrs/filter/ResponseStatusExceptionFilter.java @@ -1,4 +1,4 @@ -package com.github.dockerjava.core.util; +package com.github.dockerjava.jaxrs.filter; import java.io.EOFException; import java.io.IOException; diff --git a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java similarity index 96% rename from src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java rename to src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java index d4c9b8400..a93085987 100644 --- a/src/main/java/com/github/dockerjava/core/util/SelectiveLoggingFilter.java +++ b/src/main/java/com/github/dockerjava/jaxrs/filter/SelectiveLoggingFilter.java @@ -1,4 +1,4 @@ -package com.github.dockerjava.core.util; +package com.github.dockerjava.jaxrs.filter; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java index d520e1d65..9597b97d7 100644 --- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java +++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java @@ -17,15 +17,15 @@ public class DockerClientConfigTest { public static final DockerClientConfig EXAMPLE_CONFIG = newExampleConfig(); private static DockerClientConfig newExampleConfig() { - return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", 877, - false, false, new LocalDirectorySSLConfig("flim"), 20, 2); + return new DockerClientConfig(URI.create("http://foo"), "bar", "baz", "qux", "blam", "wham", "flam", + new LocalDirectorySSLConfig("flim")); } @Test public void string() throws Exception { assertEquals( - "DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}', readTimeout=877, loggingFilterEnabled=false, followRedirectsFilterEnabled=false}", - EXAMPLE_CONFIG.toString()); + EXAMPLE_CONFIG.toString(), + "DockerClientConfig{uri=http://foo, version='bar', username='baz', password='qux', email='blam', serverAddress='wham', dockerCfgPath='flam', sslConfig='LocalDirectorySSLConfig{dockerCertPath=flim}'}"); } @Test @@ -160,7 +160,6 @@ public void defaults() throws Exception { assertEquals(config.getUsername(), "someUserName"); assertEquals(config.getServerAddress(), AuthConfig.DEFAULT_SERVER_ADDRESS); assertEquals(config.getVersion(), null); - assertEquals(config.isLoggingFilterEnabled(), true); assertEquals(config.getDockerCfgPath(), "someHomeDir/.dockercfg"); assertEquals(((LocalDirectorySSLConfig) config.getSslConfig()).getDockerCertPath(), "someHomeDir/.docker"); } @@ -178,8 +177,6 @@ public void systemProperties() throws Exception { systemProperties.setProperty("docker.io.serverAddress", "wham"); systemProperties.setProperty("docker.io.dockerCertPath", "flim"); systemProperties.setProperty("docker.io.dockerCfgPath", "flam"); - systemProperties.setProperty("docker.io.readTimeout", "877"); - systemProperties.setProperty("docker.io.enableLoggingFilter", "false"); // when you build new config DockerClientConfig config = buildConfig(Collections. emptyMap(), systemProperties); diff --git a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java index a2a77734f..8a9879470 100644 --- a/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java +++ b/src/test/java/com/github/dockerjava/core/DockerClientImplTest.java @@ -10,8 +10,7 @@ public class DockerClientImplTest { @Test public void configuredInstanceAuthConfig() throws Exception { // given a config with null serverAddress - DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null, 0, false, - false, null, 20, 2); + DockerClientConfig dockerClientConfig = new DockerClientConfig(null, null, "", "", "", null, null,null); DockerClientImpl dockerClient = DockerClientImpl.getInstance(dockerClientConfig); // when we get the auth config