Merge branch 'event-filters' of https://github.com/carlossg/docker-java

Marcus Linke · Marcus Linke · commit b9e9037d0d60 · 2015-07-15T12:02:56.000+02:00
into carlossg-event-filters

Conflicts:
	src/main/java/com/github/dockerjava/api/command/EventsCmd.java
	src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
	src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
diff --git a/src/main/java/com/github/dockerjava/api/command/EventsCmd.java b/src/main/java/com/github/dockerjava/api/command/EventsCmd.java
@@ -1,6 +1,7 @@
 package com.github.dockerjava.api.command;
 
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.Filters;
 
 /**
  * Get events
@@ -19,6 +20,11 @@ public interface EventsCmd extends AsyncDockerCmd<EventsCmd, Event> {
 
     public String getUntil();
 
+    public Filters getFilters();
+
+    public EventsCmd withFilters(Filters filters);
+
     public static interface Exec extends DockerCmdAsyncExec<EventsCmd, Event> {
+
     }
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/EventFilters.java b/src/main/java/com/github/dockerjava/api/model/EventFilters.java
@@ -0,0 +1,37 @@
+package com.github.dockerjava.api.model;
+
+import java.util.List;
+
+/**
+ * Representation of a Docker event filter.
+ *
+ * @author Carlos Sanchez <carlos@apache.org>
+ * 
+ */
+public class EventFilters extends Filters {
+
+    /**
+     * Default constructor for the deserialization.
+     */
+    public EventFilters() {
+    }
+
+    /**
+     * Constructor.
+     * 
+     * @param event
+     *            event to filter
+     */
+    public EventFilters(String... event) {
+        super();
+        withEvent(event);
+    }
+
+    public Filters withEvent(String... event) {
+        return withFilter("event", event);
+    }
+
+    public List<String> getEvent() {
+        return getFilter("event");
+    }
+}
diff --git a/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java b/src/main/java/com/github/dockerjava/core/async/ResultCallbackTemplate.java
@@ -8,6 +8,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.github.dockerjava.api.async.ResultCallback;
 
 /**
@@ -19,6 +22,8 @@
 public abstract class ResultCallbackTemplate<RC_T extends ResultCallback<A_RES_T>, A_RES_T> implements
         ResultCallback<A_RES_T> {
 
+    private final static Logger LOGGER = LoggerFactory.getLogger(ResultCallbackTemplate.class);
+
     private final CountDownLatch finished = new CountDownLatch(1);
 
     private Closeable stream;
@@ -35,6 +40,7 @@ public void onNext(A_RES_T object) {
     @Override
     public void onError(Throwable throwable) {
         try {
+            LOGGER.error("Error during callback", throwable);
             throw new RuntimeException(throwable);
         } finally {
             try {
diff --git a/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/EventsCmdImpl.java
@@ -1,7 +1,10 @@
 package com.github.dockerjava.core.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.github.dockerjava.api.command.EventsCmd;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.Filters;
 
 /**
  * Stream docker events
@@ -12,6 +15,8 @@ public class EventsCmdImpl extends AbstrAsyncDockerCmd<EventsCmd, Event> impleme
 
     private String until;
 
+    private Filters filters;
+
     public EventsCmdImpl(EventsCmd.Exec exec) {
         super(exec);
     }
@@ -28,6 +33,13 @@ public EventsCmd withUntil(String until) {
         return this;
     }
 
+    @Override
+    public EventsCmd withFilters(Filters filters) {
+        checkNotNull(filters, "filters have not been specified");
+        this.filters = filters;
+        return this;
+    }
+
     @Override
     public String getSince() {
         return since;
@@ -38,9 +50,15 @@ public String getUntil() {
         return until;
     }
 
+    @Override
+    public Filters getFilters() {
+        return filters;
+    }
+
     @Override
     public String toString() {
         return new StringBuilder("events").append(since != null ? " --since=" + since : "")
-                .append(until != null ? " --until=" + until : "").toString();
+                .append(until != null ? " --until=" + until : "")
+                .append(filters != null ? " --filters=" + filters : "").toString();
     }
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.jaxrs;
 
+import static com.google.common.net.UrlEscapers.*;
+
 import javax.ws.rs.client.WebTarget;
 
 import org.slf4j.Logger;
@@ -25,6 +27,11 @@ protected AbstractCallbackNotifier<Event> callbackNotifier(EventsCmd command, Re
         WebTarget webTarget = getBaseResource().path("/events").queryParam("since", command.getSince())
                 .queryParam("until", command.getUntil());
 
+        if (command.getFilters() != null) {
+            webTarget = webTarget
+                    .queryParam("filters", urlPathSegmentEscaper().escape(command.getFilters().toString()));
+        }
+
         LOGGER.trace("GET: {}", webTarget);
 
         return new GETCallbackNotifier<Event>(new JsonStreamProcessor<Event>(Event.class), resultCallback,
diff --git a/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java b/src/main/java/com/github/dockerjava/jaxrs/async/AbstractCallbackNotifier.java
@@ -48,6 +48,11 @@ public Void call() throws Exception {
                 resultCallback.onError(e.getCause());
             }
             return null;
+        } catch (Exception e) {
+            if (resultCallback != null) {
+                resultCallback.onError(e);
+            }
+            return null;
         }
 
         try {
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -15,6 +15,7 @@
 
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.api.model.Event;
+import com.github.dockerjava.api.model.EventFilters;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
 
@@ -107,6 +108,22 @@ public void testEventStreaming2() throws Exception {
         assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
     }
 
+    public void testEventStreamingWithFilter() throws Exception {
+        // Don't include other tests events
+        TimeUnit.SECONDS.sleep(1);
+
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        EventCallbackTest eventCallback = dockerClient.eventsCmd().withFilters(new EventFilters().withEvent("start"))
+                .exec(new EventCallbackTest(countDownLatch));
+
+        generateEvents();
+
+        boolean zeroCount = countDownLatch.await(10, TimeUnit.SECONDS);
+
+        eventCallback.close();
+        assertTrue(zeroCount, "Received only: " + eventCallback.getEvents());
+    }
+
     /**
      * This method generates {#link KNOWN_NUM_EVENTS} events
      */
diff --git a/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java b/src/test/java/com/github/dockerjava/test/serdes/JSONResourceRef.java
@@ -15,7 +15,6 @@
  */
 package com.github.dockerjava.test.serdes;
 
-
 /**
  * References JSON resources, which
  * 

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,11 @@ public Void call() throws Exception {`
`48`	`48`	`resultCallback.onError(e.getCause());`
`49`	`49`	`}`
`50`	`50`	`return null;`
	`51`	`+ } catch (Exception e) {`
	`52`	`+ if (resultCallback != null) {`
	`53`	`+ resultCallback.onError(e);`
	`54`	`+ }`
	`55`	`+ return null;`
`51`	`56`	`}`
`52`	`57`
`53`	`58`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`*/`
`16`	`16`	`package com.github.dockerjava.test.serdes;`
`17`	`17`
`18`		`-`
`19`	`18`	`/**`
`20`	`19`	`* References JSON resources, which`
`21`	`20`	`*`