Merge from master

Marcus Linke · Marcus Linke · commit 022a2a6df1eb · 2015-06-26T21:39:24.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/AttachContainerCmd.java
@@ -75,4 +75,4 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F
     public static interface Exec extends DockerCmdExec<AttachContainerCmd, Void> {
     }
 
-}
+}
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -20,9 +20,16 @@
  *            - 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> {
 
@@ -80,4 +87,4 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame,
     public static interface Exec extends DockerCmdExec<LogContainerCmd, Void> {
     }
 
-}
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/FrameReader.java b/src/main/java/com/github/dockerjava/core/command/FrameReader.java
@@ -4,8 +4,6 @@
 import java.io.InputStream;
 import java.util.Arrays;
 
-import org.apache.commons.io.HexDump;
-
 import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.api.model.StreamType;
 
@@ -75,7 +73,6 @@ public Frame readFrame() throws IOException {
             return new Frame(streamType(buffer[0]), payload);
 
         }
-
     }
 
     @Override
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -7,7 +7,6 @@
 
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
-import com.github.dockerjava.api.model.Frame;
 import com.github.dockerjava.core.async.JsonStreamProcessor;
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.GETCallbackNotifier;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/LogContainerCmdExec.java
@@ -8,7 +8,6 @@
 import com.github.dockerjava.api.command.LogContainerCmd;
 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.GETCallbackNotifier;
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java b/src/main/java/com/github/dockerjava/jaxrs/util/WrappedResponseInputStream.java
@@ -9,7 +9,7 @@
  * This is a wrapper around {@link Response} that acts as a {@link InputStream}. When this
  * {@link WrappedResponseInputStream} is closed it closes the underlying {@link Response} object also to prevent
  * blocking/hanging connections.
- * 
+ *
  * @author marcus
  */
 public class WrappedResponseInputStream extends InputStream {
diff --git a/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AttachContainerCmdImplTest.java
@@ -78,7 +78,7 @@ public void onNext(Frame frame) {
 
         collectFramesCallback.close();
 
-        assertThat(collectFramesCallback.toString(), endsWith(snippet));
+        assertThat(collectFramesCallback.toString(), containsString(snippet));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,4 @@ public interface AttachContainerCmd extends AsyncDockerCmd<AttachContainerCmd, F`
`75`	`75`	`public static interface Exec extends DockerCmdExec<AttachContainerCmd, Void> {`
`76`	`76`	`}`
`77`	`77`
`78`		`-}`
	`78`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`import java.io.InputStream;`
`5`	`5`	`import java.util.Arrays;`
`6`	`6`
`7`		`-import org.apache.commons.io.HexDump;`
`8`		`-`
`9`	`7`	`import com.github.dockerjava.api.model.Frame;`
`10`	`8`	`import com.github.dockerjava.api.model.StreamType;`
`11`	`9`
`@@ -75,7 +73,6 @@ public Frame readFrame() throws IOException {`
`75`	`73`	`return new Frame(streamType(buffer[0]), payload);`
`76`	`74`
`77`	`75`	`}`
`78`		`-`
`79`	`76`	`}`
`80`	`77`
`81`	`78`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void onNext(Frame frame) {`
`78`	`78`
`79`	`79`	`collectFramesCallback.close();`
`80`	`80`
`81`		`- assertThat(collectFramesCallback.toString(), endsWith(snippet));`
	`81`	`+ assertThat(collectFramesCallback.toString(), containsString(snippet));`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Test`