Merge branch 'master' into refact-streaming

Marcus Linke · Marcus Linke · commit 4772f297ec9d · 2015-07-07T21:26:01.000+02:00
Conflicts:
	src/main/java/com/github/dockerjava/api/DockerClient.java
	src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
	src/main/java/com/github/dockerjava/api/command/EventCallback.java
	src/main/java/com/github/dockerjava/api/command/EventsCmd.java
	src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
	src/main/java/com/github/dockerjava/api/command/StatsCallback.java
	src/main/java/com/github/dockerjava/api/command/StatsCmd.java
	src/main/java/com/github/dockerjava/api/model/StreamType.java
	src/main/java/com/github/dockerjava/core/DockerClientImpl.java
	src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
	src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
	src/main/java/com/github/dockerjava/core/command/FrameReader.java
	src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
	src/main/java/com/github/dockerjava/core/command/StatsCmdImpl.java
	src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
	src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
	src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
	src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
	src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
	src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
	src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/FrameReaderITest.java
	src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
	src/test/java/com/github/dockerjava/core/command/StatsCmdImplTest.java
diff --git a/etc/code-style.epf b/etc/code-style.epf
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -11,7 +10,7 @@
 	<groupId>com.github.docker-java</groupId>
 	<artifactId>docker-java</artifactId>
 	<packaging>jar</packaging>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.1-SNAPSHOT</version>
 
 	<name>docker-java</name>
 	<url>https://github.com/docker-java/docker-java</url>
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -5,7 +5,6 @@
 import com.github.dockerjava.api.model.Frame;
 
 import java.io.InputStream;
-import java.util.concurrent.Future;
 
 /**
  * Get container logs
@@ -20,16 +19,6 @@
  *            - true or false, if true, print timestamps for every log line. Defaults to false.
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
-<<<<<<< HEAD
- *
- *            Consider wrapping any input stream you get with a frame reader to make reading frame easier.
- *
-=======
- *
- *            Consider wrapping any input stream you get with a frame reader to make reading frame easier.
- *
- * @see com.github.dockerjava.core.command.FrameReader
->>>>>>> refs/heads/master
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame, Void> {
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -159,5 +159,4 @@ public String toString() {
     public Void exec() throws NotFoundException {
         return super.exec();
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AttachContainerCmdExec.java
@@ -8,7 +8,6 @@
 import com.github.dockerjava.api.command.AttachContainerCmd;
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.async.FrameStreamProcessor;
-import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
@@ -39,7 +38,5 @@ protected Void execute(AttachContainerCmd command) {
         AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);
 
         return null;
-
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -12,6 +12,7 @@
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
 
 public class EventsCmdExec extends AbstrDockerCmdExec<EventsCmd, Void> implements EventsCmd.Exec {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(EventsCmdExec.class);
 
     public EventsCmdExec(WebTarget baseResource) {
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -38,5 +38,4 @@ protected Void execute(LogContainerCmd command) {
 
         return null;
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/StatsCmdExec.java
@@ -32,5 +32,4 @@ protected Void execute(StatsCmd command) {
 
         return null;
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -181,6 +181,7 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon
         assertThat(volumes, contains(expectedVolumes));
     }
 
+
     public static class CollectFramesCallback extends ResultCallbackTemplate<Frame> {
         public final List<Frame> frames = new ArrayList<Frame>();
 
@@ -214,5 +215,4 @@ protected String containerLog(String containerId) throws Exception {
 
         return collectFramesCallback.toString();
     }
-
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -140,5 +140,4 @@ public void asyncMultipleLogContainer() throws Exception {
 
         assertTrue(loggingCallback.toString().contains(snippet));
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -159,5 +159,4 @@ public String toString() {`
`159`	`159`	`public Void exec() throws NotFoundException {`
`160`	`160`	`return super.exec();`
`161`	`161`	`}`
`162`		`-`
`163`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`import com.github.dockerjava.api.command.AttachContainerCmd;`
`9`	`9`	`import com.github.dockerjava.api.model.Frame;`
`10`	`10`	`import com.github.dockerjava.core.async.FrameStreamProcessor;`
`11`		`-import com.github.dockerjava.core.async.JsonStreamProcessor;`
`12`	`11`	`import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;`
`13`	`12`	`import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;`
`14`	`13`
`@@ -39,7 +38,5 @@ protected Void execute(AttachContainerCmd command) {`
`39`	`38`	`AbstractCallbackNotifier.startAsyncProcessing(callbackNotifier);`
`40`	`39`
`41`	`40`	`return null;`
`42`		`-`
`43`	`41`	`}`
`44`		`-`
`45`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,4 @@ protected Void execute(LogContainerCmd command) {`
`38`	`38`
`39`	`39`	`return null;`
`40`	`40`	`}`
`41`		`-`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,4 @@ protected Void execute(StatsCmd command) {`
`32`	`32`
`33`	`33`	`return null;`
`34`	`34`	`}`
`35`		`-`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ public static void assertContainerHasVolumes(InspectContainerResponse inspectCon`
`181`	`181`	`assertThat(volumes, contains(expectedVolumes));`
`182`	`182`	`}`
`183`	`183`
	`184`	`+`
`184`	`185`	`public static class CollectFramesCallback extends ResultCallbackTemplate<Frame> {`
`185`	`186`	`public final List<Frame> frames = new ArrayList<Frame>();`
`186`	`187`
`@@ -214,5 +215,4 @@ protected String containerLog(String containerId) throws Exception {`
`214`	`215`
`215`	`216`	`return collectFramesCallback.toString();`
`216`	`217`	`}`
`217`		`-`
`218`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,5 +140,4 @@ public void asyncMultipleLogContainer() throws Exception {`
`140`	`140`
`141`	`141`	`assertTrue(loggingCallback.toString().contains(snippet));`
`142`	`142`	`}`
`143`		`-`
`144`	`143`	`}`