[jboss-svn-commits] JBL Code SVN: r25751 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/impl and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 19 12:16:28 EDT 2009
Author: mark.proctor at jboss.com
Date: 2009-03-19 12:16:28 -0400 (Thu, 19 Mar 2009)
New Revision: 25751
Removed:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/BatchExecution.java
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/BatchExecutorStage.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
Log:
JBRULES-2016 add support for FireAllRules to XStream marshalling
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/BatchExecution.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/BatchExecution.java 2009-03-19 16:13:03 UTC (rev 25750)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/BatchExecution.java 2009-03-19 16:16:28 UTC (rev 25751)
@@ -1,7 +0,0 @@
-package org.drools.runtime;
-
-import org.drools.command.Command;
-
-public interface BatchExecution extends Command {
-
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2009-03-19 16:13:03 UTC (rev 25750)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2009-03-19 16:16:28 UTC (rev 25751)
@@ -29,7 +29,6 @@
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.reteoo.ReteooWorkingMemory.WorkingMemoryReteAssertAction;
import org.drools.rule.EntryPoint;
-import org.drools.runtime.BatchExecution;
import org.drools.runtime.BatchExecutionResults;
import org.drools.runtime.Environment;
import org.drools.runtime.Globals;
@@ -214,7 +213,7 @@
boolean autoFireAllRules = true;
if ( command instanceof FireAllRulesCommand ) {
autoFireAllRules = false;
- } else if ( command instanceof BatchExecution ) {
+ } else if ( command instanceof BatchExecutionImpl ) {
for ( Command nestedCmd : ((BatchExecutionImpl)command).getCommands() ) {
if ( nestedCmd instanceof FireAllRulesCommand ) {
autoFireAllRules = false;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java 2009-03-19 16:13:03 UTC (rev 25750)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java 2009-03-19 16:16:28 UTC (rev 25751)
@@ -4,7 +4,6 @@
import org.drools.process.command.Command;
import org.drools.reteoo.ReteooWorkingMemory;
-import org.drools.runtime.BatchExecutionResults;
public class BatchExecutionImpl implements Command<Void> {
Modified: 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-03-19 16:13:03 UTC (rev 25750)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/BatchExecutorStage.java 2009-03-19 16:16:28 UTC (rev 25751)
@@ -5,7 +5,6 @@
import org.drools.command.Command;
import org.drools.command.CommandFactory;
-import org.drools.runtime.BatchExecution;
import org.drools.runtime.BatchExecutionResults;
import org.drools.runtime.pipeline.KnowledgeRuntimeCommand;
import org.drools.runtime.pipeline.PipelineContext;
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-03-19 16:13:03 UTC (rev 25750)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java 2009-03-19 16:16:28 UTC (rev 25751)
@@ -111,15 +111,7 @@
inXml += " <price>30</price>";
inXml += " <oldPrice>0</oldPrice>";
inXml += " </org.drools.Cheese>";
- inXml += " </insert-elements>";
- inXml += " <fire-all-rules />";
- inXml += " <insert out-identifier='outBrie'>";
- inXml += " <org.drools.Cheese>";
- inXml += " <type>brie</type>";
- inXml += " <price>10</price>";
- inXml += " <oldPrice>5</oldPrice>";
- inXml += " </org.drools.Cheese>";
- inXml += " </insert>";
+ inXml += " </insert-elements>";
inXml += "</batch-execution>";
StatelessKnowledgeSession ksession = getSession2( ResourceFactory.newByteArrayResource( str.getBytes() ) );
@@ -142,21 +134,13 @@
expectedXml += " <oldPrice>0</oldPrice>\n";
expectedXml += " </org.drools.Cheese>\n";
expectedXml += " </list>\n";
- expectedXml += " </result>\n";
- expectedXml += " <result identifier='outBrie'>";
- expectedXml += " <org.drools.Cheese>";
- expectedXml += " <type>brie</type>";
- expectedXml += " <price>10</price>";
- expectedXml += " <oldPrice>5</oldPrice>";
- expectedXml += " </org.drools.Cheese>";
- expectedXml += " </result>";
+ expectedXml += " </result>\n";
expectedXml += "</batch-execution-results>\n";
assertXMLEqual( expectedXml, outXml );
BatchExecutionResults result = ( BatchExecutionResults ) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
- // brie should not have been added to the list
List list = ( List ) result.getValue( "list" );
Cheese stilton25 = new Cheese( "stilton", 30);
Cheese stilton30 = new Cheese( "stilton", 35);
@@ -166,11 +150,6 @@
expectedList.add( stilton30 );
assertEquals( expectedList, new HashSet( list ));
-
- // brie should not have changed
- Cheese brie10 = new Cheese( "brie", 10);
- brie10.setOldPrice( 5 );
- assertEquals( brie10, result.getValue( "outBrie" ) );
}
public void testSetGlobal() throws Exception {
@@ -542,6 +521,14 @@
inXml += " <oldPrice>0</oldPrice>";
inXml += " </org.drools.Cheese>";
inXml += " </insert-elements>";
+ inXml += " <fire-all-rules />";
+ inXml += " <insert out-identifier='outBrie'>";
+ inXml += " <org.drools.Cheese>";
+ inXml += " <type>brie</type>";
+ inXml += " <price>10</price>";
+ inXml += " <oldPrice>5</oldPrice>";
+ inXml += " </org.drools.Cheese>";
+ inXml += " </insert>";
inXml += "</batch-execution>";
StatelessKnowledgeSession ksession = getSession2( ResourceFactory.newByteArrayResource( str.getBytes() ) );
@@ -565,11 +552,19 @@
expectedXml += " </org.drools.Cheese>\n";
expectedXml += " </list>\n";
expectedXml += " </result>\n";
+ expectedXml += " <result identifier='outBrie'>\n";
+ expectedXml += " <org.drools.Cheese>\n";
+ expectedXml += " <type>brie</type>\n";
+ expectedXml += " <price>10</price>\n";
+ expectedXml += " <oldPrice>5</oldPrice>\n";
+ expectedXml += " </org.drools.Cheese>\n";
+ expectedXml += " </result>\n";
expectedXml += "</batch-execution-results>\n";
-
assertXMLEqual( expectedXml, outXml );
BatchExecutionResults result = ( BatchExecutionResults ) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
+
+ // brie should not have been added to the list
List list = ( List ) result.getValue( "list" );
Cheese stilton25 = new Cheese( "stilton", 30);
Cheese stilton30 = new Cheese( "stilton", 35);
@@ -578,7 +573,12 @@
expectedList.add( stilton25 );
expectedList.add( stilton30 );
- assertEquals( expectedList, new HashSet( list ));
+ assertEquals( expectedList, new HashSet( list ));
+
+ // brie should not have changed
+ Cheese brie10 = new Cheese( "brie", 10);
+ brie10.setOldPrice( 5 );
+ assertEquals( brie10, result.getValue( "outBrie" ) );
}
public void testProcess() throws SAXException, IOException {
More information about the jboss-svn-commits
mailing list