[jboss-svn-commits] JBL Code SVN: r35299 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/compiler and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Sep 26 07:26:23 EDT 2010
Author: laune
Date: 2010-09-26 07:26:22 -0400 (Sun, 26 Sep 2010)
New Revision: 35299
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemory.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/QueryBuilderTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-doc/src/main/java/org/drools/doc/DroolsDocsComponentFactory.java
labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/StatefulProcessSession.java
Log:
single method getQueryResults with variable arg list for parameters
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemory.java 2010-09-25 17:33:02 UTC (rev 35298)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemory.java 2010-09-26 11:26:22 UTC (rev 35299)
@@ -64,20 +64,6 @@
Collection< ? extends WorkingMemoryEntryPoint> getWorkingMemoryEntryPoints();
/**
- * Retrieve the QueryResults of the specified query.
- *
- * @param query
- * The name of the query.
- *
- * @return The QueryResults of the specified query.
- * If no results match the query it is empty.
- *
- * @throws IllegalArgumentException
- * if no query named "query" is found in the KnowledgeBase
- */
- public QueryResults getQueryResults(String query);
-
- /**
* Retrieve the QueryResults of the specified query and arguments
*
* @param query
@@ -93,7 +79,7 @@
* if no query named "query" is found in the KnowledgeBase
*/
public QueryResults getQueryResults(String query,
- Object[] arguments);
+ Object... arguments);
public LiveQuery openLiveQuery(String query,
Object[] arguments,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/QueryBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/QueryBuilderTest.java 2010-09-25 17:33:02 UTC (rev 35298)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/QueryBuilderTest.java 2010-09-26 11:26:22 UTC (rev 35299)
@@ -48,7 +48,7 @@
literalDescr.addRestriction( new VariableRestrictionDescr( "==",
"$likes" ) );
pattern.addConstraint( literalDescr );
-
+
RuleDescr ruleDescr = new RuleDescr( "rule-1" );
packageDescr.addRule( ruleDescr );
lhs = new AndDescr();
@@ -103,9 +103,18 @@
final FieldConstraintDescr literalDescr = new FieldConstraintDescr( "type" );
literalDescr.addRestriction( new VariableRestrictionDescr( "==",
"$type" ) );
-
pattern.addConstraint( literalDescr );
-
+
+ // Another query, no parameters
+ QueryDescr queryDescr2 = new QueryDescr( "query2" );
+ queryDescr2.setParameters( new String[]{} );
+ queryDescr2.setParameterTypes( new String[]{} );
+ packageDescr.addRule( queryDescr2 );
+ AndDescr lhs2 = new AndDescr();
+ queryDescr2.setLhs( lhs2 );
+ PatternDescr pattern2 = new PatternDescr( Cheese.class.getName() );
+ lhs2.addDescr( pattern2 );
+
builder.addPackage( packageDescr );
assertLength( 0,
@@ -116,19 +125,21 @@
StatefulSession session = ruleBase.newStatefulSession();
- session.insert( new Cheese( "stilton",
- 15 ) );
+ session.insert( new Cheese( "stilton", 15 ) );
- QueryResults results = session.getQueryResults( "query1",
- new Object[]{"stilton"} );
+ QueryResults results = session.getQueryResults( "query1", "stilton" );
assertEquals( 1,
results.size() );
Object object = results.get( 0 ).get( 0 );
- assertEquals( new Cheese( "stilton",
- 15 ),
+ assertEquals( new Cheese( "stilton", 15 ),
object );
results = session.getQueryResults( "query1",
new Object[]{"cheddar"} );
+ assertEquals( 0, results.size() );
+
+ session.insert( new Cheese( "dolcelatte", 20 ) );
+ results = session.getQueryResults( "query2", new Object[]{} );
+ assertEquals( 2, results.size() );
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java 2010-09-25 17:33:02 UTC (rev 35298)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java 2010-09-26 11:26:22 UTC (rev 35299)
@@ -209,20 +209,6 @@
void setFocus(String focus);
/**
- * Retrieve the QueryResults of the specified query.
- *
- * @param query
- * The name of the query.
- *
- * @return The QueryResults of the specified query.
- * If no results match the query it is empty.
- *
- * @throws IllegalArgumentException
- * if no query named "query" is found in the rulebase
- */
- public QueryResults getQueryResults(String query);
-
- /**
* Retrieve the QueryResults of the specified query and arguments
*
* @param query
@@ -237,7 +223,7 @@
* @throws IllegalArgumentException
* if no query named "query" is found in the rulebase
*/
- public QueryResults getQueryResults(String query, Object[] arguments);
+ public QueryResults getQueryResults(String query, Object... arguments);
/**
* Sets the AsyncExceptionHandler to handle exceptions thrown by the Agenda
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java 2010-09-25 17:33:02 UTC (rev 35298)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java 2010-09-26 11:26:22 UTC (rev 35299)
@@ -431,16 +431,9 @@
return (T) this.commandService.execute( new ExecuteCommand( command ) );
}
- public QueryResults getQueryResults(String query) {
- QueryCommand cmd = new QueryCommand( null,
- query,
- null );
- return this.commandService.execute( cmd );
- }
-
public QueryResults getQueryResults(String query,
- Object[] arguments) {
- QueryCommand cmd = new QueryCommand( null,
+ Object... arguments) {
+ QueryCommand cmd = new QueryCommand( (String)null,
query,
arguments );
return this.commandService.execute( cmd );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java 2010-09-25 17:33:02 UTC (rev 35298)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java 2010-09-26 11:26:22 UTC (rev 35299)
@@ -48,10 +48,10 @@
public QueryCommand() {
}
- public QueryCommand(String outIdentifier, String name, Object[] arguments) {
+ public QueryCommand(String outIdentifier, String name, Object... arguments) {
this.outIdentifier = outIdentifier;
this.name = name;
- this.arguments = arguments != null ? Arrays.asList( arguments ) : Arrays.asList();
+ this.arguments = Arrays.asList( arguments );
}
public String getOutIdentifier() {
@@ -85,11 +85,7 @@
//TODO {bauna} remove this try
try {
- if ( arguments == null || arguments.size() == 0 ) {
- results = ksession.getQueryResults( name );
- } else {
- results = ksession.getQueryResults( name, this.arguments.toArray() );
- }
+ results = ksession.getQueryResults( name, this.arguments.toArray() );
} catch (Throwable e) {
e.printStackTrace();
throw new RuntimeException(e);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2010-09-25 17:33:02 UTC (rev 35298)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2010-09-26 11:26:22 UTC (rev 35299)
@@ -729,12 +729,8 @@
return ((KnowledgeBaseImpl) this.kbase).ruleBase;
}
- public QueryResults getQueryResults(String query) {
- return new NativeQueryResults( this.session.getQueryResults( query ) );
- }
-
public QueryResults getQueryResults(String query,
- Object[] arguments) {
+ Object... arguments) {
return new NativeQueryResults( this.session.getQueryResults( query,
arguments ) );
}
Modified: labs/jbossrules/trunk/drools-doc/src/main/java/org/drools/doc/DroolsDocsComponentFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-doc/src/main/java/org/drools/doc/DroolsDocsComponentFactory.java 2010-09-25 17:33:02 UTC (rev 35298)
+++ labs/jbossrules/trunk/drools-doc/src/main/java/org/drools/doc/DroolsDocsComponentFactory.java 2010-09-26 11:26:22 UTC (rev 35299)
@@ -227,7 +227,7 @@
document.add( newRuleTable( drlData ) );
// Meta data
- document.add( newTable( "Meta Data",
+ document.add( newTable( "Metadata",
drlData.getMetadata() ) );
// Other
@@ -252,7 +252,7 @@
document.add( new Paragraph( "\n\n\n\n\n" + packageData.getDescription(),
BODY_TEXT ) );
- document.add( newTable( "Meta Data ",
+ document.add( newTable( "Metadata ",
packageData.getMetadata() ) );
document.add( newTable( "Globals ",
packageData.getGlobals() ) );
Modified: labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/StatefulProcessSession.java
===================================================================
--- labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/StatefulProcessSession.java 2010-09-25 17:33:02 UTC (rev 35298)
+++ labs/jbossrules/trunk/drools-flow-core/src/main/java/org/drools/process/StatefulProcessSession.java 2010-09-26 11:26:22 UTC (rev 35299)
@@ -248,14 +248,10 @@
throw new UnsupportedOperationException();
}
- public QueryResults getQueryResults(String query) {
+ public QueryResults getQueryResults(String query, Object... arguments) {
throw new UnsupportedOperationException();
}
- public QueryResults getQueryResults(String query, Object[] arguments) {
- throw new UnsupportedOperationException();
- }
-
public WorkingMemoryEntryPoint getWorkingMemoryEntryPoint(String name) {
throw new UnsupportedOperationException();
}
More information about the jboss-svn-commits
mailing list