From e06776464042c557f2a66cbca874507e2be521a8 Mon Sep 17 00:00:00 2001 From: Adam Young Date: Fri, 18 Nov 2011 14:02:21 -0500 Subject: typesafety cron and jobscheduler --- .../com/netscape/certsrv/jobs/IJobsScheduler.java | 4 +-- .../src/com/netscape/cmscore/jobs/CronItem.java | 4 +-- .../src/com/netscape/cmscore/jobs/JobCron.java | 6 ++-- .../com/netscape/cmscore/jobs/JobsScheduler.java | 32 +++++++++++----------- 4 files changed, 23 insertions(+), 23 deletions(-) (limited to 'pki/base/common') diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java b/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java index fefa8cc95..844250dee 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java @@ -99,13 +99,13 @@ public interface IJobsScheduler extends ISubsystem { * Retrieves all the job implementations. * @return a Hashtable of available job plugin implementations */ - public Hashtable getPlugins(); + public Hashtable getPlugins(); /** * Retrieves all the job instances. * @return a Hashtable of job instances */ - public Hashtable getInstances(); + public Hashtable getInstances(); /** * Retrieves the configuration parameters of the given diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java index fda9069b3..4b248954f 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java @@ -48,7 +48,7 @@ public class CronItem { // store all elements in a field. // elements can either be numbers or ranges (CronRange) - protected Vector mElements = new Vector(); + protected Vector mElements = new Vector(); public CronItem(int min, int max) { mMin = min; @@ -151,7 +151,7 @@ public class CronItem { * represented as CronRange * @return a vector of CronRanges */ - public Vector getElements() { + public Vector getElements() { return mElements; } diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java index 13ef7f256..8272c4484 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java @@ -209,10 +209,10 @@ public class JobCron implements IJobCron { * @return boolean (true/false) on whether the element is one of * the elements in the item */ - boolean isElement(int element, Vector item) { + boolean isElement(int element, Vector item) { // loop through all of the elements of an item - for (Enumeration e = item.elements(); e.hasMoreElements();) { - CronRange cElement = (CronRange) e.nextElement(); + for (Enumeration e = item.elements(); e.hasMoreElements();) { + CronRange cElement = e.nextElement(); // is a number if (cElement.getBegin() == cElement.getEnd()) { diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java index 5d1d3668c..ad6cf898d 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java @@ -69,9 +69,9 @@ public class JobsScheduler implements Runnable, IJobsScheduler { protected String mId = ID; protected Thread mScheduleThread = null; - public Hashtable mJobPlugins = new Hashtable(); - public Hashtable mJobs = new Hashtable(); - private Hashtable mJobThreads = new Hashtable(); + public Hashtable mJobPlugins = new Hashtable(); + public Hashtable mJobs = new Hashtable(); + private Hashtable mJobThreads = new Hashtable(); private IConfigStore mConfig = null; private ILogger mLogger = null; @@ -122,7 +122,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { setInterval(i); IConfigStore c = mConfig.getSubStore(PROP_IMPL); - Enumeration mImpls = c.getSubStoreNames(); + Enumeration mImpls = c.getSubStoreNames(); // register all job plugins while (mImpls.hasMoreElements()) { @@ -136,7 +136,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { // register all jobs c = config.getSubStore(PROP_JOB); - Enumeration jobs = c.getSubStoreNames(); + Enumeration jobs = c.getSubStoreNames(); while (jobs.hasMoreElements()) { String jobName = (String) jobs.nextElement(); @@ -196,11 +196,11 @@ public class JobsScheduler implements Runnable, IJobsScheduler { } } - public Hashtable getPlugins() { + public Hashtable getPlugins() { return mJobPlugins; } - public Hashtable getInstances() { + public Hashtable getInstances() { return mJobs; } @@ -278,8 +278,8 @@ public class JobsScheduler implements Runnable, IJobsScheduler { IJob job = null; - for (Enumeration e = mJobs.elements(); e.hasMoreElements();) { - job = (IJob) e.nextElement(); + for (Enumeration e = mJobs.elements(); e.hasMoreElements();) { + job = e.nextElement(); // is it enabled? IConfigStore cs = job.getConfigStore(); @@ -337,7 +337,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { /** * is it the right month? */ - Vector moy = + Vector moy = jcron.getItem(JobCron.CRON_MONTH_OF_YEAR).getElements(); int cronMoy = jcron.MOY_cal2cron(now); @@ -350,8 +350,8 @@ public class JobsScheduler implements Runnable, IJobsScheduler { /** * is it the right date? */ - Vector dow = jcron.getItem(JobCron.CRON_DAY_OF_WEEK).getElements(); - Vector dom = jcron.getItem(JobCron.CRON_DAY_OF_MONTH).getElements(); + Vector dow = jcron.getItem(JobCron.CRON_DAY_OF_WEEK).getElements(); + Vector dom = jcron.getItem(JobCron.CRON_DAY_OF_MONTH).getElements(); // can't be both empty if ((dow.isEmpty()) && dom.isEmpty()) { @@ -369,7 +369,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { /** * is it the right hour? */ - Vector hour = jcron.getItem(JobCron.CRON_HOUR).getElements(); + Vector hour = jcron.getItem(JobCron.CRON_HOUR).getElements(); if (jcron.isElement(now.get(Calendar.HOUR_OF_DAY), hour) == false) { return false; @@ -379,7 +379,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { /** * is it the right minute? */ - Vector minute = jcron.getItem(JobCron.CRON_MINUTE).getElements(); + Vector minute = jcron.getItem(JobCron.CRON_MINUTE).getElements(); if (jcron.isElement(now.get(Calendar.MINUTE), minute) == false) { return false; @@ -436,7 +436,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { mJobs.clear(); mJobs = null; - Enumeration enums = mJobThreads.keys(); + Enumeration enums = mJobThreads.keys(); while (enums.hasMoreElements()) { String id = (String)enums.nextElement(); Thread currthread = (Thread)mJobThreads.get(id); @@ -537,7 +537,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { level, msg); } - public Hashtable getJobPlugins() { + public Hashtable getJobPlugins() { return mJobPlugins; } } -- cgit