[jbpm-commits] JBoss JBPM SVN: r3663 - in jbpm4/trunk/modules/pvm/src: main/java/org/jbpm/pvm/internal/model and 2 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-01-16 12:16:26 -0500 (Fri, 16 Jan 2009) New Revision: 3663 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java Log: switching from ProcessFactory to ProcessDefinitionBuilder Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/CompositeBuilder.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -29,6 +29,8 @@ import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.model.VariableDefinitionImpl; import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; +import org.jbpm.pvm.model.ProcessFactory; /** * @author Tom Baeyens @@ -104,6 +106,16 @@ public EventBuilder startEvent(String eventName) { return new EventBuilder(this, eventName); } + + public ExceptionHandlerBuilder startExceptionHandler(Class<? extends Throwable> exceptionType) { + return new ExceptionHandlerBuilder(this, exceptionType); + } + + public CompositeBuilder property(String name, String value) { + StringDescriptor descriptor = new StringDescriptor(name, value); + compositeElement.addProperty(descriptor); + return this; + } public CompositeBuilder endActivity() { throw new JbpmException("calling endNode on a processBuilder is invalid"); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/EventBuilder.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -23,6 +23,7 @@ import org.jbpm.listener.EventListener; import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; /** @@ -67,6 +68,12 @@ return this; } + public EventBuilder property(String name, String value) { + StringDescriptor descriptor = new StringDescriptor(name, value); + getEvent().addProperty(descriptor); + return this; + } + public CompositeBuilder endEvent() { return compositeBuilder; } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.builder; + +import org.jbpm.listener.EventListener; +import org.jbpm.pvm.internal.model.ExceptionHandlerImpl; +import org.jbpm.pvm.internal.wire.Descriptor; + + +/** + * @author Tom Baeyens + */ +public class ExceptionHandlerBuilder { + + protected CompositeBuilder compositeBuilder; + protected ExceptionHandlerImpl exceptionHandler; + + public ExceptionHandlerBuilder(CompositeBuilder compositeBuilder, Class<? extends Throwable> exceptionType) { + this.compositeBuilder = compositeBuilder; + exceptionHandler = compositeBuilder.compositeElement.createExceptionHandler(); + exceptionHandler.setExceptionClassName(exceptionType.getName()); + } + + public ExceptionHandlerBuilder listener(EventListener eventListener) { + exceptionHandler.createEventListenerReference(eventListener); + return this; + } + + public ExceptionHandlerBuilder listener(Descriptor descriptor) { + exceptionHandler.createEventListenerReference(descriptor); + return this; + } + + public ExceptionHandlerBuilder listener(String expression) { + exceptionHandler + .createEventListenerReference() + .setExpression(expression); + return this; + } + + public CompositeBuilder endExceptionHandler() { + return compositeBuilder; + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ExceptionHandlerBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/FlowBuilder.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -25,6 +25,7 @@ import org.jbpm.model.Event; import org.jbpm.pvm.internal.model.TransitionImpl; import org.jbpm.pvm.internal.wire.Descriptor; +import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor; /** @@ -80,6 +81,12 @@ addListener(expression, propagation); return this; } + + public FlowBuilder property(String name, String value) { + StringDescriptor descriptor = new StringDescriptor(name, value); + transition.addProperty(descriptor); + return this; + } public ActivityBuilder endFlow() { return (ActivityBuilder) activityBuilder; Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ObservableBuilder.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -69,7 +69,7 @@ eventListenerReference.setPropagationEnabled(propagation); } - private EventImpl getEvent() { + protected EventImpl getEvent() { if (event==null) { this.event = observableElement.createEvent(eventName); } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/builder/ProcessDefinitionBuilder.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -27,6 +27,7 @@ import org.jbpm.log.Log; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; +import org.jbpm.pvm.model.ProcessFactory; /** * @author Tom Baeyens @@ -71,7 +72,7 @@ if (destination==null) { errorUnexistingFlowDestination(unresolvedFlow); } - unresolvedFlow.transition.setDestination(destination); + destination.addIncomingTransition(unresolvedFlow.transition); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/NodeImpl.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -439,21 +439,7 @@ return name; } public void setName(String name) { - // if there is no processDefinition associated with this node - if (processDefinition==null) { - // it s just a setter - this.name = name; - - } else { // otherwise - // make sure the processDefinition's activitiesMap remains up to date - if (this.name!=null) { - processDefinition.removeNode(this); - } - this.name = name; - if (name!=null) { - processDefinition.addNode(this); - } - } + this.name = name; } public TransitionImpl getDefaultTransition() { return defaultTransition; Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -93,6 +93,7 @@ .flow("x") .endActivity() .startActivity("a") + .flow("b") .endActivity() .startActivity("b") .endActivity() @@ -126,6 +127,13 @@ assertSame(toA, outgoingTransitionsMap.get(null)); assertSame(toB, outgoingTransitionsMap.get("to b")); assertSame(toC, outgoingTransitionsMap.get("to c")); + + NodeImpl b = (NodeImpl) processDefinition.getNode("b"); + List<Transition> incomingTransitions = b.getIncomingTransitions(); + assertNotNull(incomingTransitions); + assertEquals("x", incomingTransitions.get(0).getSource().getName()); + assertEquals("a", incomingTransitions.get(1).getSource().getName()); + assertEquals(2, incomingTransitions.size()); } public void testBuilderCompositeNodes() { @@ -167,21 +175,17 @@ assertNotNull(node13); assertSame(node1, processDefinition.getNodes().get(0)); - assertSame(node11, processDefinition.getNodes().get(1)); - assertSame(node12, processDefinition.getNodes().get(2)); - assertSame(node121, processDefinition.getNodes().get(3)); - assertSame(node122, processDefinition.getNodes().get(4)); - assertSame(node123, processDefinition.getNodes().get(5)); - assertSame(node13, processDefinition.getNodes().get(6)); - assertEquals(7, processDefinition.getNodes().size()); + assertEquals(1, processDefinition.getNodes().size()); assertSame(node11, node1.getNodes().get(0)); assertSame(node12, node1.getNodes().get(1)); assertSame(node13, node1.getNodes().get(2)); + assertEquals(3, node1.getNodes().size()); assertSame(node121, node12.getNodes().get(0)); assertSame(node122, node12.getNodes().get(1)); assertSame(node123, node12.getNodes().get(2)); + assertEquals(3, node12.getNodes().size()); assertSame(processDefinition, node1.getParent()); assertSame(node1, node11.getParent()); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -20,6 +20,7 @@ import org.jbpm.model.Node; import org.jbpm.model.OpenProcessDefinition; import org.jbpm.model.Transition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.model.ProcessFactory; @@ -37,7 +38,16 @@ * Defines a simple process: only nodes. persists it. */ public void testCacheProcessDefinitionNodes() { - OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().node("b").node("c").done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .endActivity() + .startActivity("b") + .endActivity() + .startActivity("c") + .endActivity() + .endProcess(); PvmDbSession pvmDbSession = environment.get(PvmDbSession.class); pvmDbSession.save(processDefinition); @@ -102,7 +112,16 @@ * Defines a simple process: only nodes. persists it. */ public void testCacheProcessDefinitionNodeOrder() { - OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().node("b").node("c").done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .endActivity() + .startActivity("b") + .endActivity() + .startActivity("c") + .endActivity() + .endProcess(); DbSession dbSession = environment.get(DbSession.class); dbSession.save(processDefinition); @@ -249,7 +268,18 @@ DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); - OpenProcessDefinition processDefinition = ProcessFactory.build().compositeNode().initial().node("a").node("b").node("c").compositeEnd().done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity() + .initial() + .startActivity("a") + .endActivity() + .startActivity("b") + .endActivity() + .startActivity("c") + .endActivity() + .endActivity() + .endProcess(); persistenceSession.save(processDefinition); @@ -293,9 +323,36 @@ DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); - OpenProcessDefinition processDefinition = ProcessFactory.build().compositeNode().initial().compositeNode("a").node("aa").node("ab").node("ac") - .compositeEnd().compositeNode("b").node("ba").node("bb").node("bc").compositeEnd().compositeNode("c").node("ca").node("cb").node("cc") - .compositeEnd().compositeEnd().done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity() + .initial() + .startActivity("a") + .startActivity("aa") + .endActivity() + .startActivity("ab") + .endActivity() + .startActivity("ac") + .endActivity() + .endActivity() + .startActivity("b") + .startActivity("ba") + .endActivity() + .startActivity("bb") + .endActivity() + .startActivity("bc") + .endActivity() + .endActivity() + .startActivity("c") + .startActivity("ca") + .endActivity() + .startActivity("cb") + .endActivity() + .startActivity("cc") + .endActivity() + .endActivity() + .endActivity() + .endProcess(); persistenceSession.save(processDefinition); @@ -378,8 +435,21 @@ public void testCacheDefaultTransition() { DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); - OpenProcessDefinition processDefinition = ProcessFactory.build().node().initial().transition().to("a").node("a").transition().to("b").node("b") - .transition().to("c").node("c").done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity() + .initial() + .flow("a") + .endActivity() + .startActivity("a") + .flow("b") + .endActivity() + .startActivity("b") + .flow("c") + .endActivity() + .startActivity("c") + .endActivity() + .endProcess(); persistenceSession.save(processDefinition); @@ -452,7 +522,18 @@ public void testCacheTwoTransitions() { DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); - OpenProcessDefinition processDefinition = ProcessFactory.build().node().initial().transition().to("a").transition().to("b").node("a").node("b").done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity() + .initial() + .flow("a") + .flow("b") + .endActivity() + .startActivity("a") + .endActivity() + .startActivity("b") + .endActivity() + .endProcess(); persistenceSession.save(processDefinition); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2009-01-16 15:37:10 UTC (rev 3662) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2009-01-16 17:16:26 UTC (rev 3663) @@ -20,11 +20,11 @@ import org.jbpm.model.Node; import org.jbpm.model.OpenProcessDefinition; import org.jbpm.model.Transition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.internal.model.EventImpl; import org.jbpm.pvm.internal.model.EventListenerReference; import org.jbpm.pvm.internal.model.ExceptionHandlerImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; -import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.session.DbSession; import org.jbpm.test.EnvironmentDbTestCase; @@ -52,7 +52,16 @@ } public void testProcessDefinitionNodes() { - OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().node("b").node("c").done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .endActivity() + .startActivity("b") + .endActivity() + .startActivity("c") + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -76,7 +85,16 @@ } public void testInitialNode() { - OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().node("b").node("c").done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .endActivity() + .startActivity("b") + .endActivity() + .startActivity("c") + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -92,10 +110,26 @@ public void testProcessDefinitionNestedNodes() { DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); + + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("top") + .initial() + .startActivity("a") + .endActivity() + .startActivity("b") + .startActivity("b1") + .endActivity() + .startActivity("b2") + .endActivity() + .startActivity("b3") + .endActivity() + .endActivity() + .startActivity("c") + .endActivity() + .endActivity() + .endProcess(); - OpenProcessDefinition processDefinition = ProcessFactory.build().compositeNode("top").initial().node("a").compositeNode("b").node("b1").node("b2").node( - "b3").compositeEnd().node("c").compositeEnd().done(); - processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); assertNotNull(processDefinition); @@ -136,8 +170,25 @@ public void testDefaultTransition() { DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); - OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().transition().to("a").transition("tob").to("b").transition("toc").to( - "c").node("b").transition("toa").to("a").transition().to("b").transition("toc").to("c").node("c").transition().to("c").node("d").done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .flow("a") + .flow("b", "tob") + .flow("c", "toc") + .endActivity() + .startActivity("b") + .flow("a", "toa") + .flow("b") + .flow("c", "toc") + .endActivity() + .startActivity("c") + .flow("c") + .endActivity() + .startActivity("d") + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -150,7 +201,18 @@ public void testTwoTransitionsWithoutAName() { DbSession persistenceSession = (DbSession) environment.get(DbSession.class); assertNotNull(persistenceSession); - OpenProcessDefinition processDefinition = ProcessFactory.build().node().initial().transition().to("a").transition().to("b").node("a").node("b").done(); + OpenProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity() + .initial() + .flow("a") + .flow("b") + .endActivity() + .startActivity("a") + .endActivity() + .startActivity("b") + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -184,8 +246,20 @@ } public void testEventsOnProcessDefinition() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().event(Event.PROCESS_BEGIN).listener("one").listener("two").event( - Event.PROCESS_END).listener("three").listener("four").node().initial().done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .startEvent(Event.PROCESS_BEGIN) + .listener("one") + .listener("two") + .endEvent() + .startEvent(Event.PROCESS_END) + .listener("three") + .listener("four") + .endEvent() + .startActivity() + .initial() + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -201,8 +275,20 @@ } public void testEventsOnNode() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().node("a").initial().event(Event.NODE_BEGIN).listener("one") - .listener("two").event(Event.NODE_END).listener("three").listener("four").done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .startEvent(Event.NODE_BEGIN) + .listener("one") + .listener("two") + .endEvent() + .startEvent(Event.NODE_END) + .listener("three") + .listener("four") + .endEvent() + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -218,8 +304,18 @@ } public void testListenersOnTransition() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().node("a").initial().transition().to("b").listener("one").listener( - "two").node("b").done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .startFlow("b") + .listener("one") + .listener("two") + .endFlow() + .endActivity() + .startActivity("b") + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -230,9 +326,20 @@ } public void testExceptionHandlersOnProcessDefinition() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().exceptionHandler(IllegalArgumentException.class).listener("one") - .listener("two").exceptionHandlerEnd().exceptionHandler(RuntimeException.class).listener("three").listener("four").exceptionHandlerEnd().node() - .initial().done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .startExceptionHandler(IllegalArgumentException.class) + .listener("one") + .listener("two") + .endExceptionHandler() + .startExceptionHandler(RuntimeException.class) + .listener("three") + .listener("four") + .endExceptionHandler() + .startActivity() + .initial() + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -250,9 +357,20 @@ } public void testExceptionHandlersOnNode() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().node("a").initial().exceptionHandler( - IllegalArgumentException.class).listener("one").listener("two").exceptionHandlerEnd().exceptionHandler(RuntimeException.class).listener("three") - .listener("four").exceptionHandlerEnd().done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .startExceptionHandler(IllegalArgumentException.class) + .listener("one") + .listener("two") + .endExceptionHandler() + .startExceptionHandler(RuntimeException.class) + .listener("three") + .listener("four") + .endExceptionHandler() + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -270,8 +388,14 @@ } public void testProcessDynamicProperties() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().property("key1", "val1").property("key2", "val2").node().initial() - .done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .property("key1", "val1") + .property("key2", "val2") + .startActivity() + .initial() + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -280,8 +404,14 @@ } public void testNodeDynamicProperties() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().node().initial().property("key1", "val1").property("key2", "val2") - .done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .startActivity() + .initial() + .property("key1", "val1") + .property("key2", "val2") + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -291,8 +421,16 @@ } public void testTransitionDynamicProperties() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().node("a").initial().transition().to("a").property("key1", "val1") - .property("key2", "val2").done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .startActivity("a") + .initial() + .startFlow("a") + .property("key1", "val1") + .property("key2", "val2") + .endFlow() + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); @@ -302,8 +440,16 @@ } public void testEventDynamicProperties() { - ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessFactory.build().event(Event.PROCESS_BEGIN).property("key1", "val1").property( - "key2", "val2").node().initial().done(); + ProcessDefinitionImpl processDefinition = (ProcessDefinitionImpl) ProcessDefinitionBuilder + .startProcess() + .startEvent(Event.PROCESS_BEGIN) + .property("key1", "val1") + .property("key2", "val2") + .endEvent() + .startActivity() + .initial() + .endActivity() + .endProcess(); processDefinition = reload(processDefinition, ProcessDefinitionImpl.class);