From 5a7c972d473e51b9a883ca0e1d7aa046973df3ab Mon Sep 17 00:00:00 2001 From: Vova Perebykivskyi Date: Wed, 9 Nov 2016 18:31:42 +0200 Subject: [PATCH] Code refactoring. --- .../libreplan/business/common/entities/JobClassNameEnum.java | 1 + .../notifications/jobs/SendEmailOnMilestoneReachedJob.java | 5 +++-- .../jobs/SendEmailOnResourceRemovedFromTaskJob.java | 3 ++- .../jobs/SendEmailOnTaskAssignedToResourceJob.java | 4 +++- .../notifications/jobs/SendEmailOnTaskShouldFinishJob.java | 3 +++ .../notifications/jobs/SendEmailOnTaskShouldStartJob.java | 2 ++ .../jobs/SendEmailOnTimesheetDataMissingJob.java | 3 +++ .../realization/SendEmailOnTaskShouldFinish.java | 2 +- .../resources/libreplan-webapp-spring-security-config.xml | 2 +- 9 files changed, 19 insertions(+), 6 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/JobClassNameEnum.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/JobClassNameEnum.java index 64a4dec6c..d70a0c126 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/JobClassNameEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/JobClassNameEnum.java @@ -40,6 +40,7 @@ public enum JobClassNameEnum { SEND_EMAIL_TIMESHEET_DATA_MISSING("org.libreplan.importers.notifications.jobs", "SendEmailOnTimesheetDataMissingJob"); private String packageName; + private String name; JobClassNameEnum(String packageName, String name) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnMilestoneReachedJob.java b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnMilestoneReachedJob.java index eb585e3a5..58090d415 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnMilestoneReachedJob.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnMilestoneReachedJob.java @@ -28,12 +28,13 @@ import org.springframework.scheduling.quartz.QuartzJobBean; /** * Sends E-mail to users with data that storing in notification_queue table - * and that are treat to {@link org.libreplan.business.email.entities.EmailTemplateEnum#TEMPLATE_MILESTONE_REACHED} + * and that are treat to {@link org.libreplan.business.email.entities.EmailTemplateEnum#TEMPLATE_MILESTONE_REACHED}. * - * It is used! + * It is used in {@link org.libreplan.web.common.JobSchedulerModel}. * * @author Vova Perebykivskyi */ +@SuppressWarnings("unused") public class SendEmailOnMilestoneReachedJob extends QuartzJobBean { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnResourceRemovedFromTaskJob.java b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnResourceRemovedFromTaskJob.java index 521801a36..295f44084 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnResourceRemovedFromTaskJob.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnResourceRemovedFromTaskJob.java @@ -29,10 +29,11 @@ import org.springframework.scheduling.quartz.QuartzJobBean; * Sends E-mail to users with data that storing in notification_queue table and that are treat to * {@link org.libreplan.business.email.entities.EmailTemplateEnum#TEMPLATE_RESOURCE_REMOVED_FROM_TASK}. * - * It is used! + * It is used in {@link org.libreplan.web.common.JobSchedulerModel}. * * @author Vova Perebykivskyi */ +@SuppressWarnings("unused") public class SendEmailOnResourceRemovedFromTaskJob extends QuartzJobBean { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskAssignedToResourceJob.java b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskAssignedToResourceJob.java index 2da2faec1..369539c44 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskAssignedToResourceJob.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskAssignedToResourceJob.java @@ -30,9 +30,11 @@ import org.springframework.scheduling.quartz.QuartzJobBean; * Sends E-mail to users with data that storing in notification_queue table and that are treat to * {@link org.libreplan.business.email.entities.EmailTemplateEnum#TEMPLATE_TASK_ASSIGNED_TO_RESOURCE}. * + * It is used in {@link org.libreplan.web.common.JobSchedulerModel}. + * * @author Vova Perebykivskyi */ - +@SuppressWarnings("unused") public class SendEmailOnTaskAssignedToResourceJob extends QuartzJobBean { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskShouldFinishJob.java b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskShouldFinishJob.java index 279bb2046..587aa3557 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskShouldFinishJob.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskShouldFinishJob.java @@ -29,8 +29,11 @@ import org.springframework.scheduling.quartz.QuartzJobBean; * Sends E-mail to users with data that storing in notification_queue table and that are treat to * {@link org.libreplan.business.email.entities.EmailTemplateEnum#TEMPLATE_TODAY_TASK_SHOULD_FINISH}. * + * It is used in {@link org.libreplan.web.common.JobSchedulerModel}. + * * @author Vova Perebykivskyi */ +@SuppressWarnings("unused") public class SendEmailOnTaskShouldFinishJob extends QuartzJobBean { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskShouldStartJob.java b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskShouldStartJob.java index 1c6e54994..b7b7b8407 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskShouldStartJob.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTaskShouldStartJob.java @@ -29,9 +29,11 @@ import org.springframework.scheduling.quartz.QuartzJobBean; * Sends E-mail to users with data that storing in notification_queue table and that are treat to * {@link org.libreplan.business.email.entities.EmailTemplateEnum#TEMPLATE_TODAY_TASK_SHOULD_START}. * + * It is used in {@link org.libreplan.web.common.JobSchedulerModel}. * * @author Vova Perebykivskyi */ +@SuppressWarnings("unused") public class SendEmailOnTaskShouldStartJob extends QuartzJobBean { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTimesheetDataMissingJob.java b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTimesheetDataMissingJob.java index 066aed022..887a891b2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTimesheetDataMissingJob.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/jobs/SendEmailOnTimesheetDataMissingJob.java @@ -29,8 +29,11 @@ import org.springframework.scheduling.quartz.QuartzJobBean; * Sends E-mail to users with data that storing in notification_queue table and that are treat to * {@link org.libreplan.business.email.entities.EmailTemplateEnum#TEMPLATE_ENTER_DATA_IN_TIMESHEET}. * + * It is used in {@link org.libreplan.web.common.JobSchedulerModel}. + * * @author Vova Perebykivskyi */ +@SuppressWarnings("unused") public class SendEmailOnTimesheetDataMissingJob extends QuartzJobBean { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/realization/SendEmailOnTaskShouldFinish.java b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/realization/SendEmailOnTaskShouldFinish.java index 4ed0d1132..de57411a7 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/realization/SendEmailOnTaskShouldFinish.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/notifications/realization/SendEmailOnTaskShouldFinish.java @@ -112,7 +112,7 @@ public class SendEmailOnTaskShouldFinish implements IEmailNotificationJob { DateTimeComparator dateTimeComparator = DateTimeComparator.getDateOnlyInstance(); List tasks = taskElementDAO.getTaskElementsWithParentsWithoutMilestones(); - for (TaskElement item : tasks){ + for (TaskElement item : tasks) { DateTime endDate = new DateTime(item.getEndDate()); if ( dateTimeComparator.compare(currentDate, endDate) == 0 ) { diff --git a/libreplan-webapp/src/main/resources/libreplan-webapp-spring-security-config.xml b/libreplan-webapp/src/main/resources/libreplan-webapp-spring-security-config.xml index 48687b160..f74420fd5 100644 --- a/libreplan-webapp/src/main/resources/libreplan-webapp-spring-security-config.xml +++ b/libreplan-webapp/src/main/resources/libreplan-webapp-spring-security-config.xml @@ -17,7 +17,7 @@ - +