Style fixes; * imports fixed

Aleksandr Guljajev · Aleksandr Guljajev · commit 4b543c33db68 · 2015-09-28T17:25:21.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -18,6 +18,8 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
 
+import javax.annotation.CheckForNull;
+
 public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerResponse> {
 
     public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, CreateContainerResponse> {
@@ -134,6 +136,7 @@ public static interface Exec extends DockerCmdSyncExec<CreateContainerCmd, Creat
 
     public boolean isTty();
 
+    @CheckForNull
     public String getPidMode();
 
     public CreateContainerCmd withAttachStderr(boolean attachStderr);
diff --git a/src/main/java/com/github/dockerjava/api/model/HostConfig.java b/src/main/java/com/github/dockerjava/api/model/HostConfig.java
@@ -282,7 +282,9 @@ public void setUlimits(Ulimit[] ulimits) {
         this.ulimits = ulimits;
     }
 
-    public void setPidMode(String pidMode) { this.pidMode = pidMode; }
+    public void setPidMode(String pidMode) {
+        this.pidMode = pidMode;
+    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -1,7 +1,5 @@
 package com.github.dockerjava.jaxrs;
 
-import static com.google.common.net.UrlEscapers.*;
-
 import javax.ws.rs.client.WebTarget;
 
 import org.slf4j.Logger;
@@ -14,6 +12,8 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
+import static com.google.common.net.UrlEscapers.urlPathSegmentEscaper;
+
 public class EventsCmdExec extends AbstrAsyncDockerCmdExec<EventsCmd, Event> implements EventsCmd.Exec {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -4,10 +4,25 @@
 import com.github.dockerjava.api.DockerException;
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.model.*;
+import com.github.dockerjava.api.model.AccessMode;
+import com.github.dockerjava.api.model.Bind;
+import com.github.dockerjava.api.model.Device;
+import com.github.dockerjava.api.model.ExposedPort;
+import com.github.dockerjava.api.model.Link;
+import com.github.dockerjava.api.model.LogConfig;
+import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
+import com.github.dockerjava.api.model.Ulimit;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeRW;
+import com.github.dockerjava.api.model.VolumesFrom;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import org.testng.ITestResult;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
@@ -33,7 +48,6 @@
 import static com.github.dockerjava.api.model.Capability.MKNOD;
 import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
 
 @Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
@@ -546,6 +560,4 @@ public void createContainerWithLogConfig() throws DockerException {
         // null becomes empty string
         assertEquals(inspectContainerResponse.getHostConfig().getLogConfig().type, logConfig.type);
     }
-
-
 }

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,9 @@ public void setUlimits(Ulimit[] ulimits) {`
`282`	`282`	`this.ulimits = ulimits;`
`283`	`283`	`}`
`284`	`284`
`285`		`- public void setPidMode(String pidMode) { this.pidMode = pidMode; }`
	`285`	`+ public void setPidMode(String pidMode) {`
	`286`	`+ this.pidMode = pidMode;`
	`287`	`+ }`
`286`	`288`
`287`	`289`	`@Override`
`288`	`290`	`public String toString() {`