[jboss-svn-commits] JBL Code SVN: r26001 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/runtime/pipeline/impl and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2009-04-10 15:43:12 -0400 (Fri, 10 Apr 2009)
New Revision: 26001

Added:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java
Removed:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/BatchExecutorStage.java
Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/CorePipelineProvider.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/PipelineFactory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/CorePipelineProviderImpl.java
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
   labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamStatelessSessionTest.java
Log:
JBRULES-1993 BatchExeution and message format
-Some refactoring to better names, like BatchExecutor is now just CommandExecutor

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/CorePipelineProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/CorePipelineProvider.java	2009-04-10 16:06:33 UTC (rev 26000)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/CorePipelineProvider.java	2009-04-10 19:43:12 UTC (rev 26001)
@@ -16,7 +16,7 @@
 
     Pipeline newStatelessKnowledgeSessionPipeline(StatelessKnowledgeSession ksession);
     
-    KnowledgeRuntimeCommand newBatchExecutor();
+    KnowledgeRuntimeCommand newCommandExecutor();
     
     KnowledgeRuntimeCommand newInsertObjectCommand();
     

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/PipelineFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/PipelineFactory.java	2009-04-10 16:06:33 UTC (rev 26000)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/PipelineFactory.java	2009-04-10 19:43:12 UTC (rev 26001)
@@ -209,8 +209,8 @@
     }
     
     
-    public static KnowledgeRuntimeCommand newBatchExecutor() {
-        return getCorePipelineProvider().newBatchExecutor();
+    public static KnowledgeRuntimeCommand newCommandExecutor() {
+        return getCorePipelineProvider().newCommandExecutor();
     }    
 
     

Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/BatchExecutorStage.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/BatchExecutorStage.java	2009-04-10 16:06:33 UTC (rev 26000)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/BatchExecutorStage.java	2009-04-10 19:43:12 UTC (rev 26001)
@@ -1,28 +0,0 @@
-package org.drools.runtime.pipeline.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.drools.command.Command;
-import org.drools.command.CommandFactory;
-import org.drools.runtime.ExecutionResults;
-import org.drools.runtime.pipeline.KnowledgeRuntimeCommand;
-import org.drools.runtime.pipeline.PipelineContext;
-
-public class BatchExecutorStage extends BaseEmitter
-    implements
-    KnowledgeRuntimeCommand {
-
-    public void receive(Object object,
-                        PipelineContext context) {
-        BasePipelineContext kContext = (BasePipelineContext) context;
-        if ( object instanceof Collection ) {
-            object = CommandFactory.newBatchExecution( (List<Command>) object );
-        }
-        ExecutionResults result = kContext.getCommandExecutor().execute( (Command) object );
-
-        emit( result,
-              kContext );
-    }
-
-}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/CorePipelineProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/CorePipelineProviderImpl.java	2009-04-10 16:06:33 UTC (rev 26000)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/CorePipelineProviderImpl.java	2009-04-10 19:43:12 UTC (rev 26001)
@@ -33,8 +33,8 @@
         return new StatelessKnowledgeSessionPipelineImpl( ksession );
     }
     
-    public KnowledgeRuntimeCommand newBatchExecutor() {
-        return new BatchExecutorStage();
+    public KnowledgeRuntimeCommand newCommandExecutor() {
+        return new ExecutorStage();
     }
 
     public KnowledgeRuntimeCommand newStatefulKnowledgeSessionInsert() {

Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java (from rev 25991, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/BatchExecutorStage.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java	2009-04-10 19:43:12 UTC (rev 26001)
@@ -0,0 +1,28 @@
+package org.drools.runtime.pipeline.impl;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.drools.command.Command;
+import org.drools.command.CommandFactory;
+import org.drools.runtime.ExecutionResults;
+import org.drools.runtime.pipeline.KnowledgeRuntimeCommand;
+import org.drools.runtime.pipeline.PipelineContext;
+
+public class ExecutorStage extends BaseEmitter
+    implements
+    KnowledgeRuntimeCommand {
+
+    public void receive(Object object,
+                        PipelineContext context) {
+        BasePipelineContext kContext = (BasePipelineContext) context;
+        if ( object instanceof Collection ) {
+            object = CommandFactory.newBatchExecution( (List<Command>) object );
+        }
+        ExecutionResults result = kContext.getCommandExecutor().execute( (Command) object );
+
+        emit( result,
+              kContext );
+    }
+
+}

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java	2009-04-10 16:06:33 UTC (rev 26000)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java	2009-04-10 19:43:12 UTC (rev 26001)
@@ -809,7 +809,7 @@
         Transformer outTransformer = PipelineFactory.newXStreamToXmlTransformer( BatchExecutionHelper.newXStreamMarshaller() );
         outTransformer.setReceiver( assignResult );
 
-        KnowledgeRuntimeCommand batchExecution = PipelineFactory.newBatchExecutor();
+        KnowledgeRuntimeCommand batchExecution = PipelineFactory.newCommandExecutor();
         batchExecution.setReceiver( outTransformer );
 
         Transformer inTransformer = PipelineFactory.newXStreamFromXmlTransformer( BatchExecutionHelper.newXStreamMarshaller() );
@@ -830,7 +830,7 @@
         Transformer outTransformer = PipelineFactory.newXStreamToXmlTransformer( BatchExecutionHelper.newXStreamMarshaller() );
         outTransformer.setReceiver( assignResult );
 
-        KnowledgeRuntimeCommand batchExecution = PipelineFactory.newBatchExecutor();
+        KnowledgeRuntimeCommand batchExecution = PipelineFactory.newCommandExecutor();
         batchExecution.setReceiver( outTransformer );
 
         Transformer inTransformer = PipelineFactory.newXStreamFromXmlTransformer( BatchExecutionHelper.newXStreamMarshaller() );

Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamStatelessSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamStatelessSessionTest.java	2009-04-10 16:06:33 UTC (rev 26000)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamStatelessSessionTest.java	2009-04-10 19:43:12 UTC (rev 26001)
@@ -46,7 +46,7 @@
         Action assignResult = PipelineFactory.newAssignObjectAsResult();
         assignResult.setReceiver( executeResultHandler );
 
-        KnowledgeRuntimeCommand batchExecution = PipelineFactory.newBatchExecutor();
+        KnowledgeRuntimeCommand batchExecution = PipelineFactory.newCommandExecutor();
         batchExecution.setReceiver( assignResult );
         
         KnowledgeRuntimeCommand insertStage = PipelineFactory.newInsertObjectCommand();
@@ -92,7 +92,7 @@
         Action assignResult = PipelineFactory.newAssignObjectAsResult();
         assignResult.setReceiver( executeResultHandler );
 
-        KnowledgeRuntimeCommand batchExecution = PipelineFactory.newBatchExecutor();
+        KnowledgeRuntimeCommand batchExecution = PipelineFactory.newCommandExecutor();
         batchExecution.setReceiver( assignResult );
         
         KnowledgeRuntimeCommand insertElementsStage = PipelineFactory.newInsertElementsCommand();