Merge pull request #605 from KostyaSha/FBAnnotations

KostyaSha · web-flow · commit 92e32a6fff0f · 2016-06-17T14:36:51.000+03:00
Allow null value. boolean &lt;-&gt; Boolean error
diff --git 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);
                 }
diff --git 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));
     }
 
 }
