Merge branch 'events-callback' of

Marcus Linke · Marcus Linke · commit 0e899db80e6e · 2014-09-23T21:31:22.000+02:00
https://github.com/sabre1041/docker-java into sabre1041-events-callback Conflicts: src/main/java/com/github/dockerjava/api/model/EventNotifier.java
diff --git a/src/main/java/com/github/dockerjava/api/command/EventCallback.java b/src/main/java/com/github/dockerjava/api/command/EventCallback.java
@@ -7,4 +7,6 @@
  */
 public interface EventCallback {
     public void onEvent(Event event);
+    public void onException(Throwable throwable);
+    public void onCompletion(int numEvents);
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -61,18 +61,26 @@ public static EventNotifier create(EventCallback eventCallback, WebTarget webTar
 
         @Override
         public Void call() throws Exception {
-            Response response = webTarget.request().get(Response.class);
-            InputStream inputStream = response.readEntity(InputStream.class);
+            int numEvents=0;
+            Response response = null;
             try {
+                response = webTarget.request().get(Response.class);
+                InputStream inputStream = response.readEntity(InputStream.class);
                 JsonParser jp = JSON_FACTORY.createParser(inputStream);
                 while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed()) {
                     eventCallback.onEvent(OBJECT_MAPPER.readValue(jp, Event.class));
+                    numEvents++;
                 }
-            } finally {
+            }
+            catch(Exception e) {
+                eventCallback.onException(e);
+            }
+            finally {
                 if (response != null) {
                     response.close();
                 }
             }
+            eventCallback.onCompletion(numEvents);
             return null;
         }
     }
diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -112,5 +112,15 @@ public void onEvent(Event event) {
             LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);
             countDownLatch.countDown();
         }
+
+        @Override
+        public void onException(Throwable throwable) {
+           LOG.error("Error occurred: {}", throwable.getMessage());
+        }
+
+        @Override
+        public void onCompletion(int numEvents) {
+            LOG.info("Number of events received: {}", numEvents);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,6 @@`
`7`	`7`	`*/`
`8`	`8`	`public interface EventCallback {`
`9`	`9`	`public void onEvent(Event event);`
	`10`	`+ public void onException(Throwable throwable);`
	`11`	`+ public void onCompletion(int numEvents);`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,18 +61,26 @@ public static EventNotifier create(EventCallback eventCallback, WebTarget webTar`
`61`	`61`
`62`	`62`	`@Override`
`63`	`63`	`public Void call() throws Exception {`
`64`		`- Response response = webTarget.request().get(Response.class);`
`65`		`- InputStream inputStream = response.readEntity(InputStream.class);`
	`64`	`+ int numEvents=0;`
	`65`	`+ Response response = null;`
`66`	`66`	`try {`
	`67`	`+ response = webTarget.request().get(Response.class);`
	`68`	`+ InputStream inputStream = response.readEntity(InputStream.class);`
`67`	`69`	`JsonParser jp = JSON_FACTORY.createParser(inputStream);`
`68`	`70`	`while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed()) {`
`69`	`71`	`eventCallback.onEvent(OBJECT_MAPPER.readValue(jp, Event.class));`
	`72`	`+ numEvents++;`
`70`	`73`	`}`
`71`		`- } finally {`
	`74`	`+ }`
	`75`	`+ catch(Exception e) {`
	`76`	`+ eventCallback.onException(e);`
	`77`	`+ }`
	`78`	`+ finally {`
`72`	`79`	`if (response != null) {`
`73`	`80`	`response.close();`
`74`	`81`	`}`
`75`	`82`	`}`
	`83`	`+ eventCallback.onCompletion(numEvents);`
`76`	`84`	`return null;`
`77`	`85`	`}`
`78`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,5 +112,15 @@ public void onEvent(Event event) {`
`112`	`112`	`LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);`
`113`	`113`	`countDownLatch.countDown();`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ @Override`
	`117`	`+ public void onException(Throwable throwable) {`
	`118`	`+ LOG.error("Error occurred: {}", throwable.getMessage());`
	`119`	`+ }`
	`120`	`+`
	`121`	`+ @Override`
	`122`	`+ public void onCompletion(int numEvents) {`
	`123`	`+ LOG.info("Number of events received: {}", numEvents);`
	`124`	`+ }`
`115`	`125`	`}`
`116`	`126`	`}`