[jboss-svn-commits] JBL Code SVN: r23152 - in labs/jbossrules/branches/drools-api-refactor-20080929: drools-api/src/main/java/org/drools/builder and 26 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Sep 28 22:17:07 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-09-28 22:17:07 -0400 (Sun, 28 Sep 2008)
New Revision: 23152
Added:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/EventListener.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/FutureAdapter.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
Removed:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeSessionFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeSessionProvider.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/EventListener.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java
Modified:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBase.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessTimerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/AssertObjects.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ProcessEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/AbstractContextInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ContextInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/factory/ReuseContextInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ProcessContext.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/context/WorkflowReuseContextInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/EventTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/EndNodeInstanceTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java
Log:
JBRULES-1734 Drools API
-Committed a branch, so we can break things a little
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBase.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBase.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBase.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,9 +1,11 @@
package org.drools;
+import java.util.Collection;
+
import org.drools.knowledge.definitions.KnowledgePackage;
-public interface KnowledgeBase {
- void addKnowledgePackage(KnowledgePackage knowledgePackage);
+public interface KnowledgeBase {
+ void addKnowledgePackages(Collection<KnowledgePackage> knowledgePackage);
StatefulKnowledgeSession newStatefulKnowledgeSession();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,6 +1,5 @@
package org.drools;
-import org.drools.util.ChainedProperties;
public class KnowledgeBaseFactory {
private static KnowledgeBaseProvider provider;
@@ -16,23 +15,24 @@
return provider.newKnowledgeBase();
}
- @SuppressWarnings("unchecked")
private static void loadProvider() {
try {
- ChainedProperties properties = new ChainedProperties( "drools-providers.conf" );
- String className = properties.getProperty( "KnowledgeSessionProvider", null );
- if ( className != null && className.trim().length() > 0 ) {
- Class<KnowledgeBaseProvider> cls = ( Class<KnowledgeBaseProvider> ) Class.forName( className );
- setKnowledgeBaseProvider( cls.newInstance() );
- }
- } catch ( Exception e1 ) {
- try {
- // we didn't find anything in properties so lets try and us reflection
- Class<KnowledgeBaseProvider> cls = ( Class<KnowledgeBaseProvider> ) Class.forName( "org.drools.KnowledgeBaseProviderImpl" );
- setKnowledgeBaseProvider( cls.newInstance() );
- } catch ( Exception e2 ) {
- throw new ProviderInitializationException( "Provider was not set and the Factory was unable to load a provider from properties, nor could reflection find org.drools.KnowledgeBaseProviderImpl." );
- }
+ // we didn't find anything in properties so lets try and us reflection
+ Class<KnowledgeBaseProvider> cls = ( Class<KnowledgeBaseProvider> ) Class.forName( "org.drools.impl.KnowledgeBaseProviderImpl" );
+ setKnowledgeBaseProvider( cls.newInstance() );
+ } catch ( Exception e2 ) {
+ throw new ProviderInitializationException( "Provider org.drools.impl.KnowledgeBaseProviderImpl could not be set." );
}
+
+// try {
+// ChainedProperties properties = new ChainedProperties( "drools-providers.conf" );
+// String className = properties.getProperty( "KnowledgeSessionProvider", null );
+// if ( className != null && className.trim().length() > 0 ) {
+// Class<KnowledgeBaseProvider> cls = ( Class<KnowledgeBaseProvider> ) Class.forName( className );
+// setKnowledgeBaseProvider( cls.newInstance() );
+// }
+// } catch ( Exception e1 ) {
+//
+// }
}
}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeSessionFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeSessionFactory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeSessionFactory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,38 +0,0 @@
-package org.drools;
-
-import org.drools.util.ChainedProperties;
-
-public class KnowledgeSessionFactory {
- private static KnowledgeSessionProvider provider;
-
- public static void setKnowledgeSessionProvider(KnowledgeSessionProvider provider) {
- KnowledgeSessionFactory.provider = provider;
- }
-
- public static StatefulKnowledgeSession newStatefulKnowledgeSession() {
- if ( provider == null ) {
- loadProvider();
- }
- return provider.newStatefulKnowledgeSession();
- }
-
-
- private static void loadProvider() {
- try {
- ChainedProperties properties = new ChainedProperties( "drools-providers.conf" );
- String className = properties.getProperty( "KnowledgeSessionProvider", null );
- if ( className != null && className.trim().length() > 0 ) {
- Class<KnowledgeSessionProvider> cls = ( Class<KnowledgeSessionProvider> ) Class.forName( className );
- setKnowledgeSessionProvider( cls.newInstance() );
- }
- } catch ( Exception e1 ) {
- try {
- // we didn't find anything in properties so lets try and us reflection
- Class<KnowledgeSessionProvider> cls = ( Class<KnowledgeSessionProvider> ) Class.forName( "org.drools.KnowledgeSessionProviderImpl" );
- setKnowledgeSessionProvider( cls.newInstance() );
- } catch ( Exception e2 ) {
- throw new ProviderInitializationException( "Provider was not set and the Factory was unable to load a provider from properties, nor could reflection find org.drools.KnowledgeSessionProviderImpl." );
- }
- }
- }
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeSessionProvider.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeSessionProvider.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeSessionProvider.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,5 +0,0 @@
-package org.drools;
-
-public interface KnowledgeSessionProvider {
- StatefulKnowledgeSession newStatefulKnowledgeSession();
-}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -2,4 +2,7 @@
public interface StatefulKnowledgeSession extends StatefulRuleSession, StatefulProcessSession {
+ void setGlobal(String identifier,
+ Object object);
+
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,5 +1,7 @@
package org.drools;
+import java.util.concurrent.Future;
+
import org.drools.time.SessionClock;
public interface StatefulRuleSession {
@@ -17,4 +19,11 @@
* @return
*/
public SessionClock getSessionClock();
+
+
+ Future<Object> asyncInsert( Object object );
+ Future<Object> asyncInsert( Object[] array );
+ Future<Object> asyncInsert( Iterable iterable );
+
+ Future<?> asyncFireAllRules();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,8 +1,6 @@
package org.drools.builder;
-import org.drools.KnowledgeSessionProvider;
import org.drools.ProviderInitializationException;
-import org.drools.util.ChainedProperties;
public class KnowledgeBuilderFactory {
private static KnowledgeBuilderProvider provider;
@@ -20,11 +18,10 @@
private static void loadProvider() {
try {
- // we didn't find anything in properties so lets try and us reflection
Class<KnowledgeBuilderProvider> cls = ( Class<KnowledgeBuilderProvider> ) Class.forName( "org.drools.builder.impl.KnowledgeBuilderProviderImpl" );
setKnowledgeBuilderProvider( cls.newInstance() );
} catch ( Exception e2 ) {
- throw new ProviderInitializationException( "Provider was not set and the Factory was unable to load a provider from properties, nor could reflection find org.drools.builder.impl.KnowledgeBuilderProviderImpl.", e2 );
+ throw new ProviderInitializationException( "Provider org.drools.builder.impl.KnowledgeBuilderProviderImpl could not be set.", e2 );
}
// try {
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/EventListener.java (from rev 23145, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/EventListener.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/EventListener.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/EventListener.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -0,0 +1,13 @@
+package org.drools.process.instance;
+
+public interface EventListener {
+
+ void signalEvent(String type, Object event);
+
+ /**
+ * Returns the event types this event listener is interested in.
+ * May return null if the event types are unknown.
+ */
+ String[] getEventTypes();
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/EventListener.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,6 +1,6 @@
package org.drools.process.instance;
-public interface ProcessInstance {
+public interface ProcessInstance extends EventListener {
int STATE_PENDING = 0;
int STATE_ACTIVE = 1;
@@ -10,8 +10,5 @@
String getProcessId();
- int getState();
-
- void signalEvent(String type, Object event);
-
+ int getState();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -29,6 +29,7 @@
import org.drools.event.AgendaEventListener;
import org.drools.event.DefaultAgendaEventListener;
import org.drools.lang.descr.PackageDescr;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
import org.drools.spi.Activation;
@@ -830,7 +831,7 @@
list.size() );
final ProcessInstance processInstance = workingMemory.startProcess( "0" );
- assertEquals( ProcessInstance.STATE_ACTIVE,
+ assertEquals( InternalProcessInstance.STATE_ACTIVE,
processInstance.getState() );
workingMemory.fireAllRules();
assertEquals( 4,
@@ -843,7 +844,7 @@
list.get( 2 ) );
assertEquals( "Rule4",
list.get( 3 ) );
- assertEquals( ProcessInstance.STATE_COMPLETED,
+ assertEquals( InternalProcessInstance.STATE_COMPLETED,
processInstance.getState() );
}
@@ -920,7 +921,7 @@
list.size() );
final ProcessInstance processInstance = workingMemory.startProcess( "0" );
- assertEquals( ProcessInstance.STATE_ACTIVE,
+ assertEquals( InternalProcessInstance.STATE_ACTIVE,
processInstance.getState() );
workingMemory.fireAllRules();
assertEquals( 4,
@@ -933,7 +934,7 @@
list.get( 2 ) );
assertEquals( "Rule4",
list.get( 3 ) );
- assertEquals( ProcessInstance.STATE_COMPLETED,
+ assertEquals( InternalProcessInstance.STATE_COMPLETED,
processInstance.getState() );
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -16,7 +16,7 @@
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderErrors;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -84,15 +84,15 @@
workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.actions");
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
WorkItem workItem = handler.getWorkItem();
assertNotNull(workItem);
assertEquals(1, list.size());
workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), null);
assertEquals(3, list.size());
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
@SuppressWarnings("unchecked")
@@ -155,7 +155,7 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.actions");
assertEquals(2, list.size());
assertEquals("SomeText", list.get(0));
@@ -166,7 +166,7 @@
}
});
assertTrue(iterator.hasNext());
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
@SuppressWarnings("unchecked")
@@ -233,7 +233,7 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.actions");
assertEquals(2, list.size());
assertEquals("SomeText", list.get(0));
@@ -244,7 +244,7 @@
}
});
assertTrue(iterator.hasNext());
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
private static class TestWorkItemHandler implements WorkItemHandler {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -13,7 +13,7 @@
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderErrors;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.rule.Package;
public class ProcessExceptionHandlerTest extends TestCase {
@@ -52,9 +52,9 @@
RuleBase ruleBase = RuleBaseFactory.newRuleBase();
ruleBase.addPackage( pkg );
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.exception");
- assertEquals(ProcessInstance.STATE_ABORTED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ABORTED, processInstance.getState());
}
public void testProcessExceptionHandlerAction() {
@@ -103,9 +103,9 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.exception");
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, list.size());
assertEquals("SomeValue", list.get(0));
}
@@ -145,9 +145,9 @@
RuleBase ruleBase = RuleBaseFactory.newRuleBase();
ruleBase.addPackage( pkg );
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.exception");
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testCompositeNodeExceptionHandlerTriggerNode() {
@@ -220,11 +220,11 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.exception");
assertEquals(1, list.size());
assertEquals("SomeValue", list.get(0));
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testNestedExceptionHandler() {
@@ -297,10 +297,10 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.exception");
assertEquals(1, list.size());
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -11,7 +11,7 @@
import org.drools.RuleBaseFactory;
import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -69,13 +69,13 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
TestWorkItemHandler handler = new TestWorkItemHandler();
workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.humantask");
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
WorkItem workItem = handler.getWorkItem();
assertNotNull(workItem);
workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testSwimlane() {
@@ -147,9 +147,9 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
TestWorkItemHandler handler = new TestWorkItemHandler();
workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.humantask");
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
WorkItem workItem = handler.getWorkItem();
assertNotNull(workItem);
assertEquals("Do something", workItem.getParameter("TaskName"));
@@ -162,7 +162,7 @@
assertEquals("Do something else", workItem.getParameter("TaskName"));
assertEquals("Jane Doe", workItem.getParameter("ActorId"));
workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
private static class TestWorkItemHandler implements WorkItemHandler {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -20,6 +20,7 @@
import org.drools.marshalling.DefaultMarshaller;
import org.drools.marshalling.Marshaller;
import org.drools.process.core.context.variable.VariableScope;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -153,7 +154,7 @@
session = getSerialisedStatefulSession( session );
assertEquals(1, session.getProcessInstances().size());
VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
- session.getProcessInstances().iterator().next().getContextInstance(VariableScope.VARIABLE_SCOPE);
+ (( InternalProcessInstance )session.getProcessInstances().iterator().next()).getContextInstance(VariableScope.VARIABLE_SCOPE);
assertEquals("ThisIsMyValue", variableScopeInstance.getVariable("myVariable"));
session.getWorkItemManager().completeWorkItem(handler.getWorkItem().getId(), null);
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessTimerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessTimerTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessTimerTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -15,7 +15,7 @@
import org.drools.StatefulSession;
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.rule.Package;
public class ProcessTimerTest extends TestCase {
@@ -76,15 +76,15 @@
StatefulSession session = ruleBase.newStatefulSession();
List<Message> myList = new ArrayList<Message>();
session.setGlobal("myList", myList);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
myList = (List<Message>) session.getGlobal( "myList" );
- processInstance = session.getProcessInstance( processInstance.getId() );
+ processInstance = ( InternalProcessInstance ) session.getProcessInstance( processInstance.getId() );
assertEquals(1, session.getTimerManager().getTimers().size());
@@ -104,7 +104,7 @@
}
session.fireAllRules();
assertEquals(5, myList.size());
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
@SuppressWarnings("unchecked")
@@ -148,15 +148,15 @@
StatefulSession session = ruleBase.newStatefulSession();
List<String> myList = new ArrayList<String>();
session.setGlobal("myList", myList);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
myList = (List<String>) session.getGlobal( "myList" );
- processInstance = session.getProcessInstance( processInstance.getId() );
+ processInstance = ( InternalProcessInstance ) session.getProcessInstance( processInstance.getId() );
assertEquals(1, session.getTimerManager().getTimers().size());
@@ -209,15 +209,15 @@
StatefulSession session = ruleBase.newStatefulSession();
List<String> myList = new ArrayList<String>();
session.setGlobal("myList", myList);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
myList = (List<String>) session.getGlobal( "myList" );
- processInstance = session.getProcessInstance( processInstance.getId() );
+ processInstance = ( InternalProcessInstance ) session.getProcessInstance( processInstance.getId() );
assertEquals(1, session.getTimerManager().getTimers().size());
@@ -273,10 +273,10 @@
StatefulSession session = ruleBase.newStatefulSession();
List<String> myList = new ArrayList<String>();
session.setGlobal("myList", myList);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
@@ -343,10 +343,10 @@
StatefulSession session = ruleBase.newStatefulSession();
List<String> myList = new ArrayList<String>();
session.setGlobal("myList", myList);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -13,7 +13,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.rule.Package;
import org.drools.workflow.instance.WorkflowProcessInstanceUpgrader;
@@ -67,7 +67,7 @@
Person p = new Person( "bobba fet", 32);
session.insert( p );
- ProcessInstance processInstance = session.startProcess("org.test.ruleflow");
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) session.startProcess("org.test.ruleflow");
assertEquals(1, session.getProcessInstances().size());
@@ -109,7 +109,7 @@
session.fireAllRules();
assertEquals(2, list.size());
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -12,7 +12,7 @@
import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -83,20 +83,20 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
TestWorkItemHandler handler = new TestWorkItemHandler();
workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("org.drools.actions");
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
WorkItem workItem = handler.getWorkItem();
assertNotNull(workItem);
assertEquals("John Doe", workItem.getParameter("ActorId"));
workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put("UserName", "Jane Doe");
parameters.put("MyObject", "SomeString");
- processInstance = workingMemory.startProcess("org.drools.actions", parameters);
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ processInstance = ( InternalProcessInstance ) workingMemory.startProcess("org.drools.actions", parameters);
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
workItem = handler.getWorkItem();
assertNotNull(workItem);
assertEquals("Jane Doe", workItem.getParameter("ActorId"));
@@ -104,7 +104,7 @@
Map<String, Object> results = new HashMap<String, Object>();
results.put("Result", "SomeOtherString");
workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), results);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
VariableScopeInstance variableScope = (VariableScopeInstance)
processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE);
assertEquals("SomeOtherString", variableScope.getVariable("MyObject"));
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -3,25 +3,30 @@
import junit.framework.TestCase;
import org.drools.Cheese;
import org.drools.FactHandle;
+import org.drools.KnowledgeBase;
+import org.drools.KnowledgeBaseFactory;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
+import org.drools.StatefulKnowledgeSession;
import org.drools.StatefulSession;
+import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.compiler.PackageBuilder;
-import org.drools.concurrent.Future;
+import org.drools.knowledge.definitions.KnowledgePackage;
import org.drools.rule.Package;
import java.io.InputStreamReader;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
+import java.util.concurrent.Future;
public class StatefulSessionTest extends TestCase {
final List list = new ArrayList();
- protected RuleBase getRuleBase() throws Exception {
-
- return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
- null );
+ protected KnowledgeBase getKnowledgeBase() throws Exception {
+ return KnowledgeBaseFactory.newKnowledgeBase();
}
protected RuleBase getRuleBase(final RuleBaseConfiguration config) throws Exception {
@@ -31,7 +36,7 @@
}
public void testSingleObjectAssert() throws Exception {
- StatefulSession session = getSession();
+ StatefulKnowledgeSession session = getSession();
final Cheese stilton = new Cheese( "stilton",
5 );
@@ -47,14 +52,14 @@
}
}
- assertTrue( futureAssert.getObject() instanceof FactHandle );
+ assertTrue( futureAssert.get() instanceof FactHandle );
assertEquals( "stilton",
list.get( 0 ) );
}
public void testArrayObjectAssert() throws Exception {
- StatefulSession session = getSession();
+ StatefulKnowledgeSession session = getSession();
final Cheese stilton = new Cheese( "stilton",
5 );
@@ -71,15 +76,15 @@
}
- assertTrue( futureAssert.getObject() instanceof List );
- assertTrue( ((List)futureAssert.getObject()).get( 0 ) instanceof FactHandle );
+ assertTrue( futureAssert.get() instanceof List );
+ assertTrue( ((List)futureAssert.get()).get( 0 ) instanceof FactHandle );
assertEquals( "stilton",
list.get( 0 ) );
}
public void testCollectionObjectAssert() throws Exception {
- StatefulSession session = getSession();
+ StatefulKnowledgeSession session = getSession();
final Cheese stilton = new Cheese( "stilton",
5 );
@@ -97,8 +102,8 @@
}
}
- assertTrue( futureAssert.getObject() instanceof List );
- assertTrue( ((List)futureAssert.getObject()).get( 0 ) instanceof FactHandle );
+ assertTrue( futureAssert.get() instanceof List );
+ assertTrue( ((List)futureAssert.get()).get( 0 ) instanceof FactHandle );
assertEquals( "stilton",
list.get( 0 ) );
@@ -106,7 +111,7 @@
public void testHasExceptionSingleAssert()throws Exception {
- StatefulSession session = getExceptionSession();
+ StatefulKnowledgeSession session = getExceptionSession();
final Cheese brie = new Cheese( "brie",
12 );
@@ -123,14 +128,14 @@
}
- assertTrue( futureAssert.getObject() instanceof FactHandle );
- assertTrue( futureFireAllRules.exceptionThrown() );
- assertTrue( futureFireAllRules.getException() instanceof Exception );
+ assertTrue( futureAssert.get() instanceof FactHandle );
+// assertTrue( futureFireAllRules.exceptionThrown() );
+// assertTrue( futureFireAllRules.getException() instanceof Exception );
}
public void testHasExceptionArrayAssert()throws Exception {
- StatefulSession session = getExceptionSession();
+ StatefulKnowledgeSession session = getExceptionSession();
final Cheese brie = new Cheese( "brie",
12 );
@@ -146,14 +151,14 @@
}
}
- assertTrue( futureAssert.getObject() instanceof List );
- assertTrue( ((List)futureAssert.getObject()).get( 0 ) instanceof FactHandle );
- assertTrue( futureFireAllRules.getException() instanceof Exception );
+ assertTrue( futureAssert.get() instanceof List );
+ assertTrue( ((List)futureAssert.get()).get( 0 ) instanceof FactHandle );
+ //assertTrue( futureFireAllRules.getException() instanceof Exception );
}
public void testHasExceptionCollectionAssert()throws Exception {
- StatefulSession session = getExceptionSession();
+ StatefulKnowledgeSession session = getExceptionSession();
final Cheese brie = new Cheese( "brie",
12 );
@@ -171,9 +176,9 @@
}
}
- assertTrue( futureAssert.getObject() instanceof List );
- assertTrue( ((List)futureAssert.getObject()).get( 0 ) instanceof FactHandle );
- assertTrue( futureFireAllRules.getException() instanceof Exception );
+ assertTrue( futureAssert.get() instanceof List );
+ assertTrue( ((List)futureAssert.get()).get( 0 ) instanceof FactHandle );
+ //assertTrue( futureFireAllRules.getException() instanceof Exception );
}
public void testSequentialException() {
@@ -189,28 +194,27 @@
}
}
- private StatefulSession getExceptionSession() throws Exception {
- final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_ConsequenceException.drl" ) ) );
- final Package pkg = builder.getPackage();
+ private StatefulKnowledgeSession getExceptionSession() throws Exception {
+ KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
+ kbuilder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_ConsequenceException.drl" ) ) );
+ final Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
- RuleBase ruleBase = getRuleBase();
- ruleBase.addPackage( pkg );
- ruleBase = SerializationHelper.serializeObject(ruleBase);
- return ruleBase.newStatefulSession();
+ KnowledgeBase kbase = getKnowledgeBase();
+ kbase.addKnowledgePackages( pkgs );
+ kbase = SerializationHelper.serializeObject( kbase );
+ return kbase.newStatefulKnowledgeSession();
}
- private StatefulSession getSession() throws Exception {
- final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "literal_rule_test.drl" ) ) );
- final Package pkg = builder.getPackage();
+ private StatefulKnowledgeSession getSession() throws Exception {
+ KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
+ kbuilder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "literal_rule_test.drl" ) ) );
+ final Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
- RuleBase ruleBase = getRuleBase();
- ruleBase.addPackage( pkg );
- ruleBase = SerializationHelper.serializeObject(ruleBase);
- StatefulSession session = ruleBase.newStatefulSession();
+ KnowledgeBase kbase = getKnowledgeBase();
+ kbase.addKnowledgePackages( pkgs );
+ kbase = SerializationHelper.serializeObject( kbase );
+ StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
-// session = SerializationHelper.serializeObject(session);
session.setGlobal( "list",
this.list );
return session;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -13,6 +13,7 @@
import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.process.core.context.variable.VariableScope;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.rule.Package;
@@ -23,12 +24,12 @@
try {
RuleBase ruleBase = readRule(true);
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("com.sample.ruleflow");
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, workingMemory.getProcessInstances().size());
workingMemory.insert(new Person());
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals(0, workingMemory.getProcessInstances().size());
} catch (Throwable t) {
t.printStackTrace();
@@ -39,11 +40,11 @@
try {
RuleBase ruleBase = readRule(true);
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("com.sample.ruleflow");
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, workingMemory.getProcessInstances().size());
- processInstance.setState(ProcessInstance.STATE_ABORTED);
+ processInstance.setState(InternalProcessInstance.STATE_ABORTED);
assertEquals(1, workingMemory.getProcessInstances().size());
} catch (Throwable t) {
t.printStackTrace();
@@ -54,11 +55,11 @@
try {
RuleBase ruleBase = readRule(false);
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("com.sample.ruleflow");
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, workingMemory.getProcessInstances().size());
- processInstance.setState(ProcessInstance.STATE_ABORTED);
+ processInstance.setState(InternalProcessInstance.STATE_ABORTED);
assertEquals(0, workingMemory.getProcessInstances().size());
} catch (Throwable t) {
t.printStackTrace();
@@ -71,13 +72,13 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
Map<String, Object> map = new HashMap<String, Object>();
map.put("x", "x-value");
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
workingMemory.startProcess("com.sample.ruleflow", map);
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, workingMemory.getProcessInstances().size());
for (ProcessInstance p: workingMemory.getProcessInstances()) {
VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
- p.getContextInstance(VariableScope.VARIABLE_SCOPE);
+ (( InternalProcessInstance )p).getContextInstance(VariableScope.VARIABLE_SCOPE);
if ("com.sample.ruleflow".equals(p.getProcessId())) {
assertEquals("x-value", variableScopeInstance.getVariable("x"));
} else if ("com.sample.subflow".equals(p.getProcessId())) {
@@ -86,7 +87,7 @@
}
}
workingMemory.insert(new Person());
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE);
assertEquals("z-value", variableScopeInstance.getVariable("x"));
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -27,6 +27,7 @@
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.event.WorkingMemoryEventSupport;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
import org.drools.process.instance.ProcessInstanceManager;
@@ -344,12 +345,12 @@
}
- public ProcessInstance startProcess(String processId) {
+ public InternalProcessInstance startProcess(String processId) {
// TODO Auto-generated method stub
return null;
}
- public ProcessInstance startProcess(String processId,
+ public InternalProcessInstance startProcess(String processId,
Map<String, Object> parameters) {
// TODO Auto-generated method stub
return null;
@@ -444,7 +445,7 @@
}
- public ProcessInstance getProcessInstance(long id) {
+ public InternalProcessInstance getProcessInstance(long id) {
// TODO Auto-generated method stub
return null;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -60,6 +60,7 @@
import org.drools.event.WorkingMemoryEventSupport;
import org.drools.process.core.Process;
import org.drools.process.core.context.variable.VariableScope;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
import org.drools.process.instance.ProcessInstanceFactoryRegistry;
@@ -1487,7 +1488,7 @@
if ( process == null ) {
throw new IllegalArgumentException( "Unknown process ID: " + processId );
}
- ProcessInstance processInstance = getProcessInstance( process );
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) getProcessInstance( process );
processInstance.setWorkingMemory( this );
processInstance.setProcess( process );
processInstanceManager.addProcessInstance( processInstance );
@@ -1522,7 +1523,7 @@
if ( conf == null ) {
throw new IllegalArgumentException( "Illegal process type: " + process.getClass() );
}
- ProcessInstance processInstance = conf.createProcessInstance();
+ InternalProcessInstance processInstance = conf.createProcessInstance();
if ( processInstance == null ) {
throw new IllegalArgumentException( "Illegal process type: " + process.getClass() );
}
@@ -1534,7 +1535,7 @@
}
public Collection<ProcessInstance> getProcessInstances() {
- return processInstanceManager.getProcessInstances();
+ return ( Collection<ProcessInstance> ) processInstanceManager.getProcessInstances();
}
public ProcessInstance getProcessInstance(long id) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -9,6 +9,7 @@
import org.drools.event.AgendaEventSupport;
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventSupport;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceManager;
import org.drools.reteoo.LIANodePropagation;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/AssertObjects.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/AssertObjects.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/AssertObjects.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -47,7 +47,7 @@
for ( int i = 0; i < objects.length; i++ ) {
this.results.add( workingMemory.insert( objects[i] ) );
}
- } else if ( this.object instanceof List ) {
+ } else if ( this.object instanceof Iterable<?> ) {
final List list = (List) this.object;
this.results = new ArrayList( list.size() );
for ( final Iterator it = list.iterator(); it.hasNext(); ) {
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/FutureAdapter.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/FutureAdapter.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/FutureAdapter.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -0,0 +1,41 @@
+/**
+ *
+ */
+package org.drools.concurrent;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class FutureAdapter implements Future {
+ org.drools.concurrent.Future future;
+
+ public FutureAdapter(org.drools.concurrent.Future future) {
+ this.future = future;
+ }
+
+ public boolean cancel(boolean mayInterruptIfRunning) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object get() throws InterruptedException,
+ ExecutionException {
+ return this.future.getObject();
+ }
+
+ public Object get(long timeout,
+ TimeUnit unit) throws InterruptedException,
+ ExecutionException,
+ TimeoutException {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isCancelled() {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isDone() {
+ return this.future.isDone();
+ }
+}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ProcessEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ProcessEvent.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ProcessEvent.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -18,7 +18,7 @@
import java.util.EventObject;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
@@ -27,12 +27,12 @@
private static final long serialVersionUID = 400L;
- public ProcessEvent(final ProcessInstance instance) {
+ public ProcessEvent(final InternalProcessInstance instance) {
super( instance );
}
- public ProcessInstance getProcessInstance() {
- return (ProcessInstance) getSource();
+ public InternalProcessInstance getProcessInstance() {
+ return (InternalProcessInstance) getSource();
}
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
@@ -25,7 +25,7 @@
private static final long serialVersionUID = 400L;
- public RuleFlowCompletedEvent(final ProcessInstance instance) {
+ public RuleFlowCompletedEvent(final InternalProcessInstance instance) {
super( instance );
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -25,7 +25,7 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.drools.common.InternalWorkingMemory;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.spi.RuleFlowGroup;
import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.WorkflowProcessInstance;
@@ -74,7 +74,7 @@
}
public void fireBeforeRuleFlowProcessStarted(
- final ProcessInstance instance,
+ final InternalProcessInstance instance,
final InternalWorkingMemory workingMemory) {
if (this.listeners.isEmpty()) {
return;
@@ -88,7 +88,7 @@
}
public void fireAfterRuleFlowProcessStarted(
- final ProcessInstance instance,
+ final InternalProcessInstance instance,
final InternalWorkingMemory workingMemory) {
if (this.listeners.isEmpty()) {
return;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
@@ -25,7 +25,7 @@
private static final long serialVersionUID = 400L;
- public RuleFlowStartedEvent(final ProcessInstance instance) {
+ public RuleFlowStartedEvent(final InternalProcessInstance instance) {
super( instance );
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,35 +1,56 @@
package org.drools.impl;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collection;
import org.drools.KnowledgeBase;
-import org.drools.KnowledgeSessionFactory;
import org.drools.RuleBase;
import org.drools.StatefulKnowledgeSession;
import org.drools.knowledge.definitions.KnowledgePackage;
import org.drools.knowledge.definitions.impl.KnowledgePackageImp;
+import org.drools.reteoo.ReteooRuleBase;
import org.drools.reteoo.ReteooStatefulSession;
-public class KnowledgeBaseImpl implements KnowledgeBase {
- private RuleBase ruleBase;
-
- public KnowledgeBaseImpl(RuleBase ruleBase) {
- this.ruleBase = ruleBase;
- }
-
- public void addKnowledgePackage(KnowledgePackage knowledgePackage) {
- ruleBase.addPackage( ((KnowledgePackageImp)knowledgePackage).pkg );
- }
-
- public void addKnowledgePackages(Collection<KnowledgePackage> knowledgePackages) {
- for ( KnowledgePackage knowledgePackage : knowledgePackages ) {
- ruleBase.addPackage( ((KnowledgePackageImp)knowledgePackage).pkg );
- }
- }
-
- public StatefulKnowledgeSession newStatefulKnowledgeSession() {
- ReteooStatefulSession session = ( ReteooStatefulSession ) this.ruleBase.newStatefulSession();
- return new StatefulKnowledgeSessionImpl( session );
- }
+public class KnowledgeBaseImpl
+ implements
+ KnowledgeBase,
+ Externalizable {
+ private RuleBase ruleBase;
+
+ public KnowledgeBaseImpl() {
+
+ }
+ public KnowledgeBaseImpl(RuleBase ruleBase) {
+ this.ruleBase = ruleBase;
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ this.ruleBase.writeExternal( out );
+ }
+
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
+ ruleBase = new ReteooRuleBase();
+ ruleBase.readExternal( in );
+ }
+
+ public void addKnowledgePackage(KnowledgePackage knowledgePackage) {
+ ruleBase.addPackage( ((KnowledgePackageImp) knowledgePackage).pkg );
+ }
+
+ public void addKnowledgePackages(Collection<KnowledgePackage> knowledgePackages) {
+ for ( KnowledgePackage knowledgePackage : knowledgePackages ) {
+ ruleBase.addPackage( ((KnowledgePackageImp) knowledgePackage).pkg );
+ }
+ }
+
+ public StatefulKnowledgeSession newStatefulKnowledgeSession() {
+ ReteooStatefulSession session = (ReteooStatefulSession) this.ruleBase.newStatefulSession();
+ return new StatefulKnowledgeSessionImpl( session );
+ }
+
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -2,76 +2,98 @@
import java.util.Collection;
import java.util.Map;
+import java.util.concurrent.Future;
import org.drools.FactHandle;
import org.drools.StatefulKnowledgeSession;
import org.drools.common.InternalFactHandle;
+import org.drools.concurrent.FutureAdapter;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItemManager;
import org.drools.reteoo.ReteooStatefulSession;
import org.drools.time.SessionClock;
-public class StatefulKnowledgeSessionImpl implements StatefulKnowledgeSession {
- public ReteooStatefulSession session;
-
- public StatefulKnowledgeSessionImpl(ReteooStatefulSession session) {
- this.session = session;
- }
-
- public void fireAllRules() {
- this.session.fireAllRules();
- }
+public class StatefulKnowledgeSessionImpl
+ implements
+ StatefulKnowledgeSession {
+ public ReteooStatefulSession session;
- public SessionClock getSessionClock() {
- return this.session.getSessionClock();
- }
+ public StatefulKnowledgeSessionImpl(ReteooStatefulSession session) {
+ this.session = session;
+ }
- public void halt() {
- this.session.halt();
- }
+ public void fireAllRules() {
+ this.session.fireAllRules();
+ }
- public FactHandle insertObject(Object object) {
- return this.session.insert( object );
- }
+ public SessionClock getSessionClock() {
+ return this.session.getSessionClock();
+ }
- public void retractObject(FactHandle factHandle) {
- this.session.retract( factHandle );
-
- }
+ public void halt() {
+ this.session.halt();
+ }
- public void updateObject(FactHandle factHandle) {
- this.session.update( factHandle, ((InternalFactHandle) factHandle).getObject() );
- }
+ public FactHandle insertObject(Object object) {
+ return this.session.insert( object );
+ }
- public void updateObject(FactHandle factHandle, Object object) {
- this.session.update( factHandle, object);
-
- }
+ public void retractObject(FactHandle factHandle) {
+ this.session.retract( factHandle );
- public ProcessInstance getProcessInstance(long id) {
- // TODO Auto-generated method stub
- return null;
- }
+ }
- public Collection<ProcessInstance> getProcessInstances() {
- // TODO Auto-generated method stub
- return null;
- }
+ public void updateObject(FactHandle factHandle) {
+ this.session.update( factHandle,
+ ((InternalFactHandle) factHandle).getObject() );
+ }
- public WorkItemManager getWorkItemManager() {
- // TODO Auto-generated method stub
- return null;
- }
+ public void updateObject(FactHandle factHandle,
+ Object object) {
+ this.session.update( factHandle,
+ object );
+ }
- public ProcessInstance startProcess(String processId) {
- // TODO Auto-generated method stub
- return null;
- }
+ public ProcessInstance getProcessInstance(long id) {
+ return this.session.getProcessInstance( id );
+ }
- public ProcessInstance startProcess(String processId,
- Map<String, Object> parameters) {
- // TODO Auto-generated method stub
- return null;
- }
+ public Collection<ProcessInstance> getProcessInstances() {
+ return this.session.getProcessInstances();
+ }
+ public WorkItemManager getWorkItemManager() {
+ return this.session.getWorkItemManager();
+ }
+
+ public ProcessInstance startProcess(String processId) {
+ return this.session.startProcess( processId );
+ }
+
+ public ProcessInstance startProcess(String processId,
+ Map<String, Object> parameters) {
+ return this.session.startProcess( processId,
+ parameters );
+ }
+
+ public void setGlobal(String identifier,
+ Object object) {
+ this.session.setGlobal( identifier, object );
+ }
+
+ public Future<Object> asyncInsert(Object object) {
+ return new FutureAdapter( this.session.asyncInsert( object ) );
+ }
+
+ public Future<Object> asyncInsert(Object[] array) {
+ return new FutureAdapter( this.session.asyncInsert( array ) );
+ }
+
+ public Future<Object> asyncInsert(Iterable iterable) {
+ return new FutureAdapter( this.session.asyncInsert( iterable ) );
+ }
+
+ public Future<?> asyncFireAllRules() {
+ return new FutureAdapter( this.session.asyncFireAllRules() );
+ }
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -30,7 +30,7 @@
import org.drools.concurrent.ExecutorService;
import org.drools.process.core.context.swimlane.SwimlaneContext;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.context.swimlane.SwimlaneContextInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
@@ -745,7 +745,7 @@
}
}
- public static ProcessInstance readProcessInstance(MarshallerReaderContext context) throws IOException {
+ public static InternalProcessInstance readProcessInstance(MarshallerReaderContext context) throws IOException {
ObjectInputStream stream = context.stream;
InternalRuleBase ruleBase = context.ruleBase;
InternalWorkingMemory wm = context.wm;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -28,6 +28,7 @@
import org.drools.common.WorkingMemoryAction;
import org.drools.process.core.context.swimlane.SwimlaneContext;
import org.drools.process.core.context.variable.VariableScope;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.context.swimlane.SwimlaneContextInstance;
@@ -700,7 +701,7 @@
new Comparator<ProcessInstance>() {
public int compare(ProcessInstance o1,
ProcessInstance o2) {
- return (int) (o1.getId() - o2.getId());
+ return (int) ((( InternalProcessInstance )o1).getId() - (( InternalProcessInstance )o2).getId());
}
} );
for ( ProcessInstance processInstance : processInstances ) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,7 +1,7 @@
package org.drools.process.command;
import org.drools.WorkingMemory;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
public class SignalEventCommand implements Command {
@@ -34,7 +34,7 @@
}
public Object execute(WorkingMemory workingMemory) {
- ProcessInstance processInstance = workingMemory.getProcessInstance(processInstanceId);
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.getProcessInstance(processInstanceId);
if (processInstance != null) {
processInstance.signalEvent(eventType, processInstance);
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -5,7 +5,7 @@
import java.util.Map;
import org.drools.WorkingMemory;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
public class StartProcessCommand implements Command {
@@ -43,7 +43,7 @@
workingMemory.insert(o);
}
}
- ProcessInstance processInstance = workingMemory.startProcess(processId, parameters);
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.startProcess(processId, parameters);
workingMemory.fireAllRules();
return processInstance;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -16,6 +16,6 @@
Context getContext();
- ProcessInstance getProcessInstance();
+ InternalProcessInstance getProcessInstance();
}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/EventListener.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/EventListener.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/EventListener.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,13 +0,0 @@
-package org.drools.process.instance;
-
-public interface EventListener {
-
- void signalEvent(String type, Object event);
-
- /**
- * Returns the event types this event listener is interested in.
- * May return null if the event types are unknown.
- */
- String[] getEventTypes();
-
-}
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java (from rev 23145, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -0,0 +1,51 @@
+package org.drools.process.instance;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.drools.Agenda;
+import org.drools.WorkingMemory;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.process.core.Process;
+
+/**
+ * A process instance is the representation of a process during its execution.
+ * It contains all the runtime status information about the running process.
+ * A process can have multiple instances.
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface InternalProcessInstance extends ProcessInstance, ContextInstanceContainer, ContextableInstance {
+
+ void setId(long id);
+
+ long getId();
+
+ void setProcess(Process process);
+
+ Process getProcess();
+
+ void setState(int state);
+
+ void setWorkingMemory(InternalWorkingMemory workingMemory);
+
+ WorkingMemory getWorkingMemory();
+
+ Agenda getAgenda();
+
+ void start();
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,61 +0,0 @@
-package org.drools.process.instance;
-
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.drools.Agenda;
-import org.drools.WorkingMemory;
-import org.drools.common.InternalWorkingMemory;
-import org.drools.process.core.Process;
-
-/**
- * A process instance is the representation of a process during its execution.
- * It contains all the runtime status information about the running process.
- * A process can have multiple instances.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface ProcessInstance extends ContextInstanceContainer, ContextableInstance, EventListener {
-
- int STATE_PENDING = 0;
- int STATE_ACTIVE = 1;
- int STATE_COMPLETED = 2;
- int STATE_ABORTED = 3;
- int STATE_SUSPENDED = 4;
-
- void setId(long id);
-
- long getId();
-
- void setProcess(Process process);
-
- Process getProcess();
-
- String getProcessId();
-
- void setState(int state);
-
- int getState();
-
- void setWorkingMemory(InternalWorkingMemory workingMemory);
-
- WorkingMemory getWorkingMemory();
-
- Agenda getAgenda();
-
- void start();
-
-}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -6,6 +6,6 @@
*/
public interface ProcessInstanceFactory {
- ProcessInstance createProcessInstance();
+ InternalProcessInstance createProcessInstance();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/AbstractContextInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/AbstractContextInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/AbstractContextInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -5,13 +5,13 @@
import org.drools.process.core.Context;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
public abstract class AbstractContextInstance implements ContextInstance, Serializable {
private long contextId;
private ContextInstanceContainer contextInstanceContainer;
- private ProcessInstance processInstance;
+ private InternalProcessInstance processInstance;
public long getContextId() {
return contextId;
@@ -33,11 +33,11 @@
return getContextInstanceContainer().getContextContainer().getContext(getContextType(), getContextId());
}
- public ProcessInstance getProcessInstance() {
+ public InternalProcessInstance getProcessInstance() {
return processInstance;
}
- public void setProcessInstance(ProcessInstance processInstance) {
+ public void setProcessInstance(InternalProcessInstance processInstance) {
this.processInstance = processInstance;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -7,7 +7,7 @@
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.drools.process.core.context.exception.ExceptionHandler;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
@@ -24,7 +24,7 @@
try {
KnowledgeHelper knowledgeHelper = createKnowledgeHelper();
ProcessContext context = new ProcessContext();
- ProcessInstance processInstance = getProcessInstance();
+ InternalProcessInstance processInstance = getProcessInstance();
ContextInstanceContainer contextInstanceContainer = getContextInstanceContainer();
if (contextInstanceContainer instanceof NodeInstance) {
context.setNodeInstance((NodeInstance) contextInstanceContainer);
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ContextInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ContextInstanceFactory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ContextInstanceFactory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -3,10 +3,10 @@
import org.drools.process.core.Context;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
public interface ContextInstanceFactory {
- ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, ProcessInstance processInstance);
+ ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, InternalProcessInstance processInstance);
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManager.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManager.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManager.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -5,6 +5,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceManager;
@@ -14,12 +15,12 @@
private int processCounter = 0;
public void addProcessInstance(ProcessInstance processInstance) {
- processInstance.setId(++processCounter);
+ ((InternalProcessInstance)processInstance).setId(++processCounter);
internalAddProcessInstance(processInstance);
}
public void internalAddProcessInstance(ProcessInstance processInstance) {
- processInstances.put(processInstance.getId(), processInstance);
+ processInstances.put(((InternalProcessInstance)processInstance).getId(), processInstance);
}
public Collection<ProcessInstance> getProcessInstances() {
@@ -35,6 +36,6 @@
}
public void internalRemoveProcessInstance(ProcessInstance processInstance) {
- processInstances.remove(processInstance.getId());
+ processInstances.remove(((InternalProcessInstance)processInstance).getId());
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -10,7 +10,7 @@
import java.util.Set;
import org.drools.WorkingMemory;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -88,7 +88,7 @@
// work item may have been aborted
if (workItem != null) {
workItem.setResults(results);
- ProcessInstance processInstance = workingMemory.getProcessInstance(workItem.getProcessInstanceId());
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.getProcessInstance(workItem.getProcessInstanceId());
workItem.setState(WorkItem.COMPLETED);
// process instance may have finished already
if (processInstance != null) {
@@ -103,7 +103,7 @@
WorkItemImpl workItem = (WorkItemImpl) workItems.get(new Long(id));
// work item may have been aborted
if (workItem != null) {
- ProcessInstance processInstance = workingMemory.getProcessInstance(workItem.getProcessInstanceId());
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.getProcessInstance(workItem.getProcessInstanceId());
workItem.setState(WorkItem.ABORTED);
// process instance may have finished already
if (processInstance != null) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -29,14 +29,14 @@
import org.drools.process.core.ContextContainer;
import org.drools.process.core.Process;
import org.drools.process.instance.ContextInstance;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
/**
* Default implementation of a process instance.
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public abstract class ProcessInstanceImpl implements ProcessInstance, Serializable {
+public abstract class ProcessInstanceImpl implements InternalProcessInstance, Serializable {
private long id;
private String processId;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/factory/ReuseContextInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/factory/ReuseContextInstanceFactory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/factory/ReuseContextInstanceFactory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -3,7 +3,7 @@
import org.drools.process.core.Context;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.context.AbstractContextInstance;
import org.drools.process.instance.impl.ContextInstanceFactory;
@@ -15,7 +15,7 @@
this.cls = cls;
}
- public ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, ProcessInstance processInstance) {
+ public ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, InternalProcessInstance processInstance) {
ContextInstance result = contextInstanceContainer.getContextInstance( context.getType(), context.getId() );
if (result != null) {
return result;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -9,7 +9,7 @@
import java.util.Map;
import org.drools.WorkingMemory;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.time.Job;
import org.drools.time.JobContext;
import org.drools.time.JobHandle;
@@ -34,7 +34,7 @@
}
public void registerTimer(final TimerInstance timer,
- ProcessInstance processInstance) {
+ InternalProcessInstance processInstance) {
timer.setId( ++timerId );
timer.setProcessInstanceId(processInstance.getId());
timer.setActivated(new Date());
@@ -122,7 +122,7 @@
ctx.getTimer().setLastTriggered(new Date());
- ProcessInstance processInstance = workingMemory.getProcessInstance( processInstanceId );
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.getProcessInstance( processInstanceId );
// process instance may have finished already
if ( processInstance != null ) {
processInstance.signalEvent( "timerTriggered", ctx.getTimer() );
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -96,6 +96,12 @@
this.executor.submit( assertObjects );
return assertObjects;
}
+
+ public Future asyncInsert(final Iterable<?> iterable) {
+ final AssertObjects assertObjects = new AssertObjects( iterable );
+ this.executor.submit( assertObjects );
+ return assertObjects;
+ }
public Future asyncFireAllRules(final AgendaFilter agendaFilter) {
final FireAllRules fireAllRules = new FireAllRules( agendaFilter );
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -5,14 +5,14 @@
import java.io.ObjectInput;
import java.io.IOException;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
public class RuleFlowProcessInstanceFactory implements ProcessInstanceFactory, Externalizable {
private static final long serialVersionUID = 400L;
- public ProcessInstance createProcessInstance() {
+ public InternalProcessInstance createProcessInstance() {
return new RuleFlowProcessInstance();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ProcessContext.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ProcessContext.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ProcessContext.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -1,16 +1,16 @@
package org.drools.spi;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.workflow.instance.NodeInstance;
public class ProcessContext {
- private ProcessInstance processInstance;
+ private InternalProcessInstance processInstance;
private NodeInstance nodeInstance;
- public ProcessInstance getProcessInstance() {
+ public InternalProcessInstance getProcessInstance() {
if (processInstance != null) {
return processInstance;
}
@@ -20,7 +20,7 @@
return null;
}
- public void setProcessInstance(ProcessInstance processInstance) {
+ public void setProcessInstance(InternalProcessInstance processInstance) {
this.processInstance = processInstance;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -17,7 +17,7 @@
*/
import org.drools.process.instance.EventListener;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.workflow.core.WorkflowProcess;
/**
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface WorkflowProcessInstance extends ProcessInstance, NodeInstanceContainer {
+public interface WorkflowProcessInstance extends InternalProcessInstance, NodeInstanceContainer {
WorkflowProcess getWorkflowProcess();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/context/WorkflowReuseContextInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/context/WorkflowReuseContextInstanceFactory.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/context/WorkflowReuseContextInstanceFactory.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -3,7 +3,7 @@
import org.drools.process.core.Context;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.context.AbstractContextInstance;
import org.drools.process.instance.impl.ContextInstanceFactory;
import org.drools.workflow.instance.NodeInstanceContainer;
@@ -16,7 +16,7 @@
this.cls = cls;
}
- public ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, ProcessInstance processInstance) {
+ public ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, InternalProcessInstance processInstance) {
ContextInstance result = contextInstanceContainer.getContextInstance( context.getType(), context.getId() );
if (result != null) {
return result;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -34,7 +34,7 @@
import org.drools.event.RuleFlowCompletedEvent;
import org.drools.event.RuleFlowEventListener;
import org.drools.process.instance.EventListener;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.impl.ProcessInstanceImpl;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.NodeContainer;
@@ -162,8 +162,8 @@
public void setState(final int state) {
super.setState( state );
// TODO move most of this to ProcessInstanceImpl
- if ( state == ProcessInstance.STATE_COMPLETED
- || state == ProcessInstance.STATE_ABORTED ) {
+ if ( state == InternalProcessInstance.STATE_COMPLETED
+ || state == InternalProcessInstance.STATE_ABORTED ) {
InternalWorkingMemory workingMemory = (InternalWorkingMemory) getWorkingMemory();
((EventSupport) getWorkingMemory()).getRuleFlowEventSupport()
.fireBeforeRuleFlowProcessCompleted( this, workingMemory );
@@ -256,7 +256,7 @@
// actively waiting for the completion of a process instance ?
processInstanceEventListener = new DefaultRuleFlowEventListener() {
public void afterRuleFlowCompleted(RuleFlowCompletedEvent event, WorkingMemory workingMemory) {
- ProcessInstance processInstance = event.getProcessInstance();
+ InternalProcessInstance processInstance = event.getProcessInstance();
String type = "processInstanceCompleted:" + processInstance.getId();
List<EventListener> listeners = eventListeners.get(type);
if (listeners != null) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -18,7 +18,7 @@
import org.drools.common.EventSupport;
import org.drools.common.InternalWorkingMemory;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.EndNode;
import org.drools.workflow.instance.NodeInstance;
@@ -51,7 +51,7 @@
if (!hidden) {
((EventSupport) getProcessInstance().getWorkingMemory()).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(this, (InternalWorkingMemory) getProcessInstance().getWorkingMemory());
}
- getProcessInstance().setState( ProcessInstance.STATE_COMPLETED );
+ getProcessInstance().setState( InternalProcessInstance.STATE_COMPLETED );
if (!hidden) {
((EventSupport) getProcessInstance().getWorkingMemory()).getRuleFlowEventSupport().fireAfterRuleFlowNodeLeft(this, (InternalWorkingMemory) getProcessInstance().getWorkingMemory());
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -18,7 +18,7 @@
import org.drools.process.core.context.exception.ExceptionScope;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.context.exception.ExceptionScopeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.workflow.core.Node;
@@ -50,7 +50,7 @@
if (exceptionScopeInstance != null) {
handleException(faultName, exceptionScopeInstance);
} else {
- getProcessInstance().setState(ProcessInstance.STATE_ABORTED);
+ getProcessInstance().setState(InternalProcessInstance.STATE_ABORTED);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -23,7 +23,7 @@
import org.drools.process.core.Process;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.instance.EventListener;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.SubProcessNode;
@@ -67,12 +67,12 @@
if (process == null) {
System.err.println("Could not find process " + processId);
System.err.println("Aborting process");
- getProcessInstance().setState(ProcessInstance.STATE_ABORTED);
+ getProcessInstance().setState(InternalProcessInstance.STATE_ABORTED);
} else {
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
getProcessInstance().getWorkingMemory().startProcess(processId, parameters);
if (!getSubProcessNode().isWaitForCompletion()
- || processInstance.getState() == ProcessInstance.STATE_COMPLETED) {
+ || processInstance.getState() == InternalProcessInstance.STATE_COMPLETED) {
triggerCompleted();
} else {
this.processInstanceId = processInstance.getId();
@@ -84,10 +84,10 @@
public void cancel() {
super.cancel();
if (!getSubProcessNode().isIndependent()) {
- ProcessInstance processInstance =
+ InternalProcessInstance processInstance = ( InternalProcessInstance )
getProcessInstance().getWorkingMemory()
.getProcessInstance(processInstanceId);
- processInstance.setState(ProcessInstance.STATE_ABORTED);
+ processInstance.setState(InternalProcessInstance.STATE_ABORTED);
}
}
@@ -115,7 +115,7 @@
public void signalEvent(String type, Object event) {
if (("processInstanceCompleted:" + processInstanceId).equals(type)) {
- processInstanceCompleted((ProcessInstance) event);
+ processInstanceCompleted((InternalProcessInstance) event);
} else {
super.signalEvent(type, event);
}
@@ -125,7 +125,7 @@
return new String[] { "processInstanceCompleted:" + processInstanceId };
}
- public void processInstanceCompleted(ProcessInstance processInstance) {
+ public void processInstanceCompleted(InternalProcessInstance processInstance) {
removeEventListeners();
VariableScopeInstance subProcessVariableScopeInstance = (VariableScopeInstance)
processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE);
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -13,7 +13,7 @@
import org.drools.persistence.session.MemoryPersisterManager;
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -51,24 +51,24 @@
public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
}
});
- ProcessInstance processInstance = session.startProcess("org.drools.test.TestProcess");
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) session.startProcess("org.drools.test.TestProcess");
long processInstanceId = processInstance.getId();
persister.setUniqueId(processInstanceId + "");
persister.save();
persister = manager.getSessionPersister(processInstanceId + "", ruleBase);
session = persister.getObject();
- processInstance = session.getProcessInstance(processInstanceId);
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ processInstance = ( InternalProcessInstance ) session.getProcessInstance(processInstanceId);
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
session.getWorkItemManager().completeWorkItem(
workItems.get(processInstanceId).getId(), null);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
persister.save();
persister = manager.getSessionPersister(processInstanceId + "", ruleBase);
session = persister.getObject();
- processInstance = session.getProcessInstance(processInstanceId);
+ processInstance = ( InternalProcessInstance ) session.getProcessInstance(processInstanceId);
assertNull(processInstance);
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -10,7 +10,7 @@
import org.drools.persistence.session.StatefulSessionSnapshotter;
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -45,22 +45,22 @@
public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
}
});
- ProcessInstance processInstance = session.startProcess("org.drools.test.TestProcess");
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) session.startProcess("org.drools.test.TestProcess");
assertNotNull(workItem);
MemoryPersister pm = new MemoryPersister( new StatefulSessionSnapshotter( session ) );
pm.save();
session.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
pm.load();
- processInstance = session.getProcessInstance(processInstance.getId());
+ processInstance = ( InternalProcessInstance ) session.getProcessInstance(processInstance.getId());
assertNotNull(processInstance);
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
session.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testTransactionWithRollback() throws Exception {
@@ -77,23 +77,23 @@
public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
}
});
- ProcessInstance processInstance = session.startProcess("org.drools.test.TestProcess");
+ InternalProcessInstance processInstance = ( InternalProcessInstance ) session.startProcess("org.drools.test.TestProcess");
MemoryPersister pm = new MemoryPersister( new StatefulSessionSnapshotter( session ) );
Transaction t = pm.getTransaction();
t.start();
session.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
t.rollback();
- processInstance = session.getProcessInstance(processInstance.getId());
+ processInstance = ( InternalProcessInstance ) session.getProcessInstance(processInstance.getId());
assertNotNull(processInstance);
- assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
session.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
private RuleFlowProcess getProcess() {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/EventTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/EventTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/EventTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -13,6 +13,7 @@
import org.drools.process.core.context.variable.Variable;
import org.drools.process.core.datatype.impl.type.ObjectDataType;
import org.drools.process.core.event.EventTypeFilter;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.ruleflow.core.RuleFlowProcess;
@@ -120,7 +121,7 @@
jack.setName("Jack");
processInstance.signalEvent("myEvent", jack);
assertEquals(1, myList.size());
- assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testEvent2() {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -31,7 +31,7 @@
import org.drools.common.InternalAgenda;
import org.drools.common.PropagationContextImpl;
import org.drools.common.RuleFlowGroupImpl;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Rule;
import org.drools.ruleflow.core.RuleFlowProcess;
@@ -212,7 +212,7 @@
final RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
processInstance.setWorkingMemory( workingMemory );
processInstance.setProcess( process );
- assertEquals( ProcessInstance.STATE_PENDING,
+ assertEquals( InternalProcessInstance.STATE_PENDING,
processInstance.getState() );
final RuleFlowGroupImpl ruleFlowGroup0 = (RuleFlowGroupImpl) agenda.getRuleFlowGroup( "rule-flow-group-0" );
@@ -275,7 +275,7 @@
// Activate process instance, the activations stay in the group,
// but should now also be in the Agenda
processInstance.start();
- assertEquals( ProcessInstance.STATE_ACTIVE,
+ assertEquals( InternalProcessInstance.STATE_ACTIVE,
processInstance.getState() );
assertEquals( 2,
ruleFlowGroup0.size() );
@@ -338,7 +338,7 @@
ruleFlowGroup3.size() );
assertEquals( 0,
agenda.agendaSize() );
- assertEquals( ProcessInstance.STATE_COMPLETED,
+ assertEquals( InternalProcessInstance.STATE_COMPLETED,
processInstance.getState() );
}
@@ -522,7 +522,7 @@
final RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
processInstance.setWorkingMemory( workingMemory );
processInstance.setProcess( process );
- assertEquals( ProcessInstance.STATE_PENDING,
+ assertEquals( InternalProcessInstance.STATE_PENDING,
processInstance.getState() );
final RuleFlowGroupImpl ruleFlowGroup0 = (RuleFlowGroupImpl) agenda.getRuleFlowGroup( "rule-flow-group-0" );
@@ -605,7 +605,7 @@
// Activate process instance, the activations stay in the group,
// but should now also be in the Agenda
processInstance.start();
- assertEquals( ProcessInstance.STATE_ACTIVE,
+ assertEquals( InternalProcessInstance.STATE_ACTIVE,
processInstance.getState() );
assertEquals( 2,
ruleFlowGroup0.size() );
@@ -656,7 +656,7 @@
ruleFlowGroup3.size() );
assertEquals( 0,
agenda.agendaSize() );
- assertEquals( ProcessInstance.STATE_COMPLETED,
+ assertEquals( InternalProcessInstance.STATE_COMPLETED,
processInstance.getState() );
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/EndNodeInstanceTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/EndNodeInstanceTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/EndNodeInstanceTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -8,7 +8,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.common.InternalWorkingMemory;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ConnectionImpl;
@@ -39,13 +39,13 @@
process.addNode( endNode );
RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
- processInstance.setState( ProcessInstance.STATE_ACTIVE );
+ processInstance.setState( InternalProcessInstance.STATE_ACTIVE );
processInstance.setProcess( process );
processInstance.setWorkingMemory( (InternalWorkingMemory) session );
MockNodeInstance mockNodeInstance = ( MockNodeInstance ) processInstance.getNodeInstance( mockNode );
mockNodeInstance.triggerCompleted();
- assertEquals( ProcessInstance.STATE_COMPLETED, processInstance.getState() );
+ assertEquals( InternalProcessInstance.STATE_COMPLETED, processInstance.getState() );
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java 2008-09-29 01:52:50 UTC (rev 23151)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java 2008-09-29 02:17:07 UTC (rev 23152)
@@ -10,7 +10,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.common.InternalWorkingMemory;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
import org.drools.workflow.core.Node;
@@ -46,9 +46,9 @@
processInstance.setProcess( process );
processInstance.setWorkingMemory( (InternalWorkingMemory) session );
- assertEquals( ProcessInstance.STATE_PENDING, processInstance.getState() );
+ assertEquals( InternalProcessInstance.STATE_PENDING, processInstance.getState() );
processInstance.start();
- assertEquals( ProcessInstance.STATE_ACTIVE, processInstance.getState() );
+ assertEquals( InternalProcessInstance.STATE_ACTIVE, processInstance.getState() );
MockNodeInstance mockNodeInstance = mockNodeFactory.getMockNodeInstance();
List<NodeInstance> triggeredBy = mockNodeInstance.getTriggers().get(Node.CONNECTION_DEFAULT_TYPE);
More information about the jboss-svn-commits
mailing list