Merge pull request #470 from KostyaSha/smallFixes

marcuslinke · marcuslinke · commit dd2fc49b6ba9 · 2016-02-17T16:53:26.000+01:00
Small fixes
diff --git a/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java b/src/main/java/com/github/dockerjava/api/command/ListContainersCmd.java
@@ -32,7 +32,7 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     public Boolean hasShowSizeEnabled();
 
     /**
-     * @param beforeId
+     * @param before
      *            - Show only containers created before Id, include non-running ones.
      */
     public ListContainersCmd withBefore(String before);
@@ -44,7 +44,7 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     public ListContainersCmd withExitcodeFilter(Integer exitcode);
 
     /**
-     * @param exitcode
+     * @param status
      *            - Show only containers with the passed status (created|restarting|running|paused|exited).
      */
     public ListContainersCmd withStatusFilter(String status);
@@ -80,7 +80,7 @@ public interface ListContainersCmd extends SyncDockerCmd<List<Container>> {
     public ListContainersCmd withShowSize(Boolean showSize);
 
     /**
-     * @param sinceId
+     * @param since
      *            - Show only containers created since Id, include non-running ones.
      */
     public ListContainersCmd withSince(String since);
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -164,16 +164,11 @@ private static Properties overrideDockerPropertiesWithSettingsFromUserHome(Prope
         Properties overriddenProperties = new Properties();
         overriddenProperties.putAll(p);
 
-        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"), "."
-                + DOCKER_JAVA_PROPERTIES);
+        final File usersDockerPropertiesFile = new File(systemProperties.getProperty("user.home"),
+                "." + DOCKER_JAVA_PROPERTIES);
         if (usersDockerPropertiesFile.isFile()) {
-            try {
-                final FileInputStream in = new FileInputStream(usersDockerPropertiesFile);
-                try {
-                    overriddenProperties.load(in);
-                } finally {
-                    in.close();
-                }
+            try (FileInputStream in = new FileInputStream(usersDockerPropertiesFile)) {
+                overriddenProperties.load(in);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -381,6 +376,12 @@ public final DockerClientConfigBuilder withDockerHost(String dockerHost) {
             return this;
         }
 
+
+        public final DockerClientConfigBuilder withApiVersion(RemoteApiVersion apiVersion) {
+            this.apiVersion = apiVersion.getVersion();
+            return this;
+        }
+
         public final DockerClientConfigBuilder withApiVersion(String apiVersion) {
             this.apiVersion = apiVersion;
             return this;
diff --git a/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java b/src/main/java/com/github/dockerjava/core/RemoteApiVersion.java
@@ -1,14 +1,14 @@
 package com.github.dockerjava.core;
 
-import java.io.Serializable;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 
+import java.io.Serializable;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Bean to encapsulate the version of the <a href="http://docs.docker.com/engine/reference/api/docker_remote_api/">Docker Remote (REST)
  * API</a>
@@ -125,6 +125,13 @@ public boolean isGreaterOrEqual(final RemoteApiVersion other) {
         return false;
     }
 
+    /**
+     * @return String representation of version. i.e. "1.22"
+     */
+    public String getVersion() {
+        return major + "." + minor;
+    }
+
     // CHECKSTYLE:OFF
     @Override
     public boolean equals(final Object o) {
diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -52,6 +52,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
+    @Test
     public void testListContainers() throws Exception {
 
         String testImage = "busybox";
diff --git a/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/ListContainersCmdExecTest.java
@@ -54,6 +54,7 @@ public void afterMethod(ITestResult result) {
         super.afterMethod(result);
     }
 
+    @Test
     public void testListContainers() throws Exception {
 
         String testImage = "busybox";

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ public void afterMethod(ITestResult result) {`
`52`	`52`	`super.afterMethod(result);`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ @Test`
`55`	`56`	`public void testListContainers() throws Exception {`
`56`	`57`
`57`	`58`	`String testImage = "busybox";`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ public void afterMethod(ITestResult result) {`
`54`	`54`	`super.afterMethod(result);`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ @Test`
`57`	`58`	`public void testListContainers() throws Exception {`
`58`	`59`
`59`	`60`	`String testImage = "busybox";`