NXP-24680: Don't swallow exception

NXP-24680: Don't swallow exception - more
nuxeo · Mar 22, 2018 · a5bc7b3 · a5bc7b3
1 parent 63ad774
commit a5bc7b3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...n-core/src/main/java/org/nuxeo/vision/core/listener/PictureConversionChangedListener.java b/...n-core/src/main/java/org/nuxeo/vision/core/listener/PictureConversionChangedListener.java
@@ -29,6 +29,7 @@
 import org.nuxeo.ecm.automation.OperationException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
+import org.nuxeo.ecm.core.api.NuxeoException;
 import org.nuxeo.ecm.core.event.*;
 import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
 import org.nuxeo.ecm.core.event.impl.EventContextImpl;
@@ -76,7 +77,7 @@ protected void handleEvent(Event event) {
             eventService.fireEvent(eventToSend);
 
         } catch (OperationException e) {
-            log.warn(e);
+            throw new NuxeoException(e);
         }
     }
 }
diff --git a/nuxeo-vision-core/src/main/java/org/nuxeo/vision/core/operation/VisionOp.java b/nuxeo-vision-core/src/main/java/org/nuxeo/vision/core/operation/VisionOp.java
@@ -27,6 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuxeo.ecm.automation.OperationContext;
+import org.nuxeo.ecm.automation.OperationException;
 import org.nuxeo.ecm.automation.core.Constants;
 import org.nuxeo.ecm.automation.core.annotations.Context;
 import org.nuxeo.ecm.automation.core.annotations.Operation;
@@ -69,7 +70,7 @@ public class VisionOp {
     protected int maxResults;
 
     @OperationMethod
-    public Blob run(Blob blob) {
+    public Blob run(Blob blob) throws OperationException {
         if (blob == null) {
             return null;
         }
@@ -79,7 +80,7 @@ public Blob run(Blob blob) {
     }
 
     @OperationMethod
-    public BlobList run(BlobList blobs) {
+    public BlobList run(BlobList blobs) throws OperationException {
         List<VisionResponse> results;
 
         // Convert feature string to enum
@@ -96,7 +97,7 @@ public BlobList run(BlobList blobs) {
             }
             ctx.put(outputVariable, results);
         } catch (IOException | GeneralSecurityException e) {
-            log.warn("Call to google vision API failed", e);
+            throw new OperationException("Call to google vision API failed", e);
         }
         return blobs;
     }

diff --git a/nuxeo-vision-core/src/main/java/org/nuxeo/vision/core/worker/VideoVisionWorker.java b/nuxeo-vision-core/src/main/java/org/nuxeo/vision/core/worker/VideoVisionWorker.java
@@ -27,6 +27,7 @@
 import org.nuxeo.ecm.automation.OperationException;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.IdRef;
+import org.nuxeo.ecm.core.api.NuxeoException;
 import org.nuxeo.ecm.core.event.Event;
 import org.nuxeo.ecm.core.event.EventService;
 import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
@@ -84,7 +85,7 @@ public void work() {
             eventService.fireEvent(eventToSend);
 
         } catch (OperationException e) {
-            log.warn(e);
+            throw new NuxeoException("Failed to run nuxeo vision",e);
         }
 
         setStatus("Done");