From 91f8423cca326f51ac77e172cf098116cdd43c38 Mon Sep 17 00:00:00 2001 From: hongweiyi Date: Wed, 23 Mar 2016 22:31:14 +0800 Subject: [PATCH 1/4] Fix Issue #519 Signed-off-by: hongwei yi --- .../github/dockerjava/core/DockerClientConfig.java | 4 ++-- .../dockerjava/core/DockerClientConfigTest.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index 038c43cae..47d9ff7c1 100644 --- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -418,8 +418,8 @@ public final DockerClientConfigBuilder withDockerConfig(String dockerConfig) { } public final DockerClientConfigBuilder withDockerTlsVerify(String dockerTlsVerify) { - this.dockerTlsVerify = BooleanUtils.toBoolean(dockerTlsVerify.trim()) - || BooleanUtils.toBoolean(dockerTlsVerify.trim(), "1", "0"); + String trimmed = dockerTlsVerify.trim(); + this.dockerTlsVerify = "true".equals(trimmed) || "1".equals(trimmed); return this; } diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java index e87254b88..4351bd02a 100644 --- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java +++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java @@ -176,4 +176,15 @@ public void testUnixHostScheme() throws Exception { new DockerClientConfig(URI.create("unix://foo"), "dockerConfig", "apiVersion", "registryUrl", "registryUsername", "registryPassword", "registryEmail", null, false); } + + @Test + public void withDockerTlsVerify() throws Exception { + DockerClientConfig.DockerClientConfigBuilder builder = new DockerClientConfig.DockerClientConfigBuilder(); + builder.withDockerTlsVerify(""); + builder.withDockerTlsVerify("false"); + builder.withDockerTlsVerify("true"); + builder.withDockerTlsVerify("0"); + builder.withDockerTlsVerify("1"); + } + } From a0d8726640bb6a21e4967b4511eb63700a9fac2b Mon Sep 17 00:00:00 2001 From: hongweiyi Date: Wed, 23 Mar 2016 22:36:25 +0800 Subject: [PATCH 2/4] Improve #519 test case. Signed-off-by: hongwei yi --- .../dockerjava/core/DockerClientConfigTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java index 4351bd02a..af42df640 100644 --- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java +++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java @@ -3,7 +3,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import java.lang.reflect.Field; import java.net.URI; import java.util.Collections; import java.util.HashMap; @@ -180,11 +183,19 @@ public void testUnixHostScheme() throws Exception { @Test public void withDockerTlsVerify() throws Exception { DockerClientConfig.DockerClientConfigBuilder builder = new DockerClientConfig.DockerClientConfigBuilder(); + Field field = builder.getClass().getDeclaredField("dockerTlsVerify"); + field.setAccessible(true); + builder.withDockerTlsVerify(""); + assertFalse(field.getBoolean(builder)); builder.withDockerTlsVerify("false"); + assertFalse(field.getBoolean(builder)); builder.withDockerTlsVerify("true"); + assertTrue(field.getBoolean(builder)); builder.withDockerTlsVerify("0"); + assertFalse(field.getBoolean(builder)); builder.withDockerTlsVerify("1"); + assertTrue(field.getBoolean(builder)); } } From 3a1a66bb08454b49bcd1d8aa4d1222e67530f607 Mon Sep 17 00:00:00 2001 From: hongweiyi Date: Wed, 23 Mar 2016 22:43:34 +0800 Subject: [PATCH 3/4] Improve imports Signed-off-by: hongwei yi --- .../com/github/dockerjava/core/DockerClientConfig.java | 7 +------ .../com/github/dockerjava/core/DockerClientConfigTest.java | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index 47d9ff7c1..5e517d53b 100644 --- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -2,18 +2,13 @@ import static com.google.common.base.Preconditions.checkNotNull; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; +import java.io.*; import java.net.URI; import java.util.HashSet; import java.util.Map; import java.util.Properties; import java.util.Set; -import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java index af42df640..dcd66e50a 100644 --- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java +++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java @@ -2,9 +2,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import static org.testng.Assert.*; import java.lang.reflect.Field; import java.net.URI; From c7ad7df7342022c7076650e4600a9529dc6a02d2 Mon Sep 17 00:00:00 2001 From: hongweiyi Date: Wed, 23 Mar 2016 22:55:25 +0800 Subject: [PATCH 4/4] Improve imports again. Sorry about that. Signed-off-by: hongwei yi --- .../java/com/github/dockerjava/core/DockerClientConfig.java | 6 +++++- .../com/github/dockerjava/core/DockerClientConfigTest.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java index 5e517d53b..34ce13133 100644 --- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java +++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java @@ -2,7 +2,11 @@ import static com.google.common.base.Preconditions.checkNotNull; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Serializable; import java.net.URI; import java.util.HashSet; import java.util.Map; diff --git a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java index dcd66e50a..af42df640 100644 --- a/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java +++ b/src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java @@ -2,7 +2,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; import java.lang.reflect.Field; import java.net.URI;