[jboss-svn-commits] JBL Code SVN: r33448 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/command/runtime and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 10 21:00:32 EDT 2010
Author: lucazamador
Date: 2010-06-10 21:00:31 -0400 (Thu, 10 Jun 2010)
New Revision: 33448
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/BatchExecutionCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/SetGlobalCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/CompleteWorkItemCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/ModifyCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/RetractCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/XStreamJSon.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/XStreamXML.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java
labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
Log:
JBRULES-2546: Fix drools commands inconsistencies
- fixed commands marshalling inconsistencies & added missing commands support
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -40,9 +40,11 @@
import org.drools.command.runtime.GetGlobalCommand;
import org.drools.command.runtime.SetGlobalCommand;
import org.drools.command.runtime.process.AbortWorkItemCommand;
+import org.drools.command.runtime.process.CompleteWorkItemCommand;
import org.drools.command.runtime.process.SignalEventCommand;
import org.drools.command.runtime.process.StartProcessCommand;
import org.drools.command.runtime.rule.FireAllRulesCommand;
+import org.drools.command.runtime.rule.GetObjectsCommand;
import org.drools.command.runtime.rule.InsertElementsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.command.runtime.rule.ModifyCommand;
@@ -95,7 +97,9 @@
DefaultFactHandle.class.getName(),
JaxbListWrapper.class.getName(),
DisconnectedFactHandle.class.getName(),
- FlatQueryResults.class.getName()
+ FlatQueryResults.class.getName(),
+ CompleteWorkItemCommand.class.getName(),
+ GetObjectsCommand.class.getName()
};
public static String[] addXsdModel(Resource resource,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/BatchExecutionCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/BatchExecutionCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/BatchExecutionCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -19,13 +19,16 @@
import org.drools.command.runtime.process.StartProcessCommand;
import org.drools.command.runtime.rule.FireAllRulesCommand;
import org.drools.command.runtime.rule.GetObjectCommand;
+import org.drools.command.runtime.rule.GetObjectsCommand;
import org.drools.command.runtime.rule.InsertElementsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.command.runtime.rule.ModifyCommand;
import org.drools.command.runtime.rule.QueryCommand;
import org.drools.command.runtime.rule.RetractCommand;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
/**
* <p>Java class for BatchExecutionCommand complex type.
*
@@ -64,6 +67,7 @@
private static final long serialVersionUID = 1L;
@XmlAttribute(required=true)
+ @XStreamAsAttribute
private String lookup;
public BatchExecutionCommand(){
@@ -91,7 +95,9 @@
@XmlElement(name = "insert", type = InsertObjectCommand.class),
@XmlElement(name = "modify", type = ModifyCommand.class),
@XmlElement(name = "get-object", type = GetObjectCommand.class),
- @XmlElement(name = "fire-all-rules", type = FireAllRulesCommand.class)
+ @XmlElement(name = "fire-all-rules", type = FireAllRulesCommand.class),
+ @XmlElement(name = "complete-work-item", type = CompleteWorkItemCommand.class),
+ @XmlElement(name = "get-objects", type = GetObjectsCommand.class)
})
protected List<GenericCommand<?>> commands;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -18,7 +18,7 @@
private static final long serialVersionUID = 1L;
- @XmlAttribute
+ @XmlAttribute (required=true)
private String identifier;
@XmlAttribute(name="out-identifier")
private String outIdentifier;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/SetGlobalCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/SetGlobalCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/SetGlobalCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -23,7 +23,7 @@
@XmlElement
private Object object;
- @XmlAttribute
+ @XmlAttribute(name="out-identifier")
private String outIdentifier;
@XmlAttribute
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/CompleteWorkItemCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/CompleteWorkItemCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/CompleteWorkItemCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -3,13 +3,19 @@
import java.util.HashMap;
import java.util.Map;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
import org.drools.runtime.StatefulKnowledgeSession;
+ at XmlAccessorType(XmlAccessType.NONE)
public class CompleteWorkItemCommand implements GenericCommand<Object> {
+ @XmlAttribute(name="id", required = true)
private long workItemId;
private Map<String, Object> results = new HashMap<String, Object>();
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -20,6 +20,7 @@
@XmlAttribute
private int max = -1;
private AgendaFilter agendaFilter = null;
+ @XmlAttribute(name="out-identifier")
private String outIdentifier;
public FireAllRulesCommand() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -40,7 +40,7 @@
this.outIdentifier = outIdentifier;
}
- @XmlAttribute(name="factHandle", required=true)
+ @XmlAttribute(name="fact-handle", required=true)
public void setFactHandleFromString(String factHandleId) {
factHandle = new DisconnectedFactHandle(factHandleId);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -5,6 +5,10 @@
import java.util.Iterator;
import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
@@ -14,6 +18,7 @@
import org.drools.runtime.ObjectFilter;
import org.drools.runtime.StatefulKnowledgeSession;
+ at XmlAccessorType(XmlAccessType.NONE)
public class GetObjectsCommand
implements
GenericCommand<Collection> {
@@ -28,6 +33,7 @@
private ObjectFilter filter = null;
+ @XmlAttribute(name="out-identifier")
private String outIdentifier;
public GetObjectsCommand() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -30,7 +30,7 @@
@XmlAttribute
private String outIdentifier;
- @XmlAttribute
+ @XmlAttribute(name="return-objects")
private boolean returnObject = true;
public InsertElementsCommand() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/ModifyCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/ModifyCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/ModifyCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -58,10 +58,14 @@
return this.handle;
}
- @XmlAttribute(name="factHandle", required=true)
+ @XmlAttribute(name="fact-handle", required=true)
public void setFactHandleFromString(String factHandleId) {
handle = new DisconnectedFactHandle(factHandleId);
}
+
+ public String getFactHandleFromString() {
+ return handle.toExternalForm();
+ }
public List<Setter> getSetters() {
return this.setters;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/RetractCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/RetractCommand.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/RetractCommand.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -35,10 +35,14 @@
return this.handle;
}
- @XmlAttribute(name="factHandle", required=true)
+ @XmlAttribute(name="fact-handle", required=true)
public void setFactHandleFromString(String factHandleId) {
handle = new DisconnectedFactHandle(factHandleId);
}
+
+ public String getFactHandleFromString() {
+ return handle.toExternalForm();
+ }
public String toString() {
return "session.retract( " + handle + " );";
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/XStreamJSon.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/XStreamJSon.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/XStreamJSon.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -369,15 +369,24 @@
writer.setValue( Integer.toString( cmd.getMax() ) );
writer.endNode();
}
+
+ if ( cmd.getOutIdentifier() != null ) {
+ writer.startNode( "out-identifier" );
+ writer.setValue( cmd.getOutIdentifier() );
+ writer.endNode();
+ }
}
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
String max = null;
+ String outIdentifier = null;
while ( reader.hasMoreChildren() ) {
reader.moveDown();
if ( "max".equals( reader.getNodeName() ) ) {
max = reader.getValue();
+ } else if ( "out-identifier".equals( reader.getNodeName() ) ) {
+ outIdentifier = reader.getValue();
} else {
throw new IllegalArgumentException( "fire-all-rules does not support the child element name=''" + reader.getNodeName() + "' value=" + reader.getValue() + "'" );
}
@@ -391,6 +400,9 @@
} else {
cmd = new FireAllRulesCommand();
}
+ if ( outIdentifier != null ) {
+ cmd.setOutIdentifier(outIdentifier);
+ }
return cmd;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/XStreamXML.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/XStreamXML.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/XStreamXML.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -486,11 +486,17 @@
writer.addAttribute( "max",
Integer.toString( cmd.getMax() ) );
}
+
+ if ( cmd.getOutIdentifier() != null) {
+ writer.addAttribute( "out-identifier",
+ cmd.getOutIdentifier());
+ }
}
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
String max = reader.getAttribute( "max" );
+ String outIdentifier = reader.getAttribute( "out-identifier" );
FireAllRulesCommand cmd = null;
@@ -499,6 +505,11 @@
} else {
cmd = new FireAllRulesCommand();
}
+
+ if ( outIdentifier != null ) {
+ cmd.setOutIdentifier( outIdentifier );
+ }
+
return cmd;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -26,9 +26,11 @@
import org.drools.command.runtime.GetGlobalCommand;
import org.drools.command.runtime.SetGlobalCommand;
import org.drools.command.runtime.process.AbortWorkItemCommand;
+import org.drools.command.runtime.process.CompleteWorkItemCommand;
import org.drools.command.runtime.process.SignalEventCommand;
import org.drools.command.runtime.process.StartProcessCommand;
import org.drools.command.runtime.rule.FireAllRulesCommand;
+import org.drools.command.runtime.rule.GetObjectsCommand;
import org.drools.command.runtime.rule.InsertElementsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.command.runtime.rule.ModifyCommand;
@@ -64,7 +66,9 @@
DefaultFactHandle.class.getName(),
JaxbListWrapper.class.getName(),
DisconnectedFactHandle.class.getName(),
- FlatQueryResults.class.getName()
+ FlatQueryResults.class.getName(),
+ CompleteWorkItemCommand.class.getName(),
+ GetObjectsCommand.class.getName()
};
public static JAXBContext createDroolsJaxbContext(List<String> classNames, Map<String, ?> properties) throws ClassNotFoundException, JAXBException {
Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-06-10 21:02:48 UTC (rev 33447)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-06-11 01:00:31 UTC (rev 33448)
@@ -1,10 +1,8 @@
package org.drools.camel.component;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -15,9 +13,12 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactoryService;
import org.drools.builder.DirectoryLookupFactoryService;
+import org.drools.builder.JaxbConfiguration;
import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
+import org.drools.builder.conf.impl.JaxbConfigurationImpl;
import org.drools.builder.help.KnowledgeBuilderHelper;
import org.drools.command.runtime.BatchExecutionCommand;
import org.drools.command.runtime.process.StartProcessCommand;
@@ -107,7 +108,7 @@
public void testSessionModify() throws Exception {
String cmd = "";
cmd += "<batch-execution lookup='ksession1'>\n";
- cmd += " <modify factHandle='" + handle + "'>\n";
+ cmd += " <modify fact-handle='" + handle + "'>\n";
cmd += " <set accessor='name' value='\"salaboy\"' />\n";
cmd += " </modify>\n";
cmd += "</batch-execution>\n";
@@ -123,7 +124,7 @@
assertEquals(expectedXml, outXml);
cmd = "<batch-execution lookup='ksession1'>\n";
- cmd += " <get-object out-identifier='rider' factHandle='" + handle + "'/>\n";
+ cmd += " <get-object out-identifier='rider' fact-handle='" + handle + "'/>\n";
cmd += "</batch-execution>\n";
byte[] xmlResp = (byte[]) template.requestBodyAndHeader("direct:test-with-session", cmd.toString(), "jaxb-context", jaxbContext);
@@ -144,7 +145,7 @@
String cmd = "";
cmd += "<batch-execution lookup='ksession1'>\n";
- cmd += " <retract factHandle='" + handle + "' />\n";
+ cmd += " <retract fact-handle='" + handle + "' />\n";
cmd += "</batch-execution>";
String outXml = new String((byte[])template.requestBodyAndHeader("direct:test-with-session", cmd, "jaxb-context", jaxbContext));
@@ -329,20 +330,11 @@
Options xjcOpts = new Options();
xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
+
+ JaxbConfiguration jaxbConfiguration = KnowledgeBuilderFactory.newJaxbConfiguration( xjcOpts, "xsd" );
+
+ kbuilder.add( ResourceFactory.newClassPathResource("person.xsd", getClass()), ResourceType.XSD, jaxbConfiguration);
- String classNames[] = null;
-
- try {
- classNames = KnowledgeBuilderHelper.addXsdModel( ResourceFactory.newClassPathResource("person.xsd", getClass()),
- kbuilder,
- xjcOpts,
- "xsd" );
- } catch (IOException e) {
- LOG.error("Errors while adding xsd model. ", kbuilder.getErrors());
- }
-
- assertFalse( kbuilder.hasErrors() );
-
if (rule != null && rule.length() > 0) {
kbuilder.add(ResourceFactory.newByteArrayResource(rule.getBytes()), ResourceType.DRL);
@@ -443,11 +435,14 @@
kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
// Add object model to classes array
- List<String> allClasses = new ArrayList<String>(Arrays.asList(classNames));
- allClasses.add("org.drools.pipeline.camel.Person");
-
+ List<String> classesName = new ArrayList<String>();
+ classesName.add("org.drools.model.AddressType");
+ classesName.add("org.drools.model.ObjectFactory");
+ classesName.add("org.drools.model.Person");
+ classesName.add("org.drools.pipeline.camel.Person");
+
try {
- jaxbContext = KnowledgeBuilderHelper.newJAXBContext( allClasses.toArray(new String[allClasses.size()]), kbase );
+ jaxbContext = KnowledgeBuilderHelper.newJAXBContext( classesName.toArray(new String[classesName.size()]), kbase );
} catch (Exception e) {
LOG.info("Errors while creating JAXB Context. ", e);
e.printStackTrace();
@@ -458,5 +453,5 @@
node.get(DirectoryLookupFactoryService.class).register(identifier, session);
return session;
}
-
+
}
More information about the jboss-svn-commits
mailing list