CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 64 Packages Projects Releases Wiki Activity

Merge pull request #487 from pramodn02/MIFOSX-506_77

Browse Source 
Added cron expression in response object of jobs
This commit is contained in:
Vishwas Babu A J
2013-07-25 22:45:10 -07:00
parent 5b21395bc2 272ff9eba9
commit 7eea89393d
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/api/SchedulerJobApiConstants.java
+2 -2
View File
@@ -27,8 +27,8 @@ public class SchedulerJobApiConstants {
public static final String schedulerStatusParamName = "active";
public static final Set<String> JOB_DETAIL_RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(jobIdentifierParamName,
displayNameParamName, nextRunTimeParamName, initializingErrorParamName, jobActiveStatusParamName, currentlyRunningParamName,
lastRunHistoryObjParamName));
displayNameParamName, nextRunTimeParamName, initializingErrorParamName, cronExpressionParamName, jobActiveStatusParamName,
currentlyRunningParamName, lastRunHistoryObjParamName));
public static final Set<String> JOB_HISTORY_RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(versionParamName,
jobRunStartTimeParamName, jobRunEndTimeParamName, statusParamName, jobRunErrorMessageParamName, triggerTypeParamName,
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/data/JobDetailData.java
+5 -1
View File
@@ -15,6 +15,9 @@ public class JobDetailData {
@SuppressWarnings("unused")
private final String initializingError;
@SuppressWarnings("unused")
private final String cronExpression;
@SuppressWarnings("unused")
private final boolean active;
@@ -26,11 +29,12 @@ public class JobDetailData {
private final JobDetailHistoryData lastRunHistory;
public JobDetailData(final Long jobId, final String displayName, final Date nextRunTime, final String initializingError,
final boolean active, final boolean currentlyRunning, final JobDetailHistoryData lastRunHistory) {
final String cronExpression,final boolean active, final boolean currentlyRunning, final JobDetailHistoryData lastRunHistory) {
this.jobId = jobId;
this.displayName = displayName;
this.nextRunTime = nextRunTime;
this.initializingError = initializingError;
this.cronExpression = cronExpression;
this.active = active;
this.lastRunHistory = lastRunHistory;
this.currentlyRunning = currentlyRunning;
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java
+4 -3
View File
@@ -103,7 +103,7 @@ public class SchedulerJobRunnerReadServiceImpl implements SchedulerJobRunnerRead
private static final class JobDetailMapper implements RowMapper<JobDetailData> {
private StringBuilder sqlBuilder = new StringBuilder("select")
.append(" job.id,job.display_name as displayName,job.next_run_time as nextRunTime,job.initializing_errorlog as initializingError,job.is_active as active,job.currently_running as currentlyRunning,")
.append(" job.id,job.display_name as displayName,job.next_run_time as nextRunTime,job.initializing_errorlog as initializingError,job.cron_expression as cronExpression,job.is_active as active,job.currently_running as currentlyRunning,")
.append(" runHistory.version,runHistory.start_time as lastRunStartTime,runHistory.end_time as lastRunEndTime,runHistory.`status`,runHistory.error_message as jobRunErrorMessage,runHistory.trigger_type as triggerType,runHistory.error_log as jobRunErrorLog ")
.append(" from job job left join job_run_history runHistory ON job.id=runHistory.job_id and job.previous_run_start_time=runHistory.start_time ");
@@ -117,6 +117,7 @@ public class SchedulerJobRunnerReadServiceImpl implements SchedulerJobRunnerRead
String displayName = rs.getString("displayName");
Date nextRunTime = rs.getTimestamp("nextRunTime");
String initializingError = rs.getString("initializingError");
String cronExpression = rs.getString("cronExpression");
boolean active = rs.getBoolean("active");
boolean currentlyRunning = rs.getBoolean("currentlyRunning");
@@ -133,8 +134,8 @@ public class SchedulerJobRunnerReadServiceImpl implements SchedulerJobRunnerRead
lastRunHistory = new JobDetailHistoryData(version, jobRunStartTime, jobRunEndTime, status, jobRunErrorMessage, triggerType,
jobRunErrorLog);
}
JobDetailData jobDetail = new JobDetailData(id, displayName, nextRunTime, initializingError, active, currentlyRunning,
lastRunHistory);
JobDetailData jobDetail = new JobDetailData(id, displayName, nextRunTime, initializingError, cronExpression, active,
currentlyRunning, lastRunHistory);
return jobDetail;
}