add until param to LogContainerCmd (#1734)

ziminghua · 訾明华 · bsideup · web-flow · commit a135d21fb308 · 2021-12-17T06:56:08.000-05:00
* add `until` param with LogContainerCmd

* Update LogContainerCmdIT.java

Co-authored-by: 訾明华 &lt;zmh01@digibird.com.cn&gt;
Co-authored-by: Sergei Egorov &lt;bsideup@gmail.com&gt;
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java b/docker-java-api/src/main/java/com/github/dockerjava/api/command/LogContainerCmd.java
@@ -25,6 +25,8 @@
  * @param since
  *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
  *            0 (unfiltered)
+ * @param until
+ *            - Only return logs before this time, as a UNIX timestamp. Default: 0
  */
 public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame> {
 
@@ -49,6 +51,9 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
     @CheckForNull
     Integer getSince();
 
+    @CheckForNull
+    Integer getUntil();
+
     LogContainerCmd withContainerId(@Nonnull String containerId);
 
     /**
@@ -69,6 +74,8 @@ public interface LogContainerCmd extends AsyncDockerCmd<LogContainerCmd, Frame>
 
     LogContainerCmd withSince(Integer since);
 
+    LogContainerCmd withUntil(Integer until);
+
     /**
      * @throws com.github.dockerjava.api.NotFoundException
      *             No such container
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/docker-java-core/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -24,14 +24,16 @@
  * @param since
  *            - UNIX timestamp (integer) to filter logs. Specifying a timestamp will only output log-entries since that timestamp. Default:
  *            0 (unfiltered)
+ * @param until
+ *            - Only return logs before this time, as a UNIX timestamp. Default: 0
  */
 public class LogContainerCmdImpl extends AbstrAsyncDockerCmd<LogContainerCmd, Frame> implements LogContainerCmd {
 
     private String containerId;
 
     private Boolean followStream, timestamps, stdout, stderr;
 
-    private Integer tail, since;
+    private Integer tail, since, until;
 
     public LogContainerCmdImpl(LogContainerCmd.Exec exec, String containerId) {
         super(exec);
@@ -73,6 +75,11 @@ public Integer getSince() {
         return since;
     }
 
+    @Override
+    public Integer getUntil() {
+        return until;
+    }
+
     @Override
     public LogContainerCmd withContainerId(String containerId) {
         checkNotNull(containerId, "containerId was not specified");
@@ -122,6 +129,12 @@ public LogContainerCmd withSince(Integer since) {
         return this;
     }
 
+    @Override
+    public LogContainerCmd withUntil(Integer until) {
+        this.until = until;
+        return this;
+    }
+
     @Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this, ToStringStyle.SHORT_PREFIX_STYLE);
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java b/docker-java-core/src/main/java/com/github/dockerjava/core/exec/LogContainerCmdExec.java
@@ -32,6 +32,10 @@ protected Void execute0(LogContainerCmd command, ResultCallback<Frame> resultCal
             webTarget = webTarget.queryParam("since", command.getSince());
         }
 
+        if (command.getUntil() != null) {
+            webTarget = webTarget.queryParam("until", command.getUntil());
+        }
+
         webTarget = booleanQueryParam(webTarget, "timestamps", command.hasTimestampsEnabled());
         webTarget = booleanQueryParam(webTarget, "stdout", command.hasStdoutEnabled());
         webTarget = booleanQueryParam(webTarget, "stderr", command.hasStderrEnabled());
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java
@@ -206,6 +206,7 @@ public void asyncLogContainerWithSince() throws Exception {
                 .withStdErr(true)
                 .withStdOut(true)
                 .withSince(timestamp)
+                .withUntil(timestamp + 1000)
                 .exec(loggingCallback);
 
         loggingCallback.awaitCompletion();
