Author: indika
Date: Wed Feb 18 08:58:42 2009
New Revision: 745439
URL: http://svn.apache.org/viewvc?rev=745439&view=rev
Log:
some code improvments
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskJobDetailFactory.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepositoryFactory.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskJobDetailFactory.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/service/TaskManagementService.java
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskJobDetailFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskJobDetailFactory.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskJobDetailFactory.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskJobDetailFactory.java
Wed Feb 18 08:58:42 2009
@@ -38,7 +38,8 @@
/**
* @see TaskJobDetailFactory
*/
- public JobDetail createJobDetail(TaskDescription taskDescription,
Map<String, Object> resources, Class<Job> jobClass) {
+ public JobDetail createJobDetail(TaskDescription taskDescription,
Map<String,
+ Object> resources, Class<Job> jobClass) {
if (taskDescription == null) {
throw new SynapseTaskException("Task Description cannot be
found.", log);
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/DefaultTaskTriggerFactory.java
Wed Feb 18 08:58:42 2009
@@ -36,7 +36,7 @@
private static final Log log =
LogFactory.getLog(DefaultTaskTriggerFactory.class);
- private final static Random RANDOM = new Random();
+ private final static Random RANDOM = new Random();
/**
* @see TaskTriggerFactory
@@ -59,7 +59,8 @@
if (repeatCount >= 0) {
trigger = TriggerUtils.makeImmediateTrigger(repeatCount - 1,
repeatInterval);
} else {
- trigger =
TriggerUtils.makeImmediateTrigger(SimpleTrigger.REPEAT_INDEFINITELY,
repeatInterval);
+ trigger =
TriggerUtils.makeImmediateTrigger(SimpleTrigger.REPEAT_INDEFINITELY,
+ repeatInterval);
}
} else {
@@ -68,12 +69,14 @@
cronTrigger.setCronExpression(cron);
trigger = cronTrigger;
} catch (ParseException e) {
- throw new SynapseTaskException("Error setting cron expression
: " + e.getMessage() + cron, log);
+ throw new SynapseTaskException("Error setting cron expression
: " +
+ e.getMessage() + cron, log);
}
}
if (trigger == null) {
- throw new SynapseTaskException("Trigger is null for the Task
description : " + taskDescription, log);
+ throw new SynapseTaskException("Trigger is null for the Task
description : " +
+ taskDescription, log);
}
if (startTime != null) {
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java
Wed Feb 18 08:58:42 2009
@@ -131,7 +131,8 @@
"a simple trigger, but no interval specified");
} else if (repeatInterval != null &&
repeatInterval.getAttributeValue() != null) {
try {
- long repeatIntervalInSeconds =
Long.parseLong(repeatInterval.getAttributeValue());
+ long repeatIntervalInSeconds = Long.parseLong(
+ repeatInterval.getAttributeValue());
long repeatIntervalInMillis = repeatIntervalInSeconds
* 1000;
taskDescription.setInterval(repeatIntervalInMillis);
} catch (Exception e) {
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepository.java
Wed Feb 18 08:58:42 2009
@@ -31,7 +31,8 @@
public class TaskDescriptionRepository {
private static final Log log =
LogFactory.getLog(TaskDescriptionRepository.class);
- private final Map<String, TaskDescription> taskDescriptionMap = new
HashMap<String, TaskDescription>();
+ private final Map<String, TaskDescription> taskDescriptionMap
+ = new HashMap<String, TaskDescription>();
/**
* Stores a given TaskDescription
@@ -64,7 +65,8 @@
TaskDescription taskDescription = taskDescriptionMap.get(name);
if (taskDescription == null) {
if (log.isDebugEnabled()) {
- log.debug("TaskDescription cannot be found for name :" + name
+ " , returning null");
+ log.debug("TaskDescription cannot be found for name :" + name +
+ " , returning null");
}
} else {
if (log.isDebugEnabled()) {
@@ -112,7 +114,8 @@
* Explicit check for determine whether there is a task description with a
name in interest
*
* @param name Name of the TaskDescription
- * @return Returns true , if there is no TaskDescription associated with
given name , otherwise , false
+ * @return Returns true , if there is no TaskDescription associated with
given name ,
+ * otherwise , false
*/
public boolean isUnique(String name) {
validateName(name);
@@ -122,7 +125,7 @@
public void clear() {
this.taskDescriptionMap.clear();
}
-
+
private void validateName(String name) {
if (name == null || "".equals(name)) {
throw new SynapseTaskException("Task name is null or empty", log);
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepositoryFactory.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepositoryFactory.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionRepositoryFactory.java
Wed Feb 18 08:58:42 2009
@@ -27,14 +27,16 @@
public class TaskDescriptionRepositoryFactory {
private static final Log log =
LogFactory.getLog(TaskDescriptionRepositoryFactory.class);
- private final static Map<String, TaskDescriptionRepository> repositoryMap
= new HashMap<String, TaskDescriptionRepository>();
+ private final static Map<String, TaskDescriptionRepository> repositoryMap
+ = new HashMap<String, TaskDescriptionRepository>();
private TaskDescriptionRepositoryFactory() {
}
/**
* Returns a TaskDescriptionRepository instance
- * There is an only one instance of TaskDescriptionRepository for a given
id as Factory caches TaskDescriptionRepositorys
+ * There is an only one instance of TaskDescriptionRepository for a given
id as
+ * Factory caches TaskDescriptionRepositorys
*
* @param id Identifier for TaskDescriptionRepository
* @return TaskDescriptionRepository instance
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionSerializer.java
Wed Feb 18 08:58:42 2009
@@ -38,7 +38,8 @@
private static final String NULL_NAMESPACE = "";
private static final OMNamespace NULL_OMNS =
omFactory.createOMNamespace(NULL_NAMESPACE, "");
- public static OMElement serializeTaskDescription(OMNamespace
targetNamespace, TaskDescription taskDescription) {
+ public static OMElement serializeTaskDescription(OMNamespace
targetNamespace,
+ TaskDescription
taskDescription) {
if (taskDescription == null) {
throw new SynapseTaskException("TaskDescription can not be null",
log);
@@ -58,7 +59,8 @@
for (int i = 1; i < pinnedServers.size(); i++) {
pinnedServersStr = pinnedServersStr + " " +
pinnedServers.get(i);
}
- task.addAttribute(omFactory.createOMAttribute("pinnedServers",
NULL_OMNS, pinnedServersStr));
+ task.addAttribute(omFactory.createOMAttribute("pinnedServers",
+ NULL_OMNS, pinnedServersStr));
}
OMElement el = omFactory.createOMElement("trigger", targetNamespace,
task);
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskJobDetailFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskJobDetailFactory.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskJobDetailFactory.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskJobDetailFactory.java
Wed Feb 18 08:58:42 2009
@@ -29,14 +29,17 @@
public interface TaskJobDetailFactory {
/**
- * Factory method for creating a JobDetail based on give Task Description
, additional resources and job class
+ * Factory method for creating a JobDetail based on give Task Description ,
+ * additional resources and job class
*
* @param taskDescription TaskDescription instance
* @param resources Additional resources .
* This can be used to provide context specific
resources
* Example : Synapse Environment
* @param jobClass Job class
- * @return JobDetail instance , if there are enough information to create
a instance , otherwise , return null
+ * @return JobDetail instance , if there are enough information to create
a instance ,
+ * otherwise , return null
*/
- JobDetail createJobDetail(TaskDescription taskDescription, Map<String,
Object> resources, Class<Job> jobClass);
+ JobDetail createJobDetail(TaskDescription taskDescription, Map<String,
+ Object> resources, Class<Job> jobClass);
}
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
Wed Feb 18 08:58:42 2009
@@ -100,7 +100,8 @@
}
} catch (SchedulerException e) {
- throw new SynapseTaskException("Error getting a scheduler
instance form scheduler factory " + sf, e, log);
+ throw new SynapseTaskException("Error getting a scheduler
instance form scheduler" +
+ " factory " + sf, e, log);
}
initialized = true;
start();
@@ -132,7 +133,8 @@
* @param resources Any initial resources for task
* @param jobClass Quartz job class
*/
- public void scheduleTask(TaskDescription taskDescription, Map<String,
Object> resources, Class jobClass) {
+ public void scheduleTask(TaskDescription taskDescription, Map<String,
+ Object> resources, Class jobClass) {
validateInit();
validateStart();
@@ -146,7 +148,8 @@
}
if (!Job.class.isAssignableFrom(jobClass)) {
- throw new SynapseTaskException("Invalid Job Class : [ Expected " +
Job.class.getName() + "]" +
+ throw new SynapseTaskException("Invalid Job Class : [ Expected " +
+ Job.class.getName() + "]" +
" [ Found " + jobClass.getName() + " ]", log);
}
@@ -160,10 +163,12 @@
Trigger trigger = triggerFactory.createTrigger(taskDescription);
if (trigger == null) {
- throw new SynapseTaskException("Trigger can not be created from :
" + taskDescription, log);
+ throw new SynapseTaskException("Trigger can not be created from : "
+ + taskDescription, log);
}
- JobDetail jobDetail =
jobDetailFactory.createJobDetail(taskDescription, resources, jobClass);
+ JobDetail jobDetail = jobDetailFactory.createJobDetail(taskDescription,
+ resources, jobClass);
if (jobDetail == null) {
throw new SynapseTaskException("JobDetailcan not be created from :
" + taskDescription +
" and job class " + jobClass.getName(), log);
@@ -175,7 +180,8 @@
}
scheduler.scheduleJob(jobDetail, trigger);
} catch (SchedulerException e) {
- throw new SynapseTaskException("Error scheduling job : " +
jobDetail + " with trigger " + trigger);
+ throw new SynapseTaskException("Error scheduling job : " +
jobDetail
+ + " with trigger " + trigger);
}
}
@@ -225,7 +231,8 @@
if (group == null || "".equals(group)) {
group = TaskDescription.DEFAULT_GROUP;
if (log.isDebugEnabled()) {
- log.debug("Task group is null or empty , using default group
:" + TaskDescription.DEFAULT_GROUP);
+ log.debug("Task group is null or empty , using default group :"
+ + TaskDescription.DEFAULT_GROUP);
}
}
@@ -263,7 +270,8 @@
public String toString() {
StringBuffer schedulerMetaData = new StringBuffer();
if (scheduler != null) {
- schedulerMetaData = schedulerMetaData.append("[ Scheduler :
").append(scheduler).append(" ]");
+ schedulerMetaData = schedulerMetaData.append("[ Scheduler : ")
+ .append(scheduler).append(" ]");
}
return new StringBuffer().append("[ TaskScheduler[ Name :").
append(name).append("]").append(schedulerMetaData).append("
]").toString();
Modified:
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/service/TaskManagementService.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/service/TaskManagementService.java?rev=745439&r1=745438&r2=745439&view=diff
==============================================================================
---
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/service/TaskManagementService.java
(original)
+++
synapse/trunk/java/modules/tasks/src/main/java/org/apache/synapse/task/service/TaskManagementService.java
Wed Feb 18 08:58:42 2009
@@ -70,7 +70,8 @@
* Explicit check for availability of a particular TaskDescription instance
*
* @param name Name of the TaskDescription instance
- * @return Returns true if there is a TaskDescription instance with given
name , otherwise , false
+ * @return Returns true if there is a TaskDescription instance with given
name ,
+ * otherwise , false
*/
boolean isContains(String name);
