NXP-17447, NXP-16052: deprecate ClientException, remove throws Exception

nuxeo · Jul 6, 2015 · 2225636 · 2225636
1 parent 12411fb
commit 2225636
Show file tree

Hide file tree

Showing 43 changed files with 92 additions and 194 deletions.
diff --git a/...latform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/AbstractJbpmHandlerHelper.java b/...latform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/AbstractJbpmHandlerHelper.java
@@ -54,15 +54,15 @@ public abstract class AbstractJbpmHandlerHelper implements ActionHandler, Assign
 
     public static final String SUFFIX_MAJOR = "_MAJOR";
 
-    public void execute(ExecutionContext executionContext) throws Exception {
+    public void execute(ExecutionContext executionContext) {
         throw new UnsupportedOperationException();
     }
 
-    public void assign(Assignable assignable, ExecutionContext executionContext) throws Exception {
+    public void assign(Assignable assignable, ExecutionContext executionContext) {
         throw new UnsupportedOperationException();
     }
 
-    public String decide(ExecutionContext executionContext) throws Exception {
+    public String decide(ExecutionContext executionContext) {
         throw new UnsupportedOperationException();
     }
 
@@ -74,7 +74,7 @@ public void submitTaskVariables(TaskInstance taskInstance, ContextInstance conte
         throw new UnsupportedOperationException();
     }
 
-    public JbpmService getJbpmService() throws Exception {
+    public JbpmService getJbpmService() {
         if (jbpmService == null) {
             jbpmService = Framework.getService(JbpmService.class);
         }
@@ -114,12 +114,12 @@ protected String getSwimlaneUser(String swimlaneName) {
 
     /** @deprecated since 5.4 */
     @Deprecated
-    protected void followTransition(NuxeoPrincipal principal, DocumentRef docRef, String transition) throws Exception {
+    protected void followTransition(NuxeoPrincipal principal, DocumentRef docRef, String transition) {
         followTransition(principal, docRef, transition, null);
     }
 
     protected void followTransition(NuxeoPrincipal principal, DocumentRef docRef, String transition,
-            VersioningOption option) throws Exception {
+            VersioningOption option) {
         try (CoreSession coreSession = CoreInstance.openCoreSession(getDocumentRepositoryName(), principal)) {
             coreSession.followTransition(docRef, transition);
             if (option != null) {

diff --git a/nuxeo-platform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/JbpmService.java b/nuxeo-platform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/JbpmService.java
@@ -27,7 +27,6 @@
 import org.jbpm.graph.def.ProcessDefinition;
 import org.jbpm.graph.exe.ProcessInstance;
 import org.jbpm.taskmgmt.exe.TaskInstance;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.NuxeoPrincipal;

diff --git a/nuxeo-platform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/JbpmTaskListService.java b/nuxeo-platform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/JbpmTaskListService.java
@@ -20,7 +20,6 @@
 
 import java.util.List;
 
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 
 /**

diff --git a/nuxeo-platform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/NuxeoJbpmException.java b/nuxeo-platform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/NuxeoJbpmException.java
@@ -16,12 +16,12 @@
  */
 package org.nuxeo.ecm.platform.jbpm;
 
-import org.nuxeo.ecm.core.api.ClientException;
+import org.nuxeo.ecm.core.api.NuxeoException;
 
 /**
  * @author arussel
  */
-public class NuxeoJbpmException extends ClientException {
+public class NuxeoJbpmException extends NuxeoException {
 
     private static final long serialVersionUID = 1L;
 

diff --git a/nuxeo-platform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/TaskListImpl.java b/nuxeo-platform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/TaskListImpl.java
@@ -26,7 +26,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.DocumentModel;
 
 public class TaskListImpl implements TaskList {
@@ -93,12 +92,7 @@ public DocumentModel getDocument() {
     }
 
     public String getName() {
-        try {
-            return doc.getTitle();
-        } catch (ClientException e) {
-            log.error(e);
-        }
-        return null;
+        return doc.getTitle();
     }
 
     public String getUUID() {

diff --git a/...jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/dashboard/DocumentProcessItemImpl.java b/...jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/dashboard/DocumentProcessItemImpl.java
@@ -22,7 +22,6 @@
 import java.util.Date;
 
 import org.jbpm.graph.exe.ProcessInstance;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.DocumentModel;
 
 /**
@@ -47,11 +46,7 @@ public class DocumentProcessItemImpl implements DocumentProcessItem {
     public DocumentProcessItemImpl(ProcessInstance processInstance, DocumentModel documentModel) {
         this.documentModel = documentModel;
         this.processInstance = processInstance;
-        try {
-            docTitle = documentModel.getTitle();
-        } catch (ClientException e) {
-            docTitle = null;
-        }
+        docTitle = documentModel.getTitle();
         processInstanceName = processInstance.getProcessDefinition().getName();
         processInstanceStartDate = processInstance.getStart();
     }

diff --git a/...tform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/dashboard/WorkflowDashBoard.java b/...tform-jbpm-api/src/main/java/org/nuxeo/ecm/platform/jbpm/dashboard/WorkflowDashBoard.java
@@ -21,7 +21,6 @@
 
 import java.util.Collection;
 
-import org.nuxeo.ecm.core.api.ClientException;
 
 public interface WorkflowDashBoard {
 

diff --git a/...bpm-automation/src/main/java/org/nuxeo/ecm/automation/jbpm/AbstractWorkflowOperation.java b/...bpm-automation/src/main/java/org/nuxeo/ecm/automation/jbpm/AbstractWorkflowOperation.java
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import org.nuxeo.common.utils.i18n.I18NUtils;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.impl.DocumentLocationImpl;
 import org.nuxeo.ecm.platform.types.adapter.TypeInfo;

diff --git a/nuxeo-platform-jbpm-automation/src/main/java/org/nuxeo/ecm/automation/jbpm/CreateTask.java b/nuxeo-platform-jbpm-automation/src/main/java/org/nuxeo/ecm/automation/jbpm/CreateTask.java
@@ -106,7 +106,7 @@ public enum OperationTaskVariableName {
 
     @OperationMethod(collector = DocumentModelCollector.class)
     @SuppressWarnings("unchecked")
-    public DocumentModel run(DocumentModel document) throws Exception {
+    public DocumentModel run(DocumentModel document) throws OperationException {
         Principal pal = coreSession.getPrincipal();
         if (!(pal instanceof NuxeoPrincipal)) {
             throw new OperationException("Principal is not an instance of NuxeoPrincipal");

diff --git a/nuxeo-platform-jbpm-automation/src/main/java/org/nuxeo/ecm/automation/jbpm/GetUserTasks.java b/nuxeo-platform-jbpm-automation/src/main/java/org/nuxeo/ecm/automation/jbpm/GetUserTasks.java
@@ -63,7 +63,7 @@ public class GetUserTasks {
     protected JbpmService srv;
 
     @OperationMethod
-    public Blob run() throws Exception {
+    public Blob run() {
         NuxeoPrincipal principal = principal();
         List<TaskInstance> tasks = srv.getCurrentTaskInstances(principal, filter());
         if (tasks == null) {

diff --git a/...omation/src/main/java/org/nuxeo/ecm/automation/jbpm/UserProcessPageProviderOperation.java b/...omation/src/main/java/org/nuxeo/ecm/automation/jbpm/UserProcessPageProviderOperation.java
@@ -71,7 +71,7 @@ public class UserProcessPageProviderOperation extends AbstractWorkflowOperation
 
     @SuppressWarnings("unchecked")
     @OperationMethod
-    public Blob run() throws Exception {
+    public Blob run() {
         Map<String, Serializable> props = new HashMap<String, Serializable>();
         props.put(UserProcessPageProvider.CORE_SESSION_PROPERTY, (Serializable) session);
         PageProviderService pps = Framework.getLocalService(PageProviderService.class);

diff --git a/...automation/src/main/java/org/nuxeo/ecm/automation/jbpm/UserTaskPageProviderOperation.java b/...automation/src/main/java/org/nuxeo/ecm/automation/jbpm/UserTaskPageProviderOperation.java
@@ -71,7 +71,7 @@ public class UserTaskPageProviderOperation extends AbstractWorkflowOperation {
 
     @SuppressWarnings("unchecked")
     @OperationMethod
-    public Blob run() throws Exception {
+    public Blob run() {
         Map<String, Serializable> props = new HashMap<String, Serializable>();
         props.put(UserProcessPageProvider.CORE_SESSION_PROPERTY, (Serializable) session);
         PageProviderService pps = Framework.getLocalService(PageProviderService.class);

diff --git a/...-automation/src/main/java/org/nuxeo/ecm/automation/jbpm/event/TaskEndedEventListener.java b/...-automation/src/main/java/org/nuxeo/ecm/automation/jbpm/event/TaskEndedEventListener.java
@@ -26,7 +26,6 @@
 import org.nuxeo.ecm.automation.InvalidChainException;
 import org.nuxeo.ecm.automation.OperationContext;
 import org.nuxeo.ecm.automation.jbpm.CreateTask.OperationTaskVariableName;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.event.Event;
 import org.nuxeo.ecm.core.event.EventContext;
 import org.nuxeo.ecm.core.event.EventListener;

diff --git a/...ore/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/AbandonProcessUnrestricted.java b/...ore/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/AbandonProcessUnrestricted.java
@@ -16,7 +16,6 @@
  */
 package org.nuxeo.ecm.platform.jbpm.core.helper;
 
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.DocumentRef;

diff --git a/...jbpm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/AddRightUnrestricted.java b/...jbpm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/AddRightUnrestricted.java
@@ -16,7 +16,6 @@
  */
 package org.nuxeo.ecm.platform.jbpm.core.helper;
 
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentRef;
 import org.nuxeo.ecm.core.api.UnrestrictedSessionRunner;

diff --git a/...pm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/AddRightsActionHandler.java b/...pm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/AddRightsActionHandler.java
@@ -51,7 +51,7 @@ public class AddRightsActionHandler extends AbstractJbpmHandlerHelper {
 
     @Override
     @SuppressWarnings("unchecked")
-    public void execute(ExecutionContext executionContext) throws Exception {
+    public void execute(ExecutionContext executionContext) {
         this.executionContext = executionContext;
         if (nuxeoHasStarted() && list != null) {
             List<VirtualTaskInstance> participants = (List<VirtualTaskInstance>) executionContext.getContextInstance().getTransientVariable(

diff --git a/...pm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/EndProcessUnrestricted.java b/...pm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/EndProcessUnrestricted.java
@@ -22,7 +22,6 @@
 
 import org.jbpm.taskmgmt.exe.PooledActor;
 import org.jbpm.taskmgmt.exe.TaskInstance;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.UnrestrictedSessionRunner;
 

diff --git a/...c/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/LifecycleTransitionActionHandler.java b/...c/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/LifecycleTransitionActionHandler.java
@@ -36,7 +36,7 @@ public class LifecycleTransitionActionHandler extends AbstractJbpmHandlerHelper
 
     private static final long serialVersionUID = 1L;
 
-    protected NuxeoPrincipal getNuxeoPrincipal(String user) throws Exception {
+    protected NuxeoPrincipal getNuxeoPrincipal(String user) {
         UserManager userManager = Framework.getService(UserManager.class);
         if (user.startsWith(NuxeoPrincipal.PREFIX)) {
             user = user.substring(NuxeoPrincipal.PREFIX.length());
@@ -45,7 +45,7 @@ protected NuxeoPrincipal getNuxeoPrincipal(String user) throws Exception {
     }
 
     @Override
-    public void execute(ExecutionContext executionContext) throws Exception {
+    public void execute(ExecutionContext executionContext) {
         this.executionContext = executionContext;
         if (nuxeoHasStarted()) {
             String endLifecycle = getEndLifecycleTransition();

diff --git a/...rm-jbpm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/PublicationHelper.java b/...rm-jbpm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/PublicationHelper.java
@@ -20,17 +20,16 @@
 
 import org.jbpm.graph.exe.ExecutionContext;
 import org.jbpm.taskmgmt.exe.Assignable;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
 
 // FIXME: this interface has no implementation. Remove?
 public interface PublicationHelper extends Serializable {
 
-    String decide(ExecutionContext executionContext) throws Exception;
+    String decide(ExecutionContext executionContext);
 
     void publishDocument(CoreSession session, DocumentModel docToPublish, DocumentModel sectionToPublish);
 
-    void assign(Assignable assignable, ExecutionContext executionContext) throws Exception;
+    void assign(Assignable assignable, ExecutionContext executionContext);
 
 }
diff --git a/...core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/RemoveRightsActionHandler.java b/...core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/RemoveRightsActionHandler.java
@@ -35,7 +35,7 @@ public class RemoveRightsActionHandler extends AbstractJbpmHandlerHelper {
     private static final long serialVersionUID = 1L;
 
     @Override
-    public void execute(ExecutionContext executionContext) throws Exception {
+    public void execute(ExecutionContext executionContext) {
         this.executionContext = executionContext;
         if (nuxeoHasStarted()) {
             try (CoreSession session = CoreInstance.openCoreSessionSystem(getDocumentRepositoryName())) {

diff --git a/...-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/RemoveRightsUnrestricted.java b/...-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/RemoveRightsUnrestricted.java
@@ -16,7 +16,6 @@
  */
 package org.nuxeo.ecm.platform.jbpm.core.helper;
 
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentRef;
 import org.nuxeo.ecm.core.api.UnrestrictedSessionRunner;

diff --git a/...pm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/SendEventActionHandler.java b/...pm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/SendEventActionHandler.java
@@ -6,7 +6,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jbpm.graph.exe.ExecutionContext;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreInstance;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -39,7 +38,7 @@ public class SendEventActionHandler extends AbstractJbpmHandlerHelper {
     protected String recipients;
 
     @Override
-    public void execute(ExecutionContext executionContext) throws Exception {
+    public void execute(ExecutionContext executionContext) {
         this.executionContext = executionContext;
         assert eventName != null;
         assert recipients != null;
@@ -60,11 +59,7 @@ public void execute(ExecutionContext executionContext) throws Exception {
     }
 
     protected EventProducer getEventProducerService() {
-        try {
-            return Framework.getService(EventProducer.class);
-        } catch (Exception e) {
-            throw new ClientException(e);
-        }
+        return Framework.getService(EventProducer.class);
     }
 
     protected String[] getRecipients() {

diff --git a/...m-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/TaskNotificationHandler.java b/...m-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/helper/TaskNotificationHandler.java
@@ -21,7 +21,6 @@
 
 import org.jbpm.graph.exe.Comment;
 import org.jbpm.graph.exe.ExecutionContext;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreInstance;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -47,7 +46,7 @@ public class TaskNotificationHandler extends AbstractJbpmHandlerHelper {
     private static final String DIRECTIVE_KEY = "directive";
 
     @Override
-    public void execute(ExecutionContext executionContext) throws Exception {
+    public void execute(ExecutionContext executionContext) {
         this.executionContext = executionContext;
         if (nuxeoHasStarted()) {
             DocumentModel documentModel = (DocumentModel) getTransientVariable(JbpmService.VariableName.document.name());
@@ -56,12 +55,7 @@ public void execute(ExecutionContext executionContext) throws Exception {
                 return;
             }
             try (CoreSession coreSession = CoreInstance.openCoreSession(getDocumentRepositoryName(), principal)) {
-                EventProducer eventProducer;
-                try {
-                    eventProducer = Framework.getService(EventProducer.class);
-                } catch (Exception e) {
-                    throw new ClientException(e);
-                }
+                EventProducer eventProducer = Framework.getService(EventProducer.class);
                 DocumentEventContext ctx = new DocumentEventContext(coreSession, principal, documentModel);
                 ctx.setProperty(NotificationConstants.RECIPIENTS_KEY, getRecipients());
                 ctx.setProperty(DocumentEventContext.COMMENT_PROPERTY_KEY, getComments());

diff --git a/...orm-jbpm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/service/JbpmServiceImpl.java b/...orm-jbpm-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/service/JbpmServiceImpl.java
@@ -39,7 +39,6 @@
 import org.jbpm.persistence.db.DbPersistenceServiceFactory;
 import org.jbpm.svc.Services;
 import org.jbpm.taskmgmt.exe.TaskInstance;
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreInstance;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
@@ -48,6 +47,7 @@
 import org.nuxeo.ecm.core.api.NuxeoPrincipal;
 import org.nuxeo.ecm.core.event.EventProducer;
 import org.nuxeo.ecm.core.event.impl.DocumentEventContext;
+import org.nuxeo.ecm.core.model.NoSuchDocumentException;
 import org.nuxeo.ecm.platform.jbpm.JbpmActorsListFilter;
 import org.nuxeo.ecm.platform.jbpm.JbpmListFilter;
 import org.nuxeo.ecm.platform.jbpm.JbpmOperation;
@@ -326,7 +326,7 @@ protected DocumentModel getDocumentModel(NuxeoPrincipal user, String docId, Stri
             DocumentModel result = session.getDocument(new IdRef(docId));
             result.detach(true);
             return result;
-        } catch (ClientException e) {
+        } catch (NoSuchDocumentException e) {
             throw new NuxeoJbpmException(e);
         }
     }
@@ -553,12 +553,8 @@ public Serializable run(JbpmContext context) throws NuxeoJbpmException {
         });
     }
 
-    protected NuxeoPrincipal getPrincipal(String user) throws NuxeoJbpmException {
-        try {
-            return getUserManager().getPrincipal(user);
-        } catch (ClientException e) {
-            throw new NuxeoJbpmException(e);
-        }
+    protected NuxeoPrincipal getPrincipal(String user) {
+        return getUserManager().getPrincipal(user);
     }
 
     protected UserManager getUserManager() {
@@ -885,7 +881,7 @@ public ArrayList<TaskInstance> run(JbpmContext context) throws NuxeoJbpmExceptio
         });
     }
 
-    protected EventProducer getEventProducer() throws Exception {
+    protected EventProducer getEventProducer() {
         if (eventProducer == null) {
             eventProducer = Framework.getService(EventProducer.class);
         }
@@ -898,11 +894,7 @@ public void notifyEventListeners(String name, String comment, String[] recipient
         DocumentEventContext ctx = new DocumentEventContext(session, principal, doc);
         ctx.setProperty("recipients", recipients);
         ctx.getProperties().put("comment", comment);
-        try {
-            getEventProducer().fireEvent(ctx.newEvent(name));
-        } catch (Exception e) {
-            throw new ClientException(e);
-        }
+        getEventProducer().fireEvent(ctx.newEvent(name));
     }
 
 }
diff --git a/...-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/service/JbpmTaskListServiceImpl.java b/...-core/src/main/java/org/nuxeo/ecm/platform/jbpm/core/service/JbpmTaskListServiceImpl.java
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.DocumentModelList;