Format sources

Marcus Linke · Marcus Linke · commit cc23307c2fbc · 2015-11-06T09:06:46.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/model/WaitResponse.java b/src/main/java/com/github/dockerjava/api/model/WaitResponse.java
@@ -3,12 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 /**
  * Represents a wait container command response
  */
 @JsonIgnoreProperties(ignoreUnknown = false)
-public class WaitResponse  {
+public class WaitResponse {
 
     @JsonProperty("StatusCode")
     private Integer statusCode;
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -24,16 +24,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- *
+ * 
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- *
+ * 
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- *
+ * 
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -10,7 +10,8 @@
  *
  * Block until container stops, then returns its exit code
  */
-public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd, WaitResponse> implements WaitContainerCmd {
+public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd, WaitResponse> implements
+        WaitContainerCmd {
 
     private String containerId;
 
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -143,7 +143,7 @@ public int read() throws IOException {
                     }
 
                     @Override
-                    public int read(byte [] buff, int offset, int len) throws IOException {
+                    public int read(byte[] buff, int offset, int len) throws IOException {
                         return tarInputStream.read(buff, offset, len);
                     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -61,7 +61,7 @@ protected boolean bool(Boolean bool) {
     }
 
     protected WebTarget booleanQueryParam(WebTarget webTarget, String name, Boolean value) {
-        if(bool(value)) {
+        if (bool(value)) {
             webTarget = webTarget.queryParam(name, bool(value) + "");
         }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -25,12 +25,12 @@ public AttachContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerC
     protected AbstractCallbackNotifier<Frame> callbackNotifier(AttachContainerCmd command,
             ResultCallback<Frame> resultCallback) {
 
-        WebTarget webTarget = getBaseResource().path("/containers/{id}/attach")
-                .resolveTemplate("id", command.getContainerId());
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/attach").resolveTemplate("id",
+                command.getContainerId());
 
         webTarget = booleanQueryParam(webTarget, "logs", command.hasLogsEnabled());
         webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
-        //webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
+        // webTarget = booleanQueryParam(webTarget, "stdin", command.hasStdinEnabled());
         webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
         webTarget = booleanQueryParam(webTarget, "stream", command.hasFollowStreamEnabled());
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/ListImagesCmdExec.java
@@ -32,9 +32,8 @@ protected List<Image> execute(ListImagesCmd command) {
 
         LOGGER.trace("GET: {}", webTarget);
 
-        List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON)
-                .get(new GenericType<List<Image>>() {
-                });
+        List<Image> images = webTarget.request().accept(MediaType.APPLICATION_JSON).get(new GenericType<List<Image>>() {
+        });
         LOGGER.trace("Response: {}", images);
 
         return images;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -25,14 +25,14 @@ public LogContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerClie
     protected AbstractCallbackNotifier<Frame> callbackNotifier(LogContainerCmd command,
             ResultCallback<Frame> resultCallback) {
 
-        WebTarget webTarget = getBaseResource().path("/containers/{id}/logs")
-                .resolveTemplate("id", command.getContainerId());
+        WebTarget webTarget = getBaseResource().path("/containers/{id}/logs").resolveTemplate("id",
+                command.getContainerId());
 
-        if(command.getTail() != null) {
+        if (command.getTail() != null) {
             webTarget = webTarget.queryParam("tail", command.getTail());
         }
 
-        if(command.getSince() != null) {
+        if (command.getSince() != null) {
             webTarget = webTarget.queryParam("since", command.getSince());
         }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/RestartContainerCmdExec.java
@@ -19,10 +19,10 @@ public RestartContainerCmdExec(WebTarget baseResource, DockerClientConfig docker
 
     @Override
     protected Void execute(RestartContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/restart")
-                .resolveTemplate("id", command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/restart").resolveTemplate("id",
+                command.getContainerId());
 
-        if(command.getTimeout() != null) {
+        if (command.getTimeout() != null) {
             webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
         }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StopContainerCmdExec.java
@@ -19,10 +19,10 @@ public StopContainerCmdExec(WebTarget baseResource, DockerClientConfig dockerCli
 
     @Override
     protected Void execute(StopContainerCmd command) {
-        WebTarget webResource = getBaseResource().path("/containers/{id}/stop")
-                .resolveTemplate("id", command.getContainerId());
+        WebTarget webResource = getBaseResource().path("/containers/{id}/stop").resolveTemplate("id",
+                command.getContainerId());
 
-        if(command.getTimeout() != null) {
+        if (command.getTimeout() != null) {
             webResource = webResource.queryParam("t", String.valueOf(command.getTimeout()));
         }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/WaitContainerCmdExec.java
@@ -34,8 +34,9 @@ protected AbstractCallbackNotifier<WaitResponse> callbackNotifier(WaitContainerC
 
         LOGGER.trace("POST: {}", webResource);
 
-        return new POSTCallbackNotifier<WaitResponse>(new JsonStreamProcessor<WaitResponse>(
-                WaitResponse.class), resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null, MediaType.APPLICATION_JSON));
+        return new POSTCallbackNotifier<WaitResponse>(new JsonStreamProcessor<WaitResponse>(WaitResponse.class),
+                resultCallback, webResource.request().accept(MediaType.APPLICATION_JSON), entity(null,
+                        MediaType.APPLICATION_JSON));
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -210,7 +210,8 @@ public String toString() {
 
     protected String buildImage(File baseDir) throws Exception {
 
-        return dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback()).awaitImageId();
+        return dockerClient.buildImageCmd(baseDir).withNoCache(true).exec(new BuildImageResultCallback())
+                .awaitImageId();
     }
 
 }
diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -62,7 +62,8 @@ public void testRunShlex() throws DockerException {
             CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd(commands).exec();
             dockerClient.startContainerCmd(container.getId());
 
-            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+            int exitcode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                    .awaitStatusCode();
             assertThat(exitcode, equalTo(0));
         }
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -65,8 +65,8 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true).withLogs(true)
-                .exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+                .withLogs(true).exec(callback).awaitCompletion(30, TimeUnit.SECONDS).close();
 
         assertThat(callback.toString(), containsString(snippet));
     }
@@ -94,8 +94,8 @@ public void onNext(Frame frame) {
             };
         };
 
-        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true).exec(callback)
-                .awaitCompletion(15, TimeUnit.SECONDS).close();
+        dockerClient.attachContainerCmd(container.getId()).withStdErr(true).withStdOut(true).withFollowStream(true)
+                .exec(callback).awaitCompletion(15, TimeUnit.SECONDS).close();
 
         System.out.println("log: " + callback.toString());
 
diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -53,7 +53,8 @@ public void testContainerDiff() throws DockerException {
         assertThat(container.getId(), not(isEmptyString()));
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback()).awaitStatusCode();
+        int exitCode = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback())
+                .awaitStatusCode();
         assertThat(exitCode, equalTo(0));
 
         List<ChangeLog> filesystemDiff = dockerClient.containerDiffCmd(container.getId()).exec();
diff --git a/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java b/src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
@@ -57,9 +57,10 @@ private List<Frame> getLoggingFrames() throws Exception {
 
         FrameReaderITestCallback collectFramesCallback = new FrameReaderITestCallback();
 
-        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut(true).withStdErr(true).withTailAll()
-        // we can't follow stream here as it blocks reading from resulting InputStream infinitely
-        // .withFollowStream()
+        dockerClient.logContainerCmd(dockerfileFixture.getContainerId()).withStdOut(true).withStdErr(true)
+                .withTailAll()
+                // we can't follow stream here as it blocks reading from resulting InputStream infinitely
+                // .withFollowStream()
                 .exec(collectFramesCallback).awaitCompletion();
 
         return collectFramesCallback.frames;
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -95,7 +95,8 @@ public void onComplete() {
             };
         };
 
-        dockerClient.logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback).awaitCompletion();
+        dockerClient.logContainerCmd("non-existing").withStdErr(true).withStdOut(true).exec(loggingCallback)
+                .awaitCompletion();
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -90,7 +90,8 @@ public void testWaitContainerAbort() throws Exception {
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(new WaitContainerResultCallback());
+        WaitContainerResultCallback callback = dockerClient.waitContainerCmd(container.getId()).exec(
+                new WaitContainerResultCallback());
 
         Thread.sleep(5000);
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@`
`10`	`10`	`*`
`11`	`11`	`* Block until container stops, then returns its exit code`
`12`	`12`	`*/`
`13`		`-public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd, WaitResponse> implements WaitContainerCmd {`
	`13`	`+public class WaitContainerCmdImpl extends AbstrAsyncDockerCmd<WaitContainerCmd, WaitResponse> implements`
	`14`	`+ WaitContainerCmd {`
`14`	`15`
`15`	`16`	`private String containerId;`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public int read() throws IOException {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`@Override`
`146`		`- public int read(byte [] buff, int offset, int len) throws IOException {`
	`146`	`+ public int read(byte[] buff, int offset, int len) throws IOException {`
`147`	`147`	`return tarInputStream.read(buff, offset, len);`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ protected boolean bool(Boolean bool) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`protected WebTarget booleanQueryParam(WebTarget webTarget, String name, Boolean value) {`
`64`		`- if(bool(value)) {`
	`64`	`+ if (bool(value)) {`
`65`	`65`	`webTarget = webTarget.queryParam(name, bool(value) + "");`
`66`	`66`	`}`
`67`	`67`