[jboss-svn-commits] JBL Code SVN: r22290 - in labs/jbossesb/workspace/skeagh: api/service/src/main/java/org/jboss/esb and 8 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Sep 1 08:05:59 EDT 2008


Author: tfennelly
Date: 2008-09-01 08:05:58 -0400 (Mon, 01 Sep 2008)
New Revision: 22290

Modified:
   labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/JBossESBException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/DeploymentContext.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java
   labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceName.java
   labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XMLParseUtils.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ConfigurationUnit.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/ConfigurationDigester.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java
Log:
checkstyle fixes

Modified: labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -28,7 +28,7 @@
  * instance, which uses it to dispatch the Messages it is receiving to the
  * target Service that is interested in them.  Basically, it's a mechanism
  * for allowing the router to forward the Message to the core ESB runtime for
- * dispatch to the target Service. 
+ * dispatch to the target Service.
  *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */

Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/JBossESBException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/JBossESBException.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/JBossESBException.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -21,7 +21,7 @@
 
 /**
  * Base JBossESB Exception.
- * 
+ *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
 public class JBossESBException extends Exception

Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/DeploymentContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/DeploymentContext.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/DeploymentContext.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -73,11 +73,11 @@
 
     /**
      * Add a list of deployment resources to the context.
-     * @param resources A list of deployment resources associated with this deployment.
+     * @param resourcesToAdd A list of deployment resources associated with this deployment.
      */
-    public final void addResources(final Map<String, Object> resources)
+    public final void addResources(final Map<String, Object> resourcesToAdd)
     {
-        this.resources.putAll(resources);
+        this.resources.putAll(resourcesToAdd);
     }
 
     /**

Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/message/MessageTransformationException.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -23,15 +23,28 @@
 
 /**
  * Message Transformation Exception.
+ *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
 public class MessageTransformationException extends JBossESBException
 {
+
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     */
     public MessageTransformationException(final String message)
     {
         super(message);
     }
 
+    /**
+     * Public Constructor.
+     *
+     * @param message Exception message.
+     * @param cause   Exception cause.
+     */
     public MessageTransformationException(final String message, final Throwable cause)
     {
         super(message, cause);

Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceName.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceName.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/service/ServiceName.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -44,11 +44,11 @@
     /**
      * Private default constructor.
      * <p/>
-     * This private constructor is provided so that this class can still be 
+     * This private constructor is provided so that this class can still be
      * created reflectively.
      */
     @SuppressWarnings("unused")
-	private ServiceName()
+    private ServiceName()
     {
     }
 
@@ -71,7 +71,7 @@
      *
      * @return Service Category.
      */
-    public final String getCategory()
+    public String getCategory()
     {
         return category;
     }
@@ -81,13 +81,14 @@
      *
      * @return The Service Name.
      */
-    public final String getName()
+    public String getName()
     {
         return name;
     }
 
     /**
      * ServiceName toString.
+     *
      * @return The Service Category and Name concatenated.
      */
     public String toString()
@@ -101,7 +102,7 @@
      * @param obj Object to compare against.
      * @return True if the object is a ServiceName with the same category and name values, otherwise false.
      */
-    public final boolean equals(final Object obj)
+    public boolean equals(final Object obj)
     {
         if (obj == null)
         {
@@ -122,7 +123,7 @@
      *
      * @return Object hash value.
      */
-    public final int hashCode()
+    public int hashCode()
     {
         return toString().hashCode();
     }

Modified: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XMLParseUtils.java
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XMLParseUtils.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/xml/XMLParseUtils.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -74,7 +74,7 @@
      * @throws IOException                  Error reading document stream.
      * @throws SAXException                 XML parse error.
      */
-    public static Document parse(Reader reader) throws ParserConfigurationException, SAXException, IOException
+    public static Document parse(final Reader reader) throws ParserConfigurationException, SAXException, IOException
     {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder docBuilder;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -28,15 +28,14 @@
 import org.jboss.esb.deploy.config.InboundRouterConfig;
 import org.jboss.esb.deploy.config.OutboundRouterConfig;
 import org.jboss.esb.deploy.config.ServiceConfig;
+import org.jboss.esb.dispatch.LocalDispatcher;
 import org.jboss.esb.message.MessageTransformer;
+import org.jboss.esb.service.Service;
 import org.jboss.esb.service.ServiceName;
-import org.jboss.esb.service.Service;
 import org.jboss.esb.util.AssertArgument;
-import org.jboss.esb.dispatch.LocalDispatcher;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 
 /**
  * JBoss ESB Runtime.
@@ -179,7 +178,7 @@
         logger.info("Starting JBoss ESB undeployment: '" + deploymentName + "'.");
         if (!deployedObjects.isEmpty())
         {
-            Map.Entry<Object, Object> deploymentSet[] = new Map.Entry[deployedObjects.size()];
+            Map.Entry<Object, Object>[] deploymentSet = new Map.Entry[deployedObjects.size()];
 
             deployedObjects.entrySet().toArray(deploymentSet);
             for (int i = deploymentSet.length - 1; i >= 0; i--)
@@ -256,6 +255,11 @@
         }
     }
 
+    /**
+     * Deploy the inbound routers.
+     *
+     * @throws DeploymentException Error deploying routers.
+     */
     private void deployInboundRouters() throws DeploymentException
     {
         for (ConfigurationUnit configurationUnit : configurationUnits)
@@ -300,15 +304,28 @@
         }
     }
 
-    private Service getService(ConfigurationUnit configurationUnit, ServiceName serviceName)
+    /**
+     * Get the named Service instance from the specified {@link ConfigurationUnit}.
+     *
+     * @param configurationUnit The configuration unit.
+     * @param serviceName       The ServiceName.
+     * @return The Service.
+     */
+    private Service getService(final ConfigurationUnit configurationUnit, final ServiceName serviceName)
     {
         ServiceConfig serviceConfig = configurationUnit.getServices().get(serviceName);
-        if(serviceConfig != null) {
+        if (serviceConfig != null)
+        {
             return serviceConfig.getService();
         }
         return null;
     }
 
+    /**
+     * Deploy the outbound routers.
+     *
+     * @throws DeploymentException Error deploying routers.
+     */
     private void deployOutboundRouters() throws DeploymentException
     {
         for (ConfigurationUnit configurationUnit : configurationUnits)
@@ -342,7 +359,14 @@
         }
     }
 
-    private void deployTransformers(List<MessageTransformer> transformers, String routerConfigName) throws DeploymentException
+    /**
+     * Deploy the transformers.
+     *
+     * @param transformers     The transformer list.
+     * @param routerConfigName The name of the owning router.
+     * @throws DeploymentException Error deploying transformers.
+     */
+    private void deployTransformers(final List<MessageTransformer> transformers, final String routerConfigName) throws DeploymentException
     {
         if (transformers != null)
         {

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ConfigurationUnit.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ConfigurationUnit.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/ConfigurationUnit.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -91,7 +91,7 @@
      * @return The router configuration, or null if no such router is
      *         specified.
      */
-    public InboundRouterConfig getInboundRouter(final ServiceName service, final String configName)
+    public final InboundRouterConfig getInboundRouter(final ServiceName service, final String configName)
     {
         List<InboundRouterConfig> inboundRouterList = inboundRouters.get(service);
 
@@ -134,7 +134,7 @@
      *
      * @param services The List of Services defined in the configuration.
      */
-    public void setServices(Map<ServiceName, ServiceConfig> services)
+    public final void setServices(final Map<ServiceName, ServiceConfig> services)
     {
         this.services = services;
     }
@@ -157,7 +157,7 @@
      * @return The router configuration, or null if no such router is
      *         specified.
      */
-    public OutboundRouterConfig getOutboundRouter(final ServiceName service, final String configName)
+    public final OutboundRouterConfig getOutboundRouter(final ServiceName service, final String configName)
     {
         List<OutboundRouterConfig> outboundRouterList = outboundRouters.get(service);
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/InboundRouterConfig.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -49,7 +49,7 @@
      *
      * @return The router configuration name.
      */
-    public String getName()
+    public final String getName()
     {
         return name;
     }
@@ -59,7 +59,7 @@
      *
      * @param name The router configuration name.
      */
-    public void setName(String name)
+    public final void setName(final String name)
     {
         this.name = name;
     }

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/OutboundRouterConfig.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -20,7 +20,6 @@
 package org.jboss.esb.deploy.config;
 
 import org.jboss.esb.message.MessageTransformer;
-import org.jboss.esb.routing.InboundRouter;
 import org.jboss.esb.routing.OutboundRouter;
 
 import java.util.List;
@@ -50,7 +49,7 @@
      *
      * @return The router configuration name.
      */
-    public String getName()
+    public final String getName()
     {
         return name;
     }
@@ -60,7 +59,7 @@
      *
      * @param name The router configuration name.
      */
-    public void setName(String name)
+    public final void setName(final String name)
     {
         this.name = name;
     }

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/ConfigurationDigester.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/ConfigurationDigester.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/ConfigurationDigester.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -36,7 +36,7 @@
     /**
      * JBoss ESB 5.0 Namespace URI.
      */
-    public static final String XSD_v50 = "http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd";
+    String XSD_V50 = "http://www.jboss.org/jbossesb/xsd/jbossesb-5.0.xsd";
 
     /**
      * Digest the supplied configuration stream.

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DefaultConfigurationDigester.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -25,10 +25,10 @@
 import org.jboss.esb.deploy.config.InboundRouterConfig;
 import org.jboss.esb.deploy.config.OutboundRouterConfig;
 import org.jboss.esb.deploy.config.ServiceConfig;
+import org.jboss.esb.service.ServiceName;
 import org.jboss.esb.util.AssertArgument;
 import org.jboss.esb.xml.XMLParseUtils;
 import org.jboss.esb.xml.XsdDOMValidator;
-import org.jboss.esb.service.ServiceName;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -39,9 +39,9 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.LinkedHashMap;
 
 /**
  * Default Configuration Digester.
@@ -109,9 +109,9 @@
         XsdDOMValidator validator = new XsdDOMValidator(configDoc);
 
         // Make sure it's a valid configuration...
-        if (!ConfigurationDigester.XSD_v50.equals(validator.getDefaultNamespace().toString()))
+        if (!ConfigurationDigester.XSD_V50.equals(validator.getDefaultNamespace().toString()))
         {
-            throw new DeploymentException("Invalid JBoss ESB Configuration.  Default Namespace expected to be '" + ConfigurationDigester.XSD_v50 + "'.  Default Namespace was '" + validator.getDefaultNamespace() + "'.");
+            throw new DeploymentException("Invalid JBoss ESB Configuration.  Default Namespace expected to be '" + ConfigurationDigester.XSD_V50 + "'.  Default Namespace was '" + validator.getDefaultNamespace() + "'.");
         }
         try
         {
@@ -174,6 +174,7 @@
      *
      * @param configDoc          The configuration document.
      * @param configurationtUnit The configuration unit to which the routers are to be added.
+     * @throws DeploymentException Error in the supplied configuration data.
      */
     private void digestRouters(final Document configDoc, final ConfigurationUnit configurationtUnit) throws DeploymentException
     {
@@ -196,8 +197,14 @@
         }
     }
 
-    private void digestInRouters(ConfigurationUnit configurationtUnit, NodeList inRoutersNodeList)
-            throws DeploymentException
+    /**
+     * Digest the inRouters.
+     *
+     * @param configurationtUnit ConfigurationUnit to add the configs to.
+     * @param inRoutersNodeList  The inRouters DOM node tree.
+     * @throws DeploymentException Error in the supplied configuration data.
+     */
+    private void digestInRouters(final ConfigurationUnit configurationtUnit, final NodeList inRoutersNodeList) throws DeploymentException
     {
         int inRoutersCount = inRoutersNodeList.getLength();
         Map<ServiceName, List<InboundRouterConfig>> inboundRouters = new LinkedHashMap<ServiceName, List<InboundRouterConfig>>();
@@ -212,7 +219,8 @@
                 ServiceName serviceName = (ServiceName) inRoutersObjects.get("serviceName");
                 List<InboundRouterConfig> inRouters = (List<InboundRouterConfig>) inRoutersObjects.get("inRouters");
 
-                if(inboundRouters.containsKey(serviceName)) {
+                if (inboundRouters.containsKey(serviceName))
+                {
                     throw new DeploymentException("An <inRouters> section is defined multiple times for Service '" + serviceName + "'.  There should only be one.");
                 }
                 inboundRouters.put(serviceName, inRouters);
@@ -226,7 +234,14 @@
         }
     }
 
-    private void digestOutRouters(ConfigurationUnit configurationtUnit, NodeList outRoutersNodeList) throws DeploymentException
+    /**
+     * Digest the outRouters.
+     *
+     * @param configurationtUnit ConfigurationUnit to add the configs to.
+     * @param outRoutersNodeList  The outRouters DOM node tree.
+     * @throws DeploymentException Error in the supplied configuration data.
+     */
+    private void digestOutRouters(final ConfigurationUnit configurationtUnit, final NodeList outRoutersNodeList) throws DeploymentException
     {
         int outRoutersCount = outRoutersNodeList.getLength();
         Map<ServiceName, List<OutboundRouterConfig>> outboundRouters = new LinkedHashMap<ServiceName, List<OutboundRouterConfig>>();
@@ -241,7 +256,8 @@
                 ServiceName serviceName = (ServiceName) outRoutersObjects.get("serviceName");
                 List<OutboundRouterConfig> outRouters = (List<OutboundRouterConfig>) outRoutersObjects.get("outRouters");
 
-                if(outboundRouters.containsKey(serviceName)) {
+                if (outboundRouters.containsKey(serviceName))
+                {
                     throw new DeploymentException("An <outRouters> section is defined multiple times for Service '" + serviceName + "'.  There should only be one.");
                 }
                 outboundRouters.put(serviceName, outRouters);
@@ -260,6 +276,7 @@
      *
      * @param configDoc          The configuration document.
      * @param configurationtUnit The configuration unit to which the Services are to be added.
+     * @throws DeploymentException Error in the supplied configuration data.
      */
     private void digestServices(final Document configDoc, final ConfigurationUnit configurationtUnit) throws DeploymentException
     {

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -21,10 +21,10 @@
 
 import org.jboss.esb.xml.XMLParseUtils;
 import org.milyn.Smooks;
-import org.milyn.event.report.HtmlReportGenerator;
-import org.milyn.container.ExecutionContext;
 import org.milyn.cdr.SmooksResourceConfigurationList;
 import org.milyn.cdr.XMLConfigDigester;
+import org.milyn.container.ExecutionContext;
+import org.milyn.event.report.HtmlReportGenerator;
 import org.milyn.payload.JavaResult;
 import org.milyn.util.ClassUtil;
 import org.milyn.xml.DomUtils;
@@ -35,9 +35,9 @@
 
 import javax.xml.transform.dom.DOMSource;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.FileWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
@@ -124,7 +124,7 @@
      * Set digest Report Path.
      * <p/>
      * This is just a debugging facility.  Temporarily set the path
-     * from within your test code. 
+     * from within your test code.
      *
      * @param reportPath Report path, or null to turn off reporting.
      */
@@ -201,7 +201,7 @@
      * @throws IOException  Error reading digests configuration.
      * @throws SAXException Error parsing digest configuration.
      */
-    private static SmooksResourceConfigurationList getNamespaceConfig(URI namespace) throws IOException, SAXException
+    private static SmooksResourceConfigurationList getNamespaceConfig(final URI namespace) throws IOException, SAXException
     {
         SmooksResourceConfigurationList list = null;
 

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java	2008-09-01 11:32:53 UTC (rev 22289)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/dispatch/LocalDispatcher.java	2008-09-01 12:05:58 UTC (rev 22290)
@@ -64,12 +64,15 @@
     /**
      * Initialize the dispatcher.
      */
-    public void initialize() {
-        if(outboundRouters != null && !outboundRouters.isEmpty()) {
+    public final void initialize()
+    {
+        if (outboundRouters != null && !outboundRouters.isEmpty())
+        {
             int numTransformationSets = 0;
             for (OutboundRouterConfig outboundRouterConfig : outboundRouters)
             {
-                if(outboundRouterConfig.getTransformers() != null) {
+                if (outboundRouterConfig.getTransformers() != null)
+                {
                     numTransformationSets++;
                 }
             }
@@ -90,7 +93,7 @@
      * @param message The message to be dispatched.
      * @throws RoutingException Error dispatching message.
      */
-    public void dispatch(final Message message) throws RoutingException
+    public final void dispatch(final Message message) throws RoutingException
     {
         Message outMessage;
 
@@ -105,7 +108,7 @@
      * @param message The message.
      * @throws RoutingException Error applying transformer.
      */
-    private void applyInboundTransforms(Message message)
+    private void applyInboundTransforms(final Message message)
             throws RoutingException
     {
         if (transformers != null && !transformers.isEmpty())
@@ -125,11 +128,12 @@
 
     /**
      * Dispatch the message to the Service instance.
+     *
      * @param theMessage The message.
      * @return The processed message.  Can be a new Message instance.
      * @throws RoutingException Error processing message message in the Service.
      */
-    private Message dispatchToService(Message theMessage) throws RoutingException
+    private Message dispatchToService(final Message theMessage) throws RoutingException
     {
         if (service != null)
         {
@@ -147,15 +151,17 @@
 
     /**
      * Apply the outbound routers to the message.
+     *
      * @param outMessage The message.
      * @throws RoutingException Error routing message.
      */
-    private void applyOutboundRouters(Message outMessage) throws RoutingException
+    private void applyOutboundRouters(final Message outMessage) throws RoutingException
     {
         if (outboundRouters != null && !outboundRouters.isEmpty())
         {
             for (OutboundRouterConfig outboundRouter : outboundRouters)
             {
+                // TODO: Use the cloneOnOutboundTransforms
                 applyOutboundTransformers(outMessage, outboundRouter.getTransformers());
                 outboundRouter.getRouter().route(outMessage);
             }
@@ -164,15 +170,16 @@
 
     /**
      * Apply the supplied set of transformers on the supplied message.
-     * @param outMessage The message.
-     * @param transformers The transformers to be applied.
+     *
+     * @param outMessage   The message.
+     * @param outboundTransformers The transformers to be applied.
      * @throws RoutingException Error applying transformer.
      */
-    private void applyOutboundTransformers(Message outMessage, List<MessageTransformer> transformers) throws RoutingException
+    private void applyOutboundTransformers(final Message outMessage, final List<MessageTransformer> outboundTransformers) throws RoutingException
     {
-        if (transformers != null && !transformers.isEmpty())
+        if (outboundTransformers != null && !outboundTransformers.isEmpty())
         {
-            for (MessageTransformer transformer : transformers)
+            for (MessageTransformer transformer : outboundTransformers)
             {
                 try
                 {
@@ -187,18 +194,20 @@
 
     /**
      * Set the ServiceName.
+     *
      * @return The ServiceName.
      */
-    public ServiceName getServiceName()
+    public final ServiceName getServiceName()
     {
         return serviceName;
     }
 
     /**
      * Get the ServiceName.
+     *
      * @param serviceName The ServiceName.
      */
-    public void setServiceName(ServiceName serviceName)
+    public final void setServiceName(final ServiceName serviceName)
     {
         this.serviceName = serviceName;
     }
@@ -208,7 +217,7 @@
      *
      * @return The inbound transformers.
      */
-    public List<MessageTransformer> getTransformers()
+    public final List<MessageTransformer> getTransformers()
     {
         return transformers;
     }
@@ -218,7 +227,7 @@
      *
      * @param transformers The inbound transformers.
      */
-    public void setTransformers(List<MessageTransformer> transformers)
+    public final void setTransformers(final List<MessageTransformer> transformers)
     {
         this.transformers = transformers;
     }
@@ -228,7 +237,7 @@
      *
      * @return The Service.
      */
-    public Service getService()
+    public final Service getService()
     {
         return service;
     }
@@ -236,9 +245,9 @@
     /**
      * Set the Service.
      *
-     * @return The Service.
+     * @param service The Service.
      */
-    public void setService(Service service)
+    public final void setService(final Service service)
     {
         this.service = service;
     }
@@ -248,7 +257,7 @@
      *
      * @return The Outbound Routers.
      */
-    public List<OutboundRouterConfig> getOutboundRouters()
+    public final List<OutboundRouterConfig> getOutboundRouters()
     {
         return outboundRouters;
     }
@@ -258,7 +267,7 @@
      *
      * @param outboundRouters The Outbound Routers.
      */
-    public void setOutboundRouters(List<OutboundRouterConfig> outboundRouters)
+    public final void setOutboundRouters(final List<OutboundRouterConfig> outboundRouters)
     {
         this.outboundRouters = outboundRouters;
     }




More information about the jboss-svn-commits mailing list