[jboss-svn-commits] JBL Code SVN: r20692 - in labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src: test/java/org/jboss/internal/soa/esb/services/rules and 1 other directory.

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

Author: beve
Date: 2008-06-23 06:27:36 -0400 (Mon, 23 Jun 2008)
New Revision: 20692

Modified:
   labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java
   labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src/test/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleServiceUnitTest.java
Log:
Minor updates.


Modified: labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java	2008-06-23 10:20:25 UTC (rev 20691)
+++ labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleService.java	2008-06-23 10:27:36 UTC (rev 20692)
@@ -55,7 +55,6 @@
  */
 public class DroolsRuleService implements RuleService 
 {
-	
 	/**
 	 * The lifecycle resource factory for RuleBases.
 	 */
@@ -232,9 +231,9 @@
 	 * 
 	 * @param ruleSet -
 	 *            String reference to a file which contains a ruleSet.
-	 * @param domainSpecificLanguage -
+	 * @param dsl -
 	 *            String reference to a file which contains a custom rule
-	 *            language definition
+	 *            language definition(Domain Specific Language)
 	 * @param ruleReload -
 	 *            if set to true, a ruleSet update should result in reloading
 	 *            the ruleSet.
@@ -304,7 +303,8 @@
 
 		try 
 		{
-			RuleBase ruleBase = getRuleBaseForDecisionTable(decisionTable, ruleReload);
+			final RuleBase ruleBase = getRuleBaseForDecisionTable(decisionTable, ruleReload);
+			
 			message = executeStatefulRules(ruleBase, false, message, globals, objectList);
 
 			updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_SUCCEED );
@@ -367,8 +367,6 @@
 		return message;
 	}
 	
-	
-
 	/**
 	 * Continue executing rules where the working memory already exists.
 	 * 
@@ -527,34 +525,30 @@
 		final long startTime = System.nanoTime();
 		try 
 		{
-			DroolsRuleBaseHelper rbHelper = DroolsRuleBaseHelper.getInstance();
 			RuleBase ruleBase = getCachedRuleBases().get( decisionTable );
 			if ( ruleReload || ruleBase == null ) 
 			{
-				ruleBase = rbHelper.createRuleBaseFromDecisionTable(decisionTable);
+				ruleBase = DroolsRuleBaseHelper.getInstance().createRuleBaseFromDecisionTable(decisionTable);
 				getCachedRuleBases().put( decisionTable, ruleBase );
 			} 
-			else 
-			{
-				ruleBase = getRuleBaseForFileBasedRules( decisionTable, null, ruleReload );
-			}
 			return ruleBase;
 		} 
-		catch (IOException e) 
+		catch (final IOException e) 
 		{
 			updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
 			throw new RuleServiceException("Could not read the rules from [" + decisionTable + "]", e);
 		} 
-		catch (DroolsParserException e) 
+		catch (final DroolsParserException e) 
 		{
 			updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
 			throw new RuleServiceException("Could not parse the rules in [" + decisionTable + "]", e);
 		} 
-		catch (RuleServiceException e) 
+		catch (final RuleServiceException e) 
 		{
 			updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
 			throw e;
-		} catch (LifecycleResourceException e)
+		} 
+		catch (final LifecycleResourceException e)
 		{
 			updateJBRulesCounter( startTime, decisionTable, JBRulesCounter.RULES_FAILED );
 			throw new RuleServiceException("Caught a LifecycleResourceException :", e);

Modified: labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src/test/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleServiceUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src/test/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleServiceUnitTest.java	2008-06-23 10:20:25 UTC (rev 20691)
+++ labs/jbossesb/workspace/dbevenius/ruleservice/product/services/jbrules/src/test/java/org/jboss/internal/soa/esb/services/rules/DroolsRuleServiceUnitTest.java	2008-06-23 10:27:36 UTC (rev 20692)
@@ -29,9 +29,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import junit.framework.JUnit4TestAdapter;
-
 import org.drools.RuleBase;
 import org.drools.agent.RuleAgent;
 import org.jboss.internal.soa.esb.services.routing.cbr.Order;