[jboss-svn-commits] JBL Code SVN: r22356 - in labs/jbossesb/workspace/skeagh: api/routing/src/main/java/org/jboss/esb/routing and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 3 11:20:55 EDT 2008
Author: tfennelly
Date: 2008-09-03 11:20:55 -0400 (Wed, 03 Sep 2008)
New Revision: 22356
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/context/AddressingContext.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/context/InvocationContext.java
labs/jbossesb/workspace/skeagh/jbossesb_checkstyle_checks.xml
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/AssertDeployment.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/schedule/AbstractScheduleListener.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/CronSchedule.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/JobScheduler.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/Schedule.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SimpleSchedule.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-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/api/routing/src/main/java/org/jboss/esb/routing/MessageDispatcher.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -19,8 +19,8 @@
*/
package org.jboss.esb.routing;
+import org.jboss.esb.context.InvocationContext;
import org.jboss.esb.message.Message;
-import org.jboss.esb.context.InvocationContext;
/**
* Message Dispatcher.
@@ -38,8 +38,8 @@
/**
* Dispatch the message to the target service.
*
- * @param message The message to be dispatched.
- * @param invocationContext The InvocationContext for the message dispatch.
+ * @param message The message to be dispatched.
+ * @param invocationContext The InvocationContext for the message dispatch.
* @throws RoutingException An exception occured while dispatching the message.
*/
void dispatch(Message message, InvocationContext invocationContext) throws RoutingException;
Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/AddressingContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/AddressingContext.java 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/AddressingContext.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -54,13 +54,16 @@
/**
* Set the {@link AddressingContext} associated with the current thread.
+ *
* @param context The {@link AddressingContext} associated with the current thread.
*/
public static void setContext(final AddressingContext context)
{
- if(context != null) {
+ if (context != null)
+ {
contextTL.set(context);
- } else {
+ } else
+ {
contextTL.remove();
}
}
@@ -68,8 +71,9 @@
/**
* Get the {@link AddressingContext} associated with the message currently
* being processed.
+ *
* @return The {@link AddressingContext} associated with the message currently
- * being processed.
+ * being processed.
*/
public static AddressingContext getContext()
{
@@ -78,6 +82,7 @@
/**
* Get the "To" address.
+ *
* @return The "To" address.
*/
public final ServiceName getTo()
@@ -87,6 +92,7 @@
/**
* Set the "To" address.
+ *
* @param to The "To" address.
*/
public final void setTo(final ServiceName to)
@@ -96,6 +102,7 @@
/**
* Get the "From" address.
+ *
* @return The "From" address.
*/
public final ServiceName getFrom()
@@ -105,6 +112,7 @@
/**
* Set the "To" address.
+ *
* @param from The "To" address.
*/
public final void setFrom(final ServiceName from)
@@ -114,6 +122,7 @@
/**
* Get the "ReplyTo" address.
+ *
* @return The "ReplyTo" address.
*/
public final ServiceName getReplyTo()
@@ -123,6 +132,7 @@
/**
* Set the "ReplyTo" address.
+ *
* @param replyTo The "ReplyTo" address.
*/
public final void setReplyTo(final ServiceName replyTo)
@@ -132,6 +142,7 @@
/**
* Get the "FaultTo" address.
+ *
* @return The "FaultTo" address.
*/
public final ServiceName getFaultTo()
@@ -141,6 +152,7 @@
/**
* Set the "FaultTo" address.
+ *
* @param faultTo The "FaultTo" address.
*/
public final void setFaultTo(final ServiceName faultTo)
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-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/DeploymentContext.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -55,19 +55,23 @@
/**
* Set the {@link DeploymentContext} associated with the current thread.
+ *
* @param context The {@link DeploymentContext} associated with the current thread.
*/
public static void setContext(final DeploymentContext context)
{
- if(context != null) {
+ if (context != null)
+ {
contextTL.set(context);
- } else {
+ } else
+ {
contextTL.remove();
}
}
/**
* Get the {@link DeploymentContext} associated with the current thread.
+ *
* @return The {@link DeploymentContext} associated with the current thread.
*/
public static DeploymentContext getContext()
@@ -77,6 +81,7 @@
/**
* Set the list of deployment resources on the context.
+ *
* @param resources A list of deployment resources associated with this deployment.
*/
public final void setResources(final Map<String, Object> resources)
@@ -86,6 +91,7 @@
/**
* Get the deployment resource Object from the context using the supplied id.
+ *
* @param id The resource ID.
* @return The resource object, otherwise null.
*/
@@ -96,6 +102,7 @@
/**
* Get the Object from the context using the supplied key.
+ *
* @param key The context key.
* @return The Object bound under the supplied context key, otherwise null.
*/
@@ -106,7 +113,8 @@
/**
* Set the value Object into the context using the supplied key.
- * @param key The context key.
+ *
+ * @param key The context key.
* @param value The value object to be set in the context.
*/
public final void set(final Object key, final Object value)
@@ -116,6 +124,7 @@
/**
* Get the context Map.
+ *
* @return The context Map.
*/
public final Map<Object, Object> getAll()
Modified: labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/InvocationContext.java
===================================================================
--- labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/InvocationContext.java 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/api/service/src/main/java/org/jboss/esb/context/InvocationContext.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -47,13 +47,16 @@
/**
* Set the {@link InvocationContext} associated with the current thread.
+ *
* @param context The {@link InvocationContext} associated with the current thread.
*/
public static void setContext(final InvocationContext context)
{
- if(context != null) {
+ if (context != null)
+ {
contextTL.set(context);
- } else {
+ } else
+ {
contextTL.remove();
}
}
@@ -61,8 +64,9 @@
/**
* Get the {@link InvocationContext} associated with the message currently
* being processed.
+ *
* @return The {@link InvocationContext} associated with the message currently
- * being processed.
+ * being processed.
*/
public static InvocationContext getContext()
{
@@ -71,6 +75,7 @@
/**
* Get the Object from the context using the supplied key.
+ *
* @param key The context key.
* @return The Object bound under the supplied context key, otherwise false.
*/
@@ -81,7 +86,8 @@
/**
* Set the value Object into the context using the supplied key.
- * @param key The context key.
+ *
+ * @param key The context key.
* @param value The value object to be set in the context.
*/
public final void set(final Object key, final Object value)
@@ -91,6 +97,7 @@
/**
* Get the context Map.
+ *
* @return The context Map.
*/
public final Map<Object, Object> getAll()
Modified: labs/jbossesb/workspace/skeagh/jbossesb_checkstyle_checks.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/jbossesb_checkstyle_checks.xml 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/jbossesb_checkstyle_checks.xml 2008-09-03 15:20:55 UTC (rev 22356)
@@ -132,7 +132,9 @@
<!-- Checks for blocks. You know, those {}'s -->
<!-- See http://checkstyle.sf.net/config_blocks.html -->
<module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
+ <module name="EmptyBlock">
+ <property name="option" value="text"/>
+ </module>
<module name="LeftCurly">
<property name="option" value="nl"/>
</module>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/AssertDeployment.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/AssertDeployment.java 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/AssertDeployment.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -19,9 +19,6 @@
*/
package org.jboss.esb.deploy;
-import java.util.Collection;
-import java.util.Map;
-
/**
* Deployment assertion utilities.
*
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-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -127,7 +127,7 @@
*
* @param deploymentUnits The deployment configuration units.
*/
- public final void setConfigurationUnits(final List<DeploymentUnit> deploymentUnits)
+ public final void setDeploymentUnits(final List<DeploymentUnit> deploymentUnits)
{
this.deploymentUnits = deploymentUnits;
}
@@ -393,7 +393,7 @@
* Get the named Service instance from the specified {@link org.jboss.esb.deploy.config.DeploymentUnit}.
*
* @param deploymentUnit The configuration unit.
- * @param serviceName The ServiceName.
+ * @param serviceName The ServiceName.
* @return The Service.
*/
private Service getService(final DeploymentUnit deploymentUnit, final ServiceName serviceName)
@@ -477,9 +477,10 @@
/**
* Deploy the specified object.
*
- * @param object The Object to be deployed.
+ * @param object The Object to be deployed.
+ * @param objectName The "objectName" for the Object. This should come from the config and be unique.
* @param serviceName The name of the service for which the object is being deployed, or null if the
- * object is not associated with a service.
+ * object is not associated with a service.
* @throws InvocationTargetException Exception during object deployment.
* @throws IllegalAccessException Unable to invoke initialize method on object.
*/
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/AbstractScheduleListener.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/AbstractScheduleListener.java 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/AbstractScheduleListener.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -50,6 +50,8 @@
/**
* Register the ScheduleListener instance with the {@link org.jboss.esb.schedule.JobScheduler}.
+ *
+ * @throws SchedulingException Unable to register listener.
*/
@Initialize
public final void registerListener() throws SchedulingException
@@ -73,7 +75,7 @@
*
* @return The listener object name.
*/
- public String getObjectName()
+ public final String getObjectName()
{
return objectName;
}
@@ -83,7 +85,7 @@
*
* @param objectName The listener object name.
*/
- public void setObjectName(String objectName)
+ public final void setObjectName(final String objectName)
{
this.objectName = objectName;
}
@@ -93,7 +95,7 @@
*
* @return The DeploymentContext.
*/
- public DeploymentContext getDeploymentContext()
+ public final DeploymentContext getDeploymentContext()
{
return deploymentContext;
}
@@ -103,7 +105,7 @@
*
* @param deploymentContext The DeploymentContext.
*/
- public void setDeploymentContext(DeploymentContext deploymentContext)
+ public final void setDeploymentContext(final DeploymentContext deploymentContext)
{
this.deploymentContext = deploymentContext;
}
@@ -113,7 +115,7 @@
*
* @return The schedule resourceId..
*/
- public String getScheduleResourceId()
+ public final String getScheduleResourceId()
{
return scheduleResourceId;
}
@@ -123,7 +125,7 @@
*
* @param scheduleResourceId The schedule resourceId..
*/
- public void setScheduleResourceId(String scheduleResourceId)
+ public final void setScheduleResourceId(final String scheduleResourceId)
{
this.scheduleResourceId = scheduleResourceId;
}
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/CronSchedule.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/CronSchedule.java 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/CronSchedule.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -19,9 +19,8 @@
*/
package org.jboss.esb.schedule;
+import org.quartz.CronTrigger;
import org.quartz.Trigger;
-import org.quartz.CronTrigger;
-import org.jboss.esb.annotations.Initialize;
import java.text.ParseException;
@@ -72,14 +71,16 @@
* @return A Trigger instance.
* @throws SchedulingException Unable to create Trigger.
*/
- public Trigger toTrigger() throws SchedulingException
+ public final Trigger toTrigger() throws SchedulingException
{
CronTrigger trigger = new CronTrigger();
setTimes(trigger);
- try {
+ try
+ {
trigger.setCronExpression(cronExpression);
- } catch (ParseException e) {
+ } catch (ParseException e)
+ {
throw new SchedulingException("Invalid schedule CRON expression '" + cronExpression + "'.", e);
}
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/JobScheduler.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/JobScheduler.java 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/JobScheduler.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -172,7 +172,7 @@
* @param schedule The schedule.
* @throws SchedulingException Error adding listener to schedule.
*/
- public void addScheduleListener(final ScheduleListener listener, final String scheduleName, final Schedule schedule) throws SchedulingException
+ public final void addScheduleListener(final ScheduleListener listener, final String scheduleName, final Schedule schedule) throws SchedulingException
{
JobDetail jobDetail = new JobDetail(scheduleName, schedulerId, ESBScheduledJob.class);
JobDataMap jobDataMap = new JobDataMap();
@@ -198,7 +198,13 @@
*/
public static class ESBScheduledJob implements StatefulJob
{
- public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException
+ /**
+ * Execute the job.
+ *
+ * @param jobExecutionContext Quartz job execution context.
+ * @throws JobExecutionException Execution exception.
+ */
+ public final void execute(final JobExecutionContext jobExecutionContext) throws JobExecutionException
{
final JobDataMap jobDataMap = jobExecutionContext.getJobDetail().getJobDataMap();
ScheduleListener listener = (ScheduleListener) jobDataMap.get(ScheduleListener.class.getName());
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/Schedule.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/Schedule.java 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/Schedule.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -19,8 +19,8 @@
*/
package org.jboss.esb.schedule;
+import org.jboss.esb.annotations.Initialize;
import org.quartz.Trigger;
-import org.jboss.esb.annotations.Initialize;
import java.util.Calendar;
import java.util.Date;
@@ -56,10 +56,11 @@
/**
* Assert that the schedule configuration is OK.
+ *
* @throws SchedulingException Invalid schedule resource configuration.
*/
@Initialize
- public void assertScheduleOK() throws SchedulingException
+ public final void assertScheduleOK() throws SchedulingException
{
// Just make sure we can create a trigger from the schedule
// without generating an exception...
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SimpleSchedule.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SimpleSchedule.java 2008-09-03 15:01:53 UTC (rev 22355)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/schedule/SimpleSchedule.java 2008-09-03 15:20:55 UTC (rev 22356)
@@ -93,7 +93,7 @@
* @return A Trigger instance.
* @throws SchedulingException Unable to create Trigger.
*/
- public Trigger toTrigger() throws SchedulingException
+ public final Trigger toTrigger() throws SchedulingException
{
SimpleTrigger trigger = new SimpleTrigger();
More information about the jboss-svn-commits
mailing list