From bfd8b92cfdcc2eb0f5f518a9dc8e4e828992759e Mon Sep 17 00:00:00 2001 From: evan-miller-jumpmind <70151986+evan-miller-jumpmind@users.noreply.github.com> Date: Thu, 11 Aug 2022 16:18:27 -0400 Subject: [PATCH] 0005399: Adjusted JobManager.loadJobs() --- .../main/java/org/jumpmind/symmetric/job/JobManager.java | 8 ++++---- .../main/java/org/jumpmind/symmetric/job/IJobManager.java | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManager.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManager.java index 65ad05b4b8..c33d154ebe 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManager.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/JobManager.java @@ -60,11 +60,11 @@ public JobManager(ISymmetricEngine engine) { @Override public void init() { this.stopJobs(); - List jobDefitions = loadJobs(engine); + List jobDefinitions = loadCustomJobs(); BuiltInJobs builtInJobs = new BuiltInJobs(); - jobDefitions = builtInJobs.syncBuiltInJobs(jobDefitions, engine, taskScheduler); // TODO save built in jobs + jobDefinitions = builtInJobs.syncBuiltInJobs(jobDefinitions, engine, taskScheduler); // TODO save built in jobs this.jobs = new ArrayList(); - for (JobDefinition jobDefinition : jobDefitions) { + for (JobDefinition jobDefinition : jobDefinitions) { IJob job = jobCreator.createJob(jobDefinition, engine, taskScheduler); if (job != null) { jobs.add(job); @@ -72,7 +72,7 @@ public void init() { } } - protected List loadJobs(ISymmetricEngine engine) { + public List loadCustomJobs() { return sqlTemplate.query(getSql("loadCustomJobs"), new JobMapper()); } diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/job/IJobManager.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/job/IJobManager.java index 3bb0e843d3..e9fcf9987a 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/job/IJobManager.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/job/IJobManager.java @@ -37,6 +37,8 @@ public interface IJobManager { public void destroy(); + public List loadCustomJobs(); + public List getJobs(); public IJob getJob(String name);