Merge pull request docker-java#1137 from docker-java/revert-1111-feature/log-cmd-to-string

KostyaSha · web-flow · commit af1ad3d88561 · 2018-11-27T15:08:40.000+03:00
Revert "Change since parameter in LogContainerCmd to String"
diff --git a/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -23,8 +23,8 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp, RFC 3339 date, or Go duration string to filter logs.
- *            Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
+ *            0 (unfiltered)
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
@@ -47,7 +47,7 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
     Boolean hasStderrEnabled();
 
     @CheckForNull
-    String getSince();
+    Integer getSince();
 
     LogContainerCmd withContainerId(@Nonnull String containerId);
 
@@ -67,7 +67,7 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     LogContainerCmd withTail(Integer tail);
 
-    LogContainerCmd withSince(String since);
+    LogContainerCmd withSince(Integer since);
 
     /**
      * @throws com.github.dockerjava.api.NotFoundException
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -22,17 +22,16 @@
  * @param tail
  *            - `all` or `<number>`, Output specified number of lines at the end of logs
  * @param since
- *            - UNIX timestamp, RFC 3339 date, or Go duration string to filter logs.
- *            Specifying a timestamp will only output log-entries since that timestamp. Default: 0 (unfiltered)
+ *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
+ *            0 (unfiltered)
  */
 public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
     private String containerId;
 
     private Boolean followStream, timestamps, stdout, stderr;
 
-    private Integer tail;
-    private String since;
+    private Integer tail, since;
 
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -70,7 +69,7 @@ public Boolean hasStderrEnabled() {
     }
 
     @Override
-    public String getSince() {
+    public Integer getSince() {
         return since;
     }
 
@@ -118,7 +117,7 @@ public LogContainerCmd withTail(Integer tail) {
     }
 
     @Override
-    public LogContainerCmd withSince(String since) {
+    public LogContainerCmd withSince(Integer since) {
         this.since = since;
         return this;
     }
diff --git a/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -175,7 +175,7 @@ public void asyncLogContainerWithSince() throws Exception {
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
 
-        String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
+        int timestamp = (int) (System.currentTimeMillis() / 1000);
 
         dockerRule.getClient().startContainerCmd(container.getId()).exec();
 
@@ -197,38 +197,4 @@ public void asyncLogContainerWithSince() throws Exception {
 
         assertThat(loggingCallback.toString(), containsString(snippet));
     }
-
-    @Test
-    public void asyncLogContainerWithSinceNanoseconds() throws Exception {
-        String snippet = "hello world";
-
-        CreateContainerResponse container = dockerRule.getClient().createContainerCmd("busybox")
-                .withCmd("/bin/echo", snippet)
-                .exec();
-
-        LOG.info("Created container: {}", container.toString());
-        assertThat(container.getId(), not(isEmptyString()));
-
-        String timestamp = String.format("%.4f", System.currentTimeMillis() / 1000d);
-        dockerRule.getClient().startContainerCmd(container.getId()).exec();
-
-        int exitCode = dockerRule.getClient().waitContainerCmd(container.getId())
-                .exec(new WaitContainerResultCallback())
-                .awaitStatusCode();
-
-        assertThat(exitCode, equalTo(0));
-
-        LogContainerTestCallback loggingCallback = new LogContainerTestCallback();
-
-        dockerRule.getClient().logContainerCmd(container.getId())
-                .withStdErr(true)
-                .withStdOut(true)
-                .withTimestamps(true)
-                .withSince(timestamp)
-                .exec(loggingCallback);
-
-        loggingCallback.awaitCompletion();
-
-        assertThat(loggingCallback.toString(), containsString(snippet));
-    }
 }
