[jboss-svn-commits] JBL Code SVN: r23347 - labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy.

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

Author: beve
Date: 2008-10-07 09:00:21 -0400 (Tue, 07 Oct 2008)
New Revision: 23347

Modified:
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
Log:
checkstyle cleanup.


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-10-07 12:44:01 UTC (rev 23346)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-10-07 13:00:21 UTC (rev 23347)
@@ -105,6 +105,7 @@
      */
     private Map<Object, Object> deployedObjects = new LinkedHashMap<Object, Object>()
     {
+        @Override
         public Object put(final Object key, final Object value)
         {
             if (containsKey(key))
@@ -322,7 +323,7 @@
         // Undeploy all the "non bus" inbound routers...
         for (List<InboundRouterConfig> inRouterConfigs : inRouterConfigsMatrix)
         {
-            for(InboundRouterConfig inRouterConfig : inRouterConfigs)
+            for (InboundRouterConfig inRouterConfig : inRouterConfigs)
             {
                 undeploy(inRouterConfig.getName(), inRouterConfig.getRouter());
                 activeDispatchers.add(inRouterConfig.getDispatcher());
@@ -330,7 +331,7 @@
         }
 
         // Stop listening for messages on all connected buses...
-        if(deploymentCoordinator != null)
+        if (deploymentCoordinator != null)
         {
             deploymentCoordinator.stopListeningOnBuses();
 
@@ -345,23 +346,23 @@
         // Now wait for the dispatchers to complete processing all their messages...
         long shutdownTimeout = deploymentProperties.getLongProperty(SHUTDOWN_TIMEOUT_KEY, 30000);
         long start = System.currentTimeMillis();
-        while(!activeDispatchers.isEmpty())
+        while (!activeDispatchers.isEmpty())
         {
             Iterator<MessageDispatcher> iterator = activeDispatchers.iterator();
             while (iterator.hasNext())
             {
                 MessageDispatcher dispatcher = iterator.next();
-                if(dispatcher == null || !dispatcher.isProcessingMessages())
+                if (dispatcher == null || !dispatcher.isProcessingMessages())
                 {
                     iterator.remove();
                 }
             }
 
             // If there are still some dispatchers processing messages...
-            if(!activeDispatchers.isEmpty())
+            if (!activeDispatchers.isEmpty())
             {
                 // Check shutdown timeout...
-                if(System.currentTimeMillis() > start + shutdownTimeout)
+                if (System.currentTimeMillis() > start + shutdownTimeout)
                 {
                     logger.error("Shutdown timeout after " + shutdownTimeout + " ms.  Timed out waiting on active message dispatchers to complete message processing. You may need to update the '" + SHUTDOWN_TIMEOUT_KEY + "' deployment property.");
                     break;
@@ -386,7 +387,7 @@
      * An example of a "pre-installed" deployment unit would be for a
      * Dead Letter service.
      *
-     * @throw DeploymentException Error processing one of the pre-installed
+     * @throws DeploymentException Error processing one of the pre-installed
      * deployment units.
      */
     private void addPreinstalledDeploymentUnits() throws DeploymentException
@@ -397,14 +398,15 @@
             {
                 DefaultConfigurationDigester digester = new DefaultConfigurationDigester();
 
-                public void processEntry(String unitName, String unitPath) throws DeploymentException
+                @Override
+                public void processEntry(final String unitName, final String unitPath) throws DeploymentException
                 {
                     String deploymentCheckPath = "preinstalled/" + ConfigUtil.urlEncode(deploymentName) + "/" + unitPath;
                     String defaultCheckPath = "preinstalled/" + unitPath;
 
                     // Try for a deployment specific configuration...
                     InputStream configStream = ConfigUtil.getConfigStream(deploymentCheckPath);
-                    if(configStream != null)
+                    if (configStream != null)
                     {
                         try
                         {
@@ -419,7 +421,7 @@
 
                     // Try for a default configuration...
                     configStream = ConfigUtil.getConfigStream(defaultCheckPath);
-                    if(configStream != null)
+                    if (configStream != null)
                     {
                         try
                         {
@@ -434,7 +436,7 @@
 
                     throw new DeploymentException("Unable to find pre-installed DeploymentUnit '" + unitName + "=" + unitPath + "'.");
                 }
-            }.iterate("unit.");
+            } .iterate("unit.");
         }
         catch (DeploymentException e)
         {
@@ -603,7 +605,7 @@
                 {
                     ServiceConfig service = getService(aggregatedDeploymentUnit, serviceName);
 
-                    if(service != null && !service.isRoutable())
+                    if (service != null && !service.isRoutable())
                     {
                         throw new DeploymentException("Invalid InboundRouter configuration '" + routerConfig.getName() + "' (" + routerConfig.getRouter().getClass().getName() + "). Target Service '" + serviceName + "' is not routable.  Check Service 'mep' configuration.");
                     }
@@ -758,7 +760,7 @@
      *
      * @param routingContext The Routing Context to be updated..
      */
-    private final void addBusOutboundRouters(final BusRoutingContext routingContext)
+    private void addBusOutboundRouters(final BusRoutingContext routingContext)
     {
         Map<ServiceName, BusOutboundRouter> busRouters = routingContext.getBusOutRouters();
         Set<Map.Entry<ServiceName, List<OutboundRouterConfig>>> outRouters = aggregatedDeploymentUnit.getOutboundRouters().entrySet();
@@ -789,7 +791,7 @@
      *
      * @param routingContext The Routing Context to be updated..
      */
-    private final void addBusInboundRouters(final BusRoutingContext routingContext)
+    private void addBusInboundRouters(final BusRoutingContext routingContext)
     {
         Map<ServiceName, BusInboundRouter> busRouters = routingContext.getBusInRouters();
         Set<Map.Entry<ServiceName, List<OutboundRouterConfig>>> outRouters = aggregatedDeploymentUnit.getOutboundRouters().entrySet();
@@ -800,11 +802,11 @@
             ServiceConfig serviceConfig = aggregatedDeploymentUnit.getServices().get(serviceName);
 
             // Only create the Bus InRouter if the service can be routed to...
-            if(serviceConfig != null && !serviceConfig.isRoutable())
+            if (serviceConfig != null && !serviceConfig.isRoutable())
             {
                 continue;
             }
-            
+
             BusInboundRouter inRouter = new BusInboundRouter();
             BusDispatcher dispatcher = new BusDispatcher(context);
             List<OutboundRouterConfig> outRouterList = serviceOutRouters.getValue();