Code cleanup

Marcus Linke · Marcus Linke · commit c2d62fa350a8 · 2015-12-07T23:18:21.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -177,6 +177,10 @@ public String getMountLabel() {
         return mountLabel;
     }
 
+    /**
+     * @since {@link RemoteApiVersion#VERSION_1_20}
+     */
+    @CheckForNull
     public List<Mount> getMounts() {
         return mounts;
     }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -1,7 +1,6 @@
 package com.github.dockerjava.client;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 
 import java.io.File;
@@ -22,10 +21,9 @@
 import org.testng.ITestResult;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse.Mount;
-import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.exception.DockerException;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumeBind;
@@ -35,7 +33,6 @@
 import com.github.dockerjava.core.command.BuildImageResultCallback;
 import com.github.dockerjava.core.command.LogContainerResultCallback;
 import com.github.dockerjava.core.command.PullImageResultCallback;
-import com.google.common.base.Joiner;
 
 public abstract class AbstractDockerClientTest extends Assert {
 
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -105,9 +105,9 @@ public void createContainerWithVolume() throws DockerException {
 
         assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/var/log"));
 
-        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume);
-        assertEquals(inspectContainerResponse.getMounts().get(0).getMode(), AccessMode.rw);
-        assertTrue(inspectContainerResponse.getMounts().get(0).getRW());
+        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume));
+        assertThat(inspectContainerResponse.getMounts().get(0).getMode(), equalTo(""));
+        assertThat(inspectContainerResponse.getMounts().get(0).getRW(), equalTo(true));
     }
 
 
@@ -129,7 +129,7 @@ public void createContainerWithReadOnlyVolume() throws DockerException {
 
         assertThat(inspectContainerResponse.getConfig().getVolumes().keySet(), contains("/srv/test"));
 
-        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume);
+        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume));
         // TODO: Create a read-only volume and test like this
         // assertFalse(inspectContainerResponse.getMounts().get(0).getRW());
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -93,15 +93,15 @@ public void startContainerWithVolumes() throws DockerException {
 
         assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
 
-        assertEquals(inspectContainerResponse.getMounts().size(), 2);
+        assertThat(inspectContainerResponse.getMounts().size(), equalTo(2));
 
-        assertEquals(inspectContainerResponse.getMounts().get(0).getDestination(), volume1);
-        assertEquals(inspectContainerResponse.getMounts().get(0).getMode(), "ro");
-        assertEquals(inspectContainerResponse.getMounts().get(0).getRW(), Boolean.FALSE);
+        assertThat(inspectContainerResponse.getMounts().get(0).getDestination(), equalTo(volume1));
+        assertThat(inspectContainerResponse.getMounts().get(0).getMode(), equalTo("ro"));
+        assertThat(inspectContainerResponse.getMounts().get(0).getRW(), equalTo(Boolean.FALSE));
 
-        assertEquals(inspectContainerResponse.getMounts().get(1).getDestination(), volume2);
-        assertEquals(inspectContainerResponse.getMounts().get(1).getMode(), "rw");
-        assertEquals(inspectContainerResponse.getMounts().get(1).getRW(), Boolean.TRUE);
+        assertThat(inspectContainerResponse.getMounts().get(1).getDestination(), equalTo(volume2));
+        assertThat(inspectContainerResponse.getMounts().get(1).getMode(), equalTo("rw"));
+        assertThat(inspectContainerResponse.getMounts().get(1).getRW(), equalTo(Boolean.TRUE));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,10 @@ public String getMountLabel() {`
`177`	`177`	`return mountLabel;`
`178`	`178`	`}`
`179`	`179`
	`180`	`+ /**`
	`181`	`+ * @since {@link RemoteApiVersion#VERSION_1_20}`
	`182`	`+ */`
	`183`	`+ @CheckForNull`
`180`	`184`	`public List<Mount> getMounts() {`
`181`	`185`	`return mounts;`
`182`	`186`	`}`