This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit bfbc9bd5058396a54a7c66f5655e0d3823cd86d9 Author: juanpablo <[email protected]> AuthorDate: Sun May 3 20:02:04 2020 +0200 Removed WorkflowManager#start( Workflow ), in favour of Workflow#start() The former was a simple pass-through of the latter, without providing anything else. --- .../src/main/java/org/apache/wiki/auth/DefaultUserManager.java | 2 +- .../src/main/java/org/apache/wiki/pages/DefaultPageManager.java | 2 +- .../java/org/apache/wiki/workflow/DefaultWorkflowManager.java | 8 -------- .../src/main/java/org/apache/wiki/workflow/WorkflowManager.java | 9 --------- .../test/java/org/apache/wiki/workflow/WorkflowManagerTest.java | 4 ++-- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java index 776f741..605994c 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java @@ -273,7 +273,7 @@ public class DefaultUserManager implements UserManager { null ); workflow.setAttribute( WorkflowManager.WF_UP_CREATE_SAVE_ATTR_SAVED_PROFILE, profile ); - m_engine.getManager( WorkflowManager.class ).start( workflow ); + workflow.start(); final boolean approvalRequired = workflow.getCurrentStep() instanceof Decision; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java index 30cbe8b..3a318bb 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java @@ -264,7 +264,7 @@ public class DefaultPageManager implements PageManager { facts, completionTask, rejectKey ); - m_engine.getManager( WorkflowManager.class ).start( workflow ); + workflow.start(); // Let callers know if the page-save requires approval if ( workflow.getCurrentStep() instanceof Decision ) { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java index 7efeaaf..fb6e648 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java @@ -69,14 +69,6 @@ public class DefaultWorkflowManager implements WorkflowManager { * {@inheritDoc} */ @Override - public void start( final Workflow workflow ) throws WikiException { - workflow.start(); - } - - /** - * {@inheritDoc} - */ - @Override public Set< Workflow > getWorkflows() { final Set< Workflow > workflows = ConcurrentHashMap.newKeySet(); workflows.addAll( m_workflows ); diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java index 064b93b..bd255dd 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java @@ -72,15 +72,6 @@ public interface WorkflowManager extends WikiEventListener, Initializable { String PROPERTY_APPROVER_PREFIX = "jspwiki.approver."; /** - * Adds a new workflow to the set of workflows and starts it. The new workflow is automatically assigned a unique ID. If another - * workflow with the same ID already exists, this method throws a WikIException. - * - * @param workflow the workflow to start - * @throws WikiException if a workflow the automatically assigned ID already exist; this should not happen normally - */ - void start( Workflow workflow ) throws WikiException; - - /** * Returns a collection of the currently active workflows. * * @return the current workflows diff --git a/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java index 8975859..3db7311 100644 --- a/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java +++ b/jspwiki-main/src/test/java/org/apache/wiki/workflow/WorkflowManagerTest.java @@ -54,7 +54,7 @@ public class WorkflowManagerTest { public void testStart() throws WikiException { // Once we start the workflow, it should show that it's started and the WM should have assigned it an ID Assertions.assertFalse( w.isStarted() ); - wm.start( w ); + w.start(); Assertions.assertNotEquals( Workflow.ID_NOT_SET, w.getId() ); Assertions.assertTrue( w.isStarted() ); } @@ -66,7 +66,7 @@ public class WorkflowManagerTest { Assertions.assertEquals( 0, wm.getCompletedWorkflows().size() ); // After starting, there should be 1 in the cache - wm.start( w ); + w.start(); Assertions.assertEquals( 1, wm.getWorkflows().size() ); Assertions.assertEquals( 0, wm.getCompletedWorkflows().size() ); final Workflow workflow = wm.getWorkflows().iterator().next();
