Added additional callback methods to EventCallback

sabre1041 · sabre1041 · commit cdbd58ca0dae · 2014-09-21T19:41:19.000-05:00
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/api/model/EventNotifier.java b/src/main/java/com/github/dockerjava/api/model/EventNotifier.java
@@ -35,18 +35,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
@@ -110,5 +110,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
`@@ -35,18 +35,26 @@ public static EventNotifier create(EventCallback eventCallback, WebTarget webTar`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public Void call() throws Exception {`
`38`		`- Response response = webTarget.request().get(Response.class);`
`39`		`- InputStream inputStream = response.readEntity(InputStream.class);`
	`38`	`+ int numEvents=0;`
	`39`	`+ Response response = null;`
`40`	`40`	`try {`
	`41`	`+ response = webTarget.request().get(Response.class);`
	`42`	`+ InputStream inputStream = response.readEntity(InputStream.class);`
`41`	`43`	`JsonParser jp = JSON_FACTORY.createParser(inputStream);`
`42`	`44`	`while (jp.nextToken() != JsonToken.END_OBJECT && !jp.isClosed()) {`
`43`	`45`	`eventCallback.onEvent(OBJECT_MAPPER.readValue(jp, Event.class));`
	`46`	`+ numEvents++;`
`44`	`47`	`}`
`45`		`- } finally {`
	`48`	`+ }`
	`49`	`+ catch(Exception e) {`
	`50`	`+ eventCallback.onException(e);`
	`51`	`+ }`
	`52`	`+ finally {`
`46`	`53`	`if (response != null) {`
`47`	`54`	`response.close();`
`48`	`55`	`}`
`49`	`56`	`}`
	`57`	`+ eventCallback.onCompletion(numEvents);`
`50`	`58`	`return null;`
`51`	`59`	`}`
`52`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,5 +110,15 @@ public void onEvent(Event event) {`
`110`	`110`	`LOG.info("Received event #{}: {}", countDownLatch.getCount(), event);`
`111`	`111`	`countDownLatch.countDown();`
`112`	`112`	`}`
	`113`	`+`
	`114`	`+ @Override`
	`115`	`+ public void onException(Throwable throwable) {`
	`116`	`+ LOG.error("Error occurred: {}", throwable.getMessage());`
	`117`	`+ }`
	`118`	`+`
	`119`	`+ @Override`
	`120`	`+ public void onCompletion(int numEvents) {`
	`121`	`+ LOG.info("Number of events received: {}", numEvents);`
	`122`	`+ }`
`113`	`123`	`}`
`114`	`124`	`}`