[jboss-svn-commits] JBL Code SVN: r23374 - in labs/jbossrules/branches/drools-api-refactor-20080929: drools-core/src/main/java/org/drools/event/process/impl and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 8 07:25:19 EDT 2008
Author: KrisVerlaenen
Date: 2008-10-08 07:25:18 -0400 (Wed, 08 Oct 2008)
New Revision: 23374
Added:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessCompletedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessNodeLeftEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessNodeTriggeredEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessCompletedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeLeftEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeTriggeredEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessStartedEventImpl.java
Modified:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessEventListener.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/test/java/org/drools/event/process/ProcessEventSupportTest.java
Log:
JBRULES-1734: Drools API
- added process events
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessCompletedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessCompletedEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessCompletedEvent.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -0,0 +1,21 @@
+package org.drools.event.process;
+
+/*
+ * 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.
+ */
+
+public interface ProcessCompletedEvent extends ProcessEvent {
+
+}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessEventListener.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessEventListener.java 2008-10-08 11:03:23 UTC (rev 23373)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessEventListener.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -20,20 +20,20 @@
public interface ProcessEventListener extends EventListener {
- void beforeProcessStarted(ProcessEvent event);
+ void beforeProcessStarted(ProcessStartedEvent event);
- void afterProcessStarted(ProcessEvent event);
+ void afterProcessStarted(ProcessStartedEvent event);
- void beforeProcessCompleted(ProcessEvent event);
+ void beforeProcessCompleted(ProcessCompletedEvent event);
- void afterProcessCompleted(ProcessEvent event);
+ void afterProcessCompleted(ProcessCompletedEvent event);
- void beforeNodeTriggered(ProcessNodeEvent event);
+ void beforeNodeTriggered(ProcessNodeTriggeredEvent event);
- void afterNodeTriggered(ProcessNodeEvent event);
+ void afterNodeTriggered(ProcessNodeTriggeredEvent event);
- void beforeNodeLeft(ProcessNodeEvent event);
+ void beforeNodeLeft(ProcessNodeLeftEvent event);
- void afterNodeLeft(ProcessNodeEvent event);
+ void afterNodeLeft(ProcessNodeLeftEvent event);
}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessNodeLeftEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessNodeLeftEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessNodeLeftEvent.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -0,0 +1,21 @@
+package org.drools.event.process;
+
+/*
+ * 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.
+ */
+
+public interface ProcessNodeLeftEvent extends ProcessNodeEvent {
+
+}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessNodeTriggeredEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessNodeTriggeredEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessNodeTriggeredEvent.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -0,0 +1,21 @@
+package org.drools.event.process;
+
+/*
+ * 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.
+ */
+
+public interface ProcessNodeTriggeredEvent extends ProcessNodeEvent {
+
+}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessCompletedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessCompletedEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessCompletedEventImpl.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -0,0 +1,13 @@
+package org.drools.event.process.impl;
+
+import org.drools.WorkingMemory;
+import org.drools.event.ProcessEvent;
+import org.drools.event.process.ProcessCompletedEvent;
+
+public class ProcessCompletedEventImpl extends ProcessEventImpl implements ProcessCompletedEvent {
+
+ public ProcessCompletedEventImpl(ProcessEvent event, WorkingMemory workingMemory) {
+ super(event, workingMemory);
+ }
+
+}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeLeftEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeLeftEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeLeftEventImpl.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -0,0 +1,13 @@
+package org.drools.event.process.impl;
+
+import org.drools.WorkingMemory;
+import org.drools.event.RuleFlowNodeTriggeredEvent;
+import org.drools.event.process.ProcessNodeLeftEvent;
+
+public class ProcessNodeLeftEventImpl extends ProcessNodeEventImpl implements ProcessNodeLeftEvent {
+
+ public ProcessNodeLeftEventImpl(RuleFlowNodeTriggeredEvent event, WorkingMemory workingMemory) {
+ super(event, workingMemory);
+ }
+
+}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeTriggeredEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeTriggeredEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeTriggeredEventImpl.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -0,0 +1,13 @@
+package org.drools.event.process.impl;
+
+import org.drools.WorkingMemory;
+import org.drools.event.RuleFlowNodeTriggeredEvent;
+import org.drools.event.process.ProcessNodeTriggeredEvent;
+
+public class ProcessNodeTriggeredEventImpl extends ProcessNodeEventImpl implements ProcessNodeTriggeredEvent {
+
+ public ProcessNodeTriggeredEventImpl(RuleFlowNodeTriggeredEvent event, WorkingMemory workingMemory) {
+ super(event, workingMemory);
+ }
+
+}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessStartedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessStartedEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/process/impl/ProcessStartedEventImpl.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -0,0 +1,13 @@
+package org.drools.event.process.impl;
+
+import org.drools.WorkingMemory;
+import org.drools.event.ProcessEvent;
+import org.drools.event.process.ProcessStartedEvent;
+
+public class ProcessStartedEventImpl extends ProcessEventImpl implements ProcessStartedEvent {
+
+ public ProcessStartedEventImpl(ProcessEvent event, WorkingMemory workingMemory) {
+ super(event, workingMemory);
+ }
+
+}
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-10-08 11:03:23 UTC (rev 23373)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -27,8 +27,10 @@
import org.drools.event.RuleFlowNodeTriggeredEvent;
import org.drools.event.RuleFlowStartedEvent;
import org.drools.event.process.ProcessEventListener;
-import org.drools.event.process.impl.ProcessEventImpl;
-import org.drools.event.process.impl.ProcessNodeEventImpl;
+import org.drools.event.process.impl.ProcessCompletedEventImpl;
+import org.drools.event.process.impl.ProcessNodeLeftEventImpl;
+import org.drools.event.process.impl.ProcessNodeTriggeredEventImpl;
+import org.drools.event.process.impl.ProcessStartedEventImpl;
import org.drools.event.rule.AgendaEventListener;
import org.drools.event.rule.WorkingMemoryEventListener;
import org.drools.event.rule.impl.ActivationCancelledEventImpl;
@@ -418,31 +420,29 @@
}
public void beforeRuleFlowCompleted(RuleFlowCompletedEvent event, WorkingMemory workingMemory) {
- listener.beforeProcessCompleted(new ProcessEventImpl( event, workingMemory ));
+ listener.beforeProcessCompleted(new ProcessCompletedEventImpl( event, workingMemory ));
}
- public void beforeRuleFlowGroupActivated(
- RuleFlowGroupActivatedEvent event, WorkingMemory workingMemory) {
+ public void beforeRuleFlowGroupActivated(RuleFlowGroupActivatedEvent event, WorkingMemory workingMemory) {
}
- public void beforeRuleFlowGroupDeactivated(
- RuleFlowGroupDeactivatedEvent event, WorkingMemory workingMemory) {
+ public void beforeRuleFlowGroupDeactivated(RuleFlowGroupDeactivatedEvent event, WorkingMemory workingMemory) {
}
public void beforeRuleFlowNodeLeft(RuleFlowNodeTriggeredEvent event, WorkingMemory workingMemory) {
- listener.beforeNodeLeft(new ProcessNodeEventImpl( event, workingMemory ));
+ listener.beforeNodeLeft(new ProcessNodeLeftEventImpl( event, workingMemory ));
}
public void beforeRuleFlowNodeTriggered(RuleFlowNodeTriggeredEvent event, WorkingMemory workingMemory) {
- listener.beforeNodeTriggered(new ProcessNodeEventImpl( event, workingMemory ));
+ listener.beforeNodeTriggered(new ProcessNodeTriggeredEventImpl( event, workingMemory ));
}
public void beforeRuleFlowStarted(RuleFlowStartedEvent event, WorkingMemory workingMemory) {
- listener.beforeProcessStarted(new ProcessEventImpl( event, workingMemory ));
+ listener.beforeProcessStarted(new ProcessStartedEventImpl( event, workingMemory ));
}
public void afterRuleFlowCompleted(RuleFlowCompletedEvent event, WorkingMemory workingMemory) {
- listener.afterProcessCompleted(new ProcessEventImpl( event, workingMemory ));
+ listener.afterProcessCompleted(new ProcessCompletedEventImpl( event, workingMemory ));
}
public void afterRuleFlowGroupActivated(RuleFlowGroupActivatedEvent event, WorkingMemory workingMemory) {
@@ -452,15 +452,15 @@
}
public void afterRuleFlowNodeLeft(RuleFlowNodeTriggeredEvent event, WorkingMemory workingMemory) {
- listener.afterNodeLeft(new ProcessNodeEventImpl( event, workingMemory ));
+ listener.afterNodeLeft(new ProcessNodeLeftEventImpl( event, workingMemory ));
}
public void afterRuleFlowNodeTriggered(RuleFlowNodeTriggeredEvent event, WorkingMemory workingMemory) {
- listener.afterNodeTriggered(new ProcessNodeEventImpl( event, workingMemory ));
+ listener.afterNodeTriggered(new ProcessNodeTriggeredEventImpl( event, workingMemory ));
}
public void afterRuleFlowStarted(RuleFlowStartedEvent event, WorkingMemory workingMemory) {
- listener.afterProcessStarted(new ProcessEventImpl( event, workingMemory ));
+ listener.afterProcessStarted(new ProcessStartedEventImpl( event, workingMemory ));
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/process/ProcessEventSupportTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/process/ProcessEventSupportTest.java 2008-10-08 11:03:23 UTC (rev 23373)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/process/ProcessEventSupportTest.java 2008-10-08 11:25:18 UTC (rev 23374)
@@ -73,7 +73,7 @@
);
EndNode endNode = new EndNode();
- endNode.setName("EndNode");
+ endNode.setName("End");
endNode.setId(3);
process.addNode(endNode);
new ConnectionImpl(
@@ -88,35 +88,35 @@
final List<ProcessEvent> processEventList = new ArrayList<ProcessEvent>();
final ProcessEventListener processEventListener = new ProcessEventListener() {
- public void afterNodeLeft(ProcessNodeEvent event) {
+ public void afterNodeLeft(ProcessNodeLeftEvent event) {
processEventList.add(event);
}
- public void afterNodeTriggered(ProcessNodeEvent event) {
+ public void afterNodeTriggered(ProcessNodeTriggeredEvent event) {
processEventList.add(event);
}
- public void afterProcessCompleted(ProcessEvent event) {
+ public void afterProcessCompleted(ProcessCompletedEvent event) {
processEventList.add(event);
}
- public void afterProcessStarted(ProcessEvent event) {
+ public void afterProcessStarted(ProcessStartedEvent event) {
processEventList.add(event);
}
- public void beforeNodeLeft(ProcessNodeEvent event) {
+ public void beforeNodeLeft(ProcessNodeLeftEvent event) {
processEventList.add(event);
}
- public void beforeNodeTriggered(ProcessNodeEvent event) {
+ public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
processEventList.add(event);
}
- public void beforeProcessCompleted(ProcessEvent event) {
+ public void beforeProcessCompleted(ProcessCompletedEvent event) {
processEventList.add(event);
}
- public void beforeProcessStarted(ProcessEvent event) {
+ public void beforeProcessStarted(ProcessStartedEvent event) {
processEventList.add(event);
}
@@ -126,6 +126,22 @@
// execute the process
session.startProcess("org.drools.process.event");
assertEquals( 16, processEventList.size() );
+ assertEquals( "org.drools.process.event", ((ProcessStartedEvent) processEventList.get(0)).getProcessInstance().getProcessId());
+ assertEquals( "Start", ((ProcessNodeTriggeredEvent) processEventList.get(1)).getNodeInstance().getNodeName());
+ assertEquals( "Start", ((ProcessNodeLeftEvent) processEventList.get(2)).getNodeInstance().getNodeName());
+ assertEquals( "Print", ((ProcessNodeTriggeredEvent) processEventList.get(3)).getNodeInstance().getNodeName());
+ assertEquals( "Print", ((ProcessNodeLeftEvent) processEventList.get(4)).getNodeInstance().getNodeName());
+ assertEquals( "End", ((ProcessNodeTriggeredEvent) processEventList.get(5)).getNodeInstance().getNodeName());
+ assertEquals( "End", ((ProcessNodeLeftEvent) processEventList.get(6)).getNodeInstance().getNodeName());
+ assertEquals( "org.drools.process.event", ((ProcessCompletedEvent) processEventList.get(7)).getProcessInstance().getProcessId());
+ assertEquals( "org.drools.process.event", ((ProcessCompletedEvent) processEventList.get(8)).getProcessInstance().getProcessId());
+ assertEquals( "End", ((ProcessNodeLeftEvent) processEventList.get(9)).getNodeInstance().getNodeName());
+ assertEquals( "End", ((ProcessNodeTriggeredEvent) processEventList.get(10)).getNodeInstance().getNodeName());
+ assertEquals( "Print", ((ProcessNodeLeftEvent) processEventList.get(11)).getNodeInstance().getNodeName());
+ assertEquals( "Print", ((ProcessNodeTriggeredEvent) processEventList.get(12)).getNodeInstance().getNodeName());
+ assertEquals( "Start", ((ProcessNodeLeftEvent) processEventList.get(13)).getNodeInstance().getNodeName());
+ assertEquals( "Start", ((ProcessNodeTriggeredEvent) processEventList.get(14)).getNodeInstance().getNodeName());
+ assertEquals( "org.drools.process.event", ((ProcessStartedEvent) processEventList.get(15)).getProcessInstance().getProcessId());
}
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list