[jboss-svn-commits] JBL Code SVN: r26309 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/integrationtests and 1 other directories.

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

Author: mark.proctor at jboss.com
Date: 2009-04-29 21:29:45 -0400 (Wed, 29 Apr 2009)
New Revision: 26309

Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactory.java
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactoryProvider.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
Log:
-refactored insertObject to insert.

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactory.java	2009-04-30 00:58:56 UTC (rev 26308)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactory.java	2009-04-30 01:29:45 UTC (rev 26309)
@@ -31,8 +31,8 @@
      * @param object
      * @return
      */
-    public static Command newInsertObject(Object object) {
-        return getCommandFactoryProvider().newInsertObject( object );
+    public static Command newInsert(Object object) {
+        return getCommandFactoryProvider().newInsert( object );
     }
 
     /**
@@ -42,10 +42,10 @@
      * @param outIdentifier
      * @return
      */
-    public static Command newInsertObject(Object object,
+    public static Command newInsert(Object object,
                                           String outIdentifier) {
-        return getCommandFactoryProvider().newInsertObject( object,
-                                                            outIdentifier );
+        return getCommandFactoryProvider().newInsert( object,
+                                                      outIdentifier );
     }
 
     /**

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactoryProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactoryProvider.java	2009-04-30 00:58:56 UTC (rev 26308)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactoryProvider.java	2009-04-30 01:29:45 UTC (rev 26309)
@@ -7,10 +7,10 @@
 import org.drools.runtime.rule.FactHandle;
 
 public interface CommandFactoryProvider {
-    Command newInsertObject(Object object);
+    Command newInsert(Object object);
 
-    Command newInsertObject(Object object,
-                            String outIdentifier);
+    Command newInsert(Object object,
+                      String outIdentifier);
 
     Command newInsertElements(Iterable iterable);
 
@@ -59,9 +59,9 @@
     Command newSignalEvent(long processInstanceId,
                            String type,
                            Object event);
-    
+
     Command newCompleteWorkItem(long workItemId,
-                                Map<String, Object> results);    
+                                Map<String, Object> results);
 
     Command newQuery(String identifier,
                      String name);

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java	2009-04-30 00:58:56 UTC (rev 26308)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java	2009-04-30 01:29:45 UTC (rev 26309)
@@ -88,7 +88,7 @@
         
         StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();        
         
-        Command insertCmd = CommandFactory.newInsertObject( stilton, "outStilton" );
+        Command insertCmd = CommandFactory.newInsert( stilton, "outStilton" );
         Command fireCmd = CommandFactory.newFireAllRules();
         
         Command cmds = CommandFactory.newBatchExecution( Arrays.asList( new Command[] { insertCmd,fireCmd} ) );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java	2009-04-30 00:58:56 UTC (rev 26308)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java	2009-04-30 01:29:45 UTC (rev 26309)
@@ -112,7 +112,7 @@
         Cheese stilton = new Cheese( "stilton", 5 );
         
         StatelessKnowledgeSession ksession = getSession2( ResourceFactory.newByteArrayResource( str.getBytes() ) );
-        Command cmd = CommandFactory.newInsertObject( stilton, "outStilton" );
+        Command cmd = CommandFactory.newInsert( stilton, "outStilton" );
         ExecutionResults result = ksession.execute( cmd );
         stilton = ( Cheese ) result.getValue( "outStilton" );
         assertEquals( 30,
@@ -146,7 +146,7 @@
         Command setGlobal1 = CommandFactory.newSetGlobal( "list1", list1 );
         Command setGlobal2 = CommandFactory.newSetGlobal( "list2", list2, true );
         Command setGlobal3 = CommandFactory.newSetGlobal( "list3", list3, "outList3" );
-        Command insert = CommandFactory.newInsertObject( stilton  );
+        Command insert = CommandFactory.newInsert( stilton  );
         
         List cmds = new ArrayList();
         cmds.add( setGlobal1 );
@@ -218,12 +218,12 @@
         set.add( list );
         
         List<Command> cmds = new ArrayList<Command>();        
-        cmds.add( CommandFactory.newInsertObject( stilton1 ) );
-        cmds.add( CommandFactory.newInsertObject( stilton2 ) );
-        cmds.add( CommandFactory.newInsertObject( stilton3 ) );
-        cmds.add( CommandFactory.newInsertObject( cheddar1 ) );
-        cmds.add( CommandFactory.newInsertObject( cheddar2 ) );
-        cmds.add( CommandFactory.newInsertObject( cheddar3 ) );
+        cmds.add( CommandFactory.newInsert( stilton1 ) );
+        cmds.add( CommandFactory.newInsert( stilton2 ) );
+        cmds.add( CommandFactory.newInsert( stilton3 ) );
+        cmds.add( CommandFactory.newInsert( cheddar1 ) );
+        cmds.add( CommandFactory.newInsert( cheddar2 ) );
+        cmds.add( CommandFactory.newInsert( cheddar3 ) );
         
         cmds.add(  CommandFactory.newQuery( "cheeses", "cheeses" ) );
         

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java	2009-04-30 00:58:56 UTC (rev 26308)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java	2009-04-30 01:29:45 UTC (rev 26309)
@@ -41,11 +41,11 @@
 		return new InsertElementsCommand(objects);
 	}
 
-	public Command newInsertObject(Object object) {
+	public Command newInsert(Object object) {
 		return new InsertObjectCommand(object);
 	}
 
-	public Command newInsertObject(Object object, String outIdentifier) {
+	public Command newInsert(Object object, String outIdentifier) {
 		InsertObjectCommand cmd = new InsertObjectCommand(object);
 		cmd.setOutIdentifier(outIdentifier);
 		return cmd;