From ee223dab61ad4f09ffce95cf3134696146eac606 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Sun, 14 Jul 2013 22:47:12 +0100 Subject: [PATCH] move api versions to develop versions for next release. suppress unused warnings. --- api-docs/apiLive.htm | 2 +- mifosng-provider/gradle.properties | 2 +- .../jobs/domain/ScheduledJobDetail.java | 17 +++++++++++------ .../jobs/domain/ScheduledJobRunHistory.java | 8 ++++++++ .../jobs/service/SchedulerJobListener.java | 14 +++++++------- .../portfolio/client/data/ClientData.java | 1 + 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm index dc95f3c9c..d5b485fc5 100644 --- a/api-docs/apiLive.htm +++ b/api-docs/apiLive.htm @@ -90,7 +90,7 @@
- +

Overview

diff --git a/mifosng-provider/gradle.properties b/mifosng-provider/gradle.properties index c6ea4a2bb..a5395d621 100644 --- a/mifosng-provider/gradle.properties +++ b/mifosng-provider/gradle.properties @@ -1 +1 @@ -releaseVersion=1.5.0.RELEASE +releaseVersion=1.6.0.DEVELOP diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/domain/ScheduledJobDetail.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/domain/ScheduledJobDetail.java index ca9983459..024edfd90 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/domain/ScheduledJobDetail.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/domain/ScheduledJobDetail.java @@ -17,12 +17,14 @@ public class ScheduledJobDetail extends AbstractPersistable { @Column(name = "name") private String jobName; + @SuppressWarnings("unused") @Column(name = "display_name") private String jobDisplayName; @Column(name = "cron_expression") private String croneExpression; + @SuppressWarnings("unused") @Column(name = "create_time") @Temporal(TemporalType.TIMESTAMP) private Date createTime; @@ -33,10 +35,12 @@ public class ScheduledJobDetail extends AbstractPersistable { @Column(name = "group_name") private String groupName; + @SuppressWarnings("unused") @Column(name = "previous_run_start_time") @Temporal(TemporalType.TIMESTAMP) private Date previousRunStartTime; + @SuppressWarnings("unused") @Column(name = "next_run_time") @Temporal(TemporalType.TIMESTAMP) private Date nextRunTime; @@ -44,6 +48,7 @@ public class ScheduledJobDetail extends AbstractPersistable { @Column(name = "trigger_key") private String triggerKey; + @SuppressWarnings("unused") @Column(name = "initializing_errorlog") private String errorLog; @@ -54,7 +59,7 @@ public class ScheduledJobDetail extends AbstractPersistable { } - public ScheduledJobDetail(final String jobName, final String jobDisplayName, final String croneExpression, Date createTime, + public ScheduledJobDetail(final String jobName, final String jobDisplayName, final String croneExpression, final Date createTime, final Short taskPriority, final String groupName, final Date previousRunStartTime, final Date nextRunTime, final String triggKey, final String errorLog, final boolean activeSchedular) { this.jobName = jobName; @@ -94,23 +99,23 @@ public class ScheduledJobDetail extends AbstractPersistable { return this.activeSchedular; } - public void updateCroneExpression(String croneExpression) { + public void updateCroneExpression(final String croneExpression) { this.croneExpression = croneExpression; } - public void updatePreviousRunStartTime(Date previousRunStartTime) { + public void updatePreviousRunStartTime(final Date previousRunStartTime) { this.previousRunStartTime = previousRunStartTime; } - public void updateNextRunTime(Date nextRunTime) { + public void updateNextRunTime(final Date nextRunTime) { this.nextRunTime = nextRunTime; } - public void updateTriggerKey(String triggerKey) { + public void updateTriggerKey(final String triggerKey) { this.triggerKey = triggerKey; } - public void updateErrorLog(String errorLog) { + public void updateErrorLog(final String errorLog) { this.errorLog = errorLog; } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/domain/ScheduledJobRunHistory.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/domain/ScheduledJobRunHistory.java index e7b5255cd..a355ecd4e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/domain/ScheduledJobRunHistory.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/domain/ScheduledJobRunHistory.java @@ -16,30 +16,38 @@ import org.springframework.data.jpa.domain.AbstractPersistable; @Table(name = "job_run_history") public class ScheduledJobRunHistory extends AbstractPersistable { + @SuppressWarnings("unused") @ManyToOne @JoinColumn(name = "job_id") private ScheduledJobDetail scheduledJobDetail; + @SuppressWarnings("unused") @Column(name = "version") private Long version; + @SuppressWarnings("unused") @Column(name = "start_time") @Temporal(TemporalType.TIMESTAMP) private Date startTime; + @SuppressWarnings("unused") @Column(name = "end_time") @Temporal(TemporalType.TIMESTAMP) private Date endTime; + @SuppressWarnings("unused") @Column(name = "status") private String status; + @SuppressWarnings("unused") @Column(name = "error_message") private String errorMessage; + @SuppressWarnings("unused") @Column(name = "trigger_type") private String triggerType; + @SuppressWarnings("unused") @Column(name = "error_log") private String errorLog; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobListener.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobListener.java index 127969e4f..83cec2b70 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobListener.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobListener.java @@ -26,14 +26,14 @@ public class SchedulerJobListener implements JobListener { private int stackTraceLevel = 0; - private String name = SchedularServiceConstants.DEFAULT_LISTENER_NAME; + private final String name = SchedularServiceConstants.DEFAULT_LISTENER_NAME; private final SchedularService schedularService; private final TenantDetailsService tenantDetailsService; @Autowired - public SchedulerJobListener(SchedularService schedularService, TenantDetailsService tenantDetailsService) { + public SchedulerJobListener(final SchedularService schedularService, final TenantDetailsService tenantDetailsService) { this.schedularService = schedularService; this.tenantDetailsService = tenantDetailsService; } @@ -44,19 +44,19 @@ public class SchedulerJobListener implements JobListener { } @Override - public void jobToBeExecuted(JobExecutionContext context) { + public void jobToBeExecuted(final JobExecutionContext context) { String tenantIdentifier = context.getTrigger().getJobDataMap().getString(SchedularServiceConstants.TENANT_IDENTIFIER); MifosPlatformTenant tenant = this.tenantDetailsService.loadTenantById(tenantIdentifier); ThreadLocalContextUtil.setTenant(tenant); } @Override - public void jobExecutionVetoed(JobExecutionContext context) { - + public void jobExecutionVetoed(@SuppressWarnings("unused") final JobExecutionContext context) { + } @Override - public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) { + public void jobWasExecuted(final JobExecutionContext context, final JobExecutionException jobException) { Trigger trigger = context.getTrigger(); TriggerKey key = trigger.getKey(); String triggerKey = key.getName() + SchedularServiceConstants.TRIGGER_KEY_SEPERATOR + key.getGroup(); @@ -98,7 +98,7 @@ public class SchedulerJobListener implements JobListener { } - private Throwable getCauseFromException(Throwable exception) { + private Throwable getCauseFromException(final Throwable exception) { if (stackTraceLevel <= SchedularServiceConstants.STACK_TRACE_LEVEL && exception.getCause() != null && (exception.getCause().toString().contains(SchedularServiceConstants.SCHEDULAR_EXCEPTION) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientData.java index 90a970534..1fc10807d 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientData.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientData.java @@ -53,6 +53,7 @@ final public class ClientData implements Comparable { // template private final Collection officeOptions; private final Collection staffOptions; + @SuppressWarnings("unused") private final Collection closureReasons; public static ClientData template(final Long officeId, final LocalDate joinedDate, final Collection officeOptions,