From efb424523971ddb50488bc3b03a52f32d8bcc5b9 Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Wed, 15 Jun 2016 23:43:44 +0300 Subject: [PATCH 1/2] Allow null value. boolean <-> Boolean error --- .../github/dockerjava/core/DefaultDockerClientConfig.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java index 4641f9d3c..b21e227ec 100644 --- a/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java +++ b/src/main/java/com/github/dockerjava/core/DefaultDockerClientConfig.java @@ -1,6 +1,7 @@ package com.github.dockerjava.core; import static com.google.common.base.Preconditions.checkNotNull; +import static org.apache.commons.lang.BooleanUtils.isTrue; import java.io.File; import java.io.FileInputStream; @@ -319,7 +320,7 @@ public static class Builder { private String apiVersion, registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, dockerCertPath; - private boolean dockerTlsVerify; + private Boolean dockerTlsVerify; private SSLConfig customSslConfig = null; @@ -419,7 +420,7 @@ public DefaultDockerClientConfig build() { SSLConfig sslConfig = null; if (customSslConfig == null) { - if (dockerTlsVerify) { + if (isTrue(dockerTlsVerify)) { dockerCertPath = checkDockerCertPath(dockerCertPath); sslConfig = new LocalDirectorySSLConfig(dockerCertPath); } From 019770cc8dda7fcdcbede13fa7cefcdb072589ed Mon Sep 17 00:00:00 2001 From: Kanstantsin Shautsou Date: Thu, 16 Jun 2016 09:53:49 +0300 Subject: [PATCH 2/2] Fix tests --- .../core/DefaultDockerClientConfigTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java index 55ec38015..54e70c511 100644 --- a/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java +++ b/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java @@ -180,25 +180,25 @@ public void withDockerTlsVerify() throws Exception { field.setAccessible(true); builder.withDockerTlsVerify(""); - assertThat(field.getBoolean(builder), is(false)); + assertThat((Boolean) field.get(builder), is(false)); builder.withDockerTlsVerify("false"); - assertThat(field.getBoolean(builder), is(false)); + assertThat((Boolean) field.get(builder), is(false)); builder.withDockerTlsVerify("FALSE"); - assertThat(field.getBoolean(builder), is(false)); + assertThat((Boolean) field.get(builder), is(false)); builder.withDockerTlsVerify("true"); - assertThat(field.getBoolean(builder), is(true)); + assertThat((Boolean) field.get(builder), is(true)); builder.withDockerTlsVerify("TRUE"); - assertThat(field.getBoolean(builder), is(true)); + assertThat((Boolean) field.get(builder), is(true)); builder.withDockerTlsVerify("0"); - assertThat(field.getBoolean(builder), is(false)); + assertThat((Boolean) field.get(builder), is(false)); builder.withDockerTlsVerify("1"); - assertThat(field.getBoolean(builder), is(true)); + assertThat((Boolean) field.get(builder), is(true)); } }