diff --git a/examples/src/main/java/org/quartz/examples/example9/Job1Listener.java b/examples/src/main/java/org/quartz/examples/example9/Job1Listener.java index 9cb5f0265..a830f1d41 100644 --- a/examples/src/main/java/org/quartz/examples/example9/Job1Listener.java +++ b/examples/src/main/java/org/quartz/examples/example9/Job1Listener.java @@ -35,22 +35,22 @@ */ public class Job1Listener implements JobListener { - private static Logger _log = LoggerFactory.getLogger(Job1Listener.class); + private static final Logger LOG = LoggerFactory.getLogger(Job1Listener.class); public String getName() { return "job1_to_job2"; } public void jobToBeExecuted(JobExecutionContext inContext) { - _log.info("Job1Listener says: Job Is about to be executed."); + LOG.info("Job1Listener says: Job Is about to be executed."); } public void jobExecutionVetoed(JobExecutionContext inContext) { - _log.info("Job1Listener says: Job Execution was vetoed."); + LOG.info("Job1Listener says: Job Execution was vetoed."); } public void jobWasExecuted(JobExecutionContext inContext, JobExecutionException inException) { - _log.info("Job1Listener says: Job was executed."); + LOG.info("Job1Listener says: Job was executed."); // Simple job #2 JobDetail job2 = newJob(SimpleJob2.class).withIdentity("job2").build(); @@ -61,7 +61,7 @@ public void jobWasExecuted(JobExecutionContext inContext, JobExecutionException // schedule the job to run! inContext.getScheduler().scheduleJob(job2, trigger); } catch (SchedulerException e) { - _log.warn("Unable to schedule job2!"); + LOG.warn("Unable to schedule job2!"); e.printStackTrace(); } diff --git a/quartz-jobs/src/test/java/org/quartz/jobs/MyJobListener.java b/quartz-jobs/src/test/java/org/quartz/jobs/MyJobListener.java index d727238b9..7bf26318b 100644 --- a/quartz-jobs/src/test/java/org/quartz/jobs/MyJobListener.java +++ b/quartz-jobs/src/test/java/org/quartz/jobs/MyJobListener.java @@ -16,16 +16,6 @@ public String getName() { return "MyJobListener"; } - @Override - public void jobToBeExecuted(JobExecutionContext context) { - // - } - - @Override - public void jobExecutionVetoed(JobExecutionContext context) { - // - } - @Override public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) { diff --git a/quartz-stubs/src/main/java/org/quartz/jobs/DirectoryScanListener.java b/quartz-stubs/src/main/java/org/quartz/jobs/DirectoryScanListener.java index 91a167ea3..e5644a4b0 100644 --- a/quartz-stubs/src/main/java/org/quartz/jobs/DirectoryScanListener.java +++ b/quartz-stubs/src/main/java/org/quartz/jobs/DirectoryScanListener.java @@ -35,5 +35,5 @@ public interface DirectoryScanListener { * @param updatedFiles The set of files that were updated/added since the * last scan of the directory */ - void filesUpdatedOrAdded(File[] updatedFiles); + default void filesUpdatedOrAdded(File[] updatedFiles){} } diff --git a/quartz-stubs/src/main/java/org/quartz/jobs/FileScanListener.java b/quartz-stubs/src/main/java/org/quartz/jobs/FileScanListener.java index 3d9477528..b7c1d1c11 100644 --- a/quartz-stubs/src/main/java/org/quartz/jobs/FileScanListener.java +++ b/quartz-stubs/src/main/java/org/quartz/jobs/FileScanListener.java @@ -26,5 +26,5 @@ */ public interface FileScanListener { - void fileUpdated(String fileName); + default void fileUpdated(String fileName){} } diff --git a/quartz/src/main/java/org/quartz/InterruptableJob.java b/quartz/src/main/java/org/quartz/InterruptableJob.java index 70b3bad77..958d501f2 100644 --- a/quartz/src/main/java/org/quartz/InterruptableJob.java +++ b/quartz/src/main/java/org/quartz/InterruptableJob.java @@ -70,15 +70,6 @@ * @author James House */ public interface InterruptableJob extends Job { - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** *

* Called by the {@link Scheduler} when a user diff --git a/quartz/src/main/java/org/quartz/Job.java b/quartz/src/main/java/org/quartz/Job.java index 1e2ad76de..8c483acf8 100644 --- a/quartz/src/main/java/org/quartz/Job.java +++ b/quartz/src/main/java/org/quartz/Job.java @@ -46,15 +46,6 @@ * @author James House */ public interface Job { - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** *

* Called by the {@link Scheduler} when a {@link Trigger} diff --git a/quartz/src/main/java/org/quartz/JobListener.java b/quartz/src/main/java/org/quartz/JobListener.java index 443c04367..ef04a888d 100644 --- a/quartz/src/main/java/org/quartz/JobListener.java +++ b/quartz/src/main/java/org/quartz/JobListener.java @@ -35,15 +35,6 @@ * @author James House */ public interface JobListener { - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** *

* Get the name of the JobListener. @@ -65,7 +56,7 @@ public interface JobListener { * * @see #jobExecutionVetoed(JobExecutionContext) */ - void jobToBeExecuted(JobExecutionContext context); + default void jobToBeExecuted(JobExecutionContext context){} /** *

@@ -77,7 +68,7 @@ public interface JobListener { * * @see #jobToBeExecuted(JobExecutionContext) */ - void jobExecutionVetoed(JobExecutionContext context); + default void jobExecutionVetoed(JobExecutionContext context){} /** @@ -87,7 +78,7 @@ public interface JobListener { * triggered(xx) method has been called. *

*/ - void jobWasExecuted(JobExecutionContext context, - JobExecutionException jobException); + default void jobWasExecuted(JobExecutionContext context, + JobExecutionException jobException){} } diff --git a/quartz/src/main/java/org/quartz/SchedulerListener.java b/quartz/src/main/java/org/quartz/SchedulerListener.java index 25133d933..548e8bd9c 100644 --- a/quartz/src/main/java/org/quartz/SchedulerListener.java +++ b/quartz/src/main/java/org/quartz/SchedulerListener.java @@ -30,22 +30,13 @@ * @author James House */ public interface SchedulerListener { - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** *

* Called by the {@link Scheduler} when a {@link org.quartz.JobDetail} * is scheduled. *

*/ - void jobScheduled(Trigger trigger); + default void jobScheduled(Trigger trigger){} /** *

@@ -55,7 +46,7 @@ public interface SchedulerListener { * * @see SchedulerListener#schedulingDataCleared() */ - void jobUnscheduled(TriggerKey triggerKey); + default void jobUnscheduled(TriggerKey triggerKey){} /** *

@@ -63,7 +54,7 @@ public interface SchedulerListener { * has reached the condition in which it will never fire again. *

*/ - void triggerFinalized(Trigger trigger); + default void triggerFinalized(Trigger trigger){} /** *

@@ -71,7 +62,7 @@ public interface SchedulerListener { * has been paused. *

*/ - void triggerPaused(TriggerKey triggerKey); + default void triggerPaused(TriggerKey triggerKey){} /** *

@@ -83,7 +74,7 @@ public interface SchedulerListener { * * @param triggerGroup the paused group, or null if all were paused */ - void triggersPaused(String triggerGroup); + default void triggersPaused(String triggerGroup){} /** *

@@ -91,7 +82,7 @@ public interface SchedulerListener { * has been un-paused. *

*/ - void triggerResumed(TriggerKey triggerKey); + default void triggerResumed(TriggerKey triggerKey){} /** *

@@ -99,7 +90,7 @@ public interface SchedulerListener { * group of {@link Trigger}s has been un-paused. *

*/ - void triggersResumed(String triggerGroup); + default void triggersResumed(String triggerGroup){} /** *

@@ -107,7 +98,7 @@ public interface SchedulerListener { * has been added. *

*/ - void jobAdded(JobDetail jobDetail); + default void jobAdded(JobDetail jobDetail){} /** *

@@ -115,7 +106,7 @@ public interface SchedulerListener { * has been deleted. *

*/ - void jobDeleted(JobKey jobKey); + default void jobDeleted(JobKey jobKey){} /** *

@@ -123,7 +114,7 @@ public interface SchedulerListener { * has been paused. *

*/ - void jobPaused(JobKey jobKey); + default void jobPaused(JobKey jobKey){} /** *

@@ -133,7 +124,7 @@ public interface SchedulerListener { * * @param jobGroup the paused group, or null if all were paused */ - void jobsPaused(String jobGroup); + default void jobsPaused(String jobGroup){} /** *

@@ -141,7 +132,7 @@ public interface SchedulerListener { * has been un-paused. *

*/ - void jobResumed(JobKey jobKey); + default void jobResumed(JobKey jobKey){} /** *

@@ -149,7 +140,7 @@ public interface SchedulerListener { * group of {@link org.quartz.JobDetail}s has been un-paused. *

*/ - void jobsResumed(String jobGroup); + default void jobsResumed(String jobGroup){} /** *

@@ -165,7 +156,7 @@ public interface SchedulerListener { * error that was encountered. *

*/ - void schedulerError(String msg, SchedulerException cause); + default void schedulerError(String msg, SchedulerException cause){} /** *

@@ -173,7 +164,7 @@ public interface SchedulerListener { * that it has move to standby mode. *

*/ - void schedulerInStandbyMode(); + default void schedulerInStandbyMode(){} /** *

@@ -181,15 +172,29 @@ public interface SchedulerListener { * that it has started. *

*/ - void schedulerStarted(); - + default void schedulerStarted() {} + + /** + *

+ * Called by the {@link Scheduler} to inform the listener + * that it has paused. + *

+ */ + default void schedulerPaused(){} + + /** + * Called by the {@link Scheduler} to inform the listener that + * the scheduler has resumed after being paused. + */ + default void schedulerResumed(){} + /** *

* Called by the {@link Scheduler} to inform the listener * that it is starting. *

*/ - void schedulerStarting(); + default void schedulerStarting(){} /** *

@@ -197,7 +202,7 @@ public interface SchedulerListener { * that it has shutdown. *

*/ - void schedulerShutdown(); + default void schedulerShutdown(){} /** *

@@ -205,11 +210,11 @@ public interface SchedulerListener { * that it has begun the shutdown sequence. *

*/ - void schedulerShuttingdown(); + default void schedulerShuttingdown(){} /** * Called by the {@link Scheduler} to inform the listener * that all jobs, triggers and calendars were deleted. */ - void schedulingDataCleared(); + default void schedulingDataCleared(){} } diff --git a/quartz/src/main/java/org/quartz/TriggerListener.java b/quartz/src/main/java/org/quartz/TriggerListener.java index 933045266..f181f24fc 100644 --- a/quartz/src/main/java/org/quartz/TriggerListener.java +++ b/quartz/src/main/java/org/quartz/TriggerListener.java @@ -35,15 +35,6 @@ * @author James House */ public interface TriggerListener { - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** *

* Get the name of the TriggerListener. @@ -69,7 +60,7 @@ public interface TriggerListener { * The JobExecutionContext that will be passed to * the Job'sexecute(xx) method. */ - void triggerFired(Trigger trigger, JobExecutionContext context); + default void triggerFired(Trigger trigger, JobExecutionContext context){} /** *

@@ -90,7 +81,7 @@ public interface TriggerListener { * The JobExecutionContext that will be passed to * the Job'sexecute(xx) method. */ - boolean vetoJobExecution(Trigger trigger, JobExecutionContext context); + default boolean vetoJobExecution(Trigger trigger, JobExecutionContext context){return false;} /** @@ -109,7 +100,7 @@ public interface TriggerListener { * @param trigger * The Trigger that has misfired. */ - void triggerMisfired(Trigger trigger); + default void triggerMisfired(Trigger trigger){} /** *

@@ -128,7 +119,7 @@ public interface TriggerListener { * the result of the call on the Trigger'striggered(xx) * method. */ - void triggerComplete(Trigger trigger, JobExecutionContext context, - CompletedExecutionInstruction triggerInstructionCode); + default void triggerComplete(Trigger trigger, JobExecutionContext context, + CompletedExecutionInstruction triggerInstructionCode){} } diff --git a/quartz/src/main/java/org/quartz/core/JobRunShell.java b/quartz/src/main/java/org/quartz/core/JobRunShell.java index dba11da4a..372dea1da 100644 --- a/quartz/src/main/java/org/quartz/core/JobRunShell.java +++ b/quartz/src/main/java/org/quartz/core/JobRunShell.java @@ -19,15 +19,9 @@ package org.quartz.core; -import org.quartz.Job; -import org.quartz.JobDetail; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; +import org.quartz.*; import org.quartz.Trigger.CompletedExecutionInstruction; import org.quartz.impl.JobExecutionContextImpl; -import org.quartz.listeners.SchedulerListenerSupport; import org.quartz.spi.OperableTrigger; import org.quartz.spi.TriggerFiredBundle; import org.slf4j.Logger; @@ -56,7 +50,8 @@ * * @author James House */ -public class JobRunShell extends SchedulerListenerSupport implements Runnable { +public class JobRunShell implements Runnable, SchedulerListener { + private static final Logger log = LoggerFactory.getLogger(JobRunShell.class); /* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * @@ -75,8 +70,6 @@ public class JobRunShell extends SchedulerListenerSupport implements Runnable { protected volatile boolean shutdownRequested = false; - private final Logger log = LoggerFactory.getLogger(getClass()); - /* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * @@ -112,11 +105,6 @@ public void schedulerShuttingdown() { requestShutdown(); } - @Override - protected Logger getLog() { - return log; - } - public void initialize(QuartzScheduler sched) throws SchedulerException { this.qs = sched; @@ -205,10 +193,10 @@ public void run() { } catch (JobExecutionException jee) { endTime = System.currentTimeMillis(); jobExEx = jee; - getLog().info("Job {} threw a JobExecutionException: ", jobDetail.getKey(), jobExEx); + log.info("Job {} threw a JobExecutionException: ", jobDetail.getKey(), jobExEx); } catch (Throwable e) { endTime = System.currentTimeMillis(); - getLog().error("Job {} threw an unhandled Exception: ", jobDetail.getKey(), e); + log.error("Job {} threw an unhandled Exception: ", jobDetail.getKey(), e); SchedulerException se = new JobExecutionProcessException(jec, e); qs.notifySchedulerListenersError("Job " + jec.getJobDetail().getKey() diff --git a/quartz/src/main/java/org/quartz/core/QuartzScheduler.java b/quartz/src/main/java/org/quartz/core/QuartzScheduler.java index ca52753f9..75d6afedc 100644 --- a/quartz/src/main/java/org/quartz/core/QuartzScheduler.java +++ b/quartz/src/main/java/org/quartz/core/QuartzScheduler.java @@ -68,7 +68,6 @@ import org.quartz.core.jmx.QuartzSchedulerMBean; import org.quartz.impl.SchedulerRepository; import org.quartz.impl.matchers.GroupMatcher; -import org.quartz.listeners.SchedulerListenerSupport; import org.quartz.simpl.PropertySettingJobFactory; import org.quartz.spi.JobFactory; import org.quartz.spi.OperableTrigger; @@ -2351,13 +2350,12 @@ private void startPlugins() { // ///////////////////////////////////////////////////////////////////////////// -class ErrorLogger extends SchedulerListenerSupport { - ErrorLogger() { - } - +class ErrorLogger implements SchedulerListener { + private final Logger log = LoggerFactory.getLogger(ErrorLogger.class); + @Override public void schedulerError(String msg, SchedulerException cause) { - getLog().error(msg, cause); + log.error(msg, cause); } } @@ -2373,9 +2371,6 @@ class ExecutingJobsManager implements JobListener { final AtomicInteger numJobsFired = new AtomicInteger(0); - ExecutingJobsManager() { - } - public String getName() { return getClass().getName(); } @@ -2412,8 +2407,4 @@ public List getExecutingJobs() { executingJobs.values())); } } - - public void jobExecutionVetoed(JobExecutionContext context) { - - } } diff --git a/quartz/src/main/java/org/quartz/core/SampledStatisticsImpl.java b/quartz/src/main/java/org/quartz/core/SampledStatisticsImpl.java index 1eaace886..b01f97e1e 100644 --- a/quartz/src/main/java/org/quartz/core/SampledStatisticsImpl.java +++ b/quartz/src/main/java/org/quartz/core/SampledStatisticsImpl.java @@ -2,13 +2,11 @@ import java.util.Timer; -import org.quartz.JobDetail; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.quartz.JobListener; import org.quartz.SchedulerListener; import org.quartz.Trigger; -import org.quartz.listeners.SchedulerListenerSupport; import org.quartz.utils.counter.CounterConfig; import org.quartz.utils.counter.CounterManager; import org.quartz.utils.counter.CounterManagerImpl; @@ -16,18 +14,15 @@ import org.quartz.utils.counter.sampled.SampledCounterConfig; import org.quartz.utils.counter.sampled.SampledRateCounterConfig; -public class SampledStatisticsImpl extends SchedulerListenerSupport implements SampledStatistics, JobListener, SchedulerListener { - @SuppressWarnings("unused") - private final QuartzScheduler scheduler; - +public class SampledStatisticsImpl implements SampledStatistics, JobListener, SchedulerListener { private static final String NAME = "QuartzSampledStatistics"; private static final int DEFAULT_HISTORY_SIZE = 30; private static final int DEFAULT_INTERVAL_SECS = 1; - private final static SampledCounterConfig DEFAULT_SAMPLED_COUNTER_CONFIG = new SampledCounterConfig(DEFAULT_INTERVAL_SECS, + private static final SampledCounterConfig DEFAULT_SAMPLED_COUNTER_CONFIG = new SampledCounterConfig(DEFAULT_INTERVAL_SECS, DEFAULT_HISTORY_SIZE, true, 0L); @SuppressWarnings("unused") - private final static SampledRateCounterConfig DEFAULT_SAMPLED_RATE_COUNTER_CONFIG = new SampledRateCounterConfig(DEFAULT_INTERVAL_SECS, + private static final SampledRateCounterConfig DEFAULT_SAMPLED_RATE_COUNTER_CONFIG = new SampledRateCounterConfig(DEFAULT_INTERVAL_SECS, DEFAULT_HISTORY_SIZE, true); private final CounterManager counterManager; @@ -36,8 +31,6 @@ public class SampledStatisticsImpl extends SchedulerListenerSupport implements S private final SampledCounter jobsCompletedCount; SampledStatisticsImpl(QuartzScheduler scheduler) { - this.scheduler = scheduler; - counterManager = new CounterManagerImpl(new Timer(NAME+"Timer")); jobsScheduledCount = createSampledCounter(DEFAULT_SAMPLED_COUNTER_CONFIG); jobsExecutingCount = createSampledCounter(DEFAULT_SAMPLED_COUNTER_CONFIG); @@ -84,10 +77,6 @@ public String getName() { public void jobScheduled(Trigger trigger) { jobsScheduledCount.increment(); } - - public void jobExecutionVetoed(JobExecutionContext context) { - /**/ - } public void jobToBeExecuted(JobExecutionContext context) { jobsExecutingCount.increment(); @@ -97,13 +86,4 @@ public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) { jobsCompletedCount.increment(); } - - @Override - public void jobAdded(JobDetail jobDetail) { - /**/ - } - - public void jobDeleted(String jobName, String groupName) { - /**/ - } } diff --git a/quartz/src/main/java/org/quartz/ee/jta/JTAJobRunShell.java b/quartz/src/main/java/org/quartz/ee/jta/JTAJobRunShell.java index 6696ec418..58380f1d2 100644 --- a/quartz/src/main/java/org/quartz/ee/jta/JTAJobRunShell.java +++ b/quartz/src/main/java/org/quartz/ee/jta/JTAJobRunShell.java @@ -27,6 +27,8 @@ import org.quartz.SchedulerException; import org.quartz.core.JobRunShell; import org.quartz.spi.TriggerFiredBundle; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -40,7 +42,7 @@ * @author James House */ public class JTAJobRunShell extends JobRunShell { - + private final Logger log = LoggerFactory.getLogger(JTAJobRunShell.class); /* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * @@ -98,13 +100,13 @@ protected void begin() throws SchedulerException { boolean beganSuccessfully = false; try { - getLog().debug("Looking up UserTransaction."); + log.debug("Looking up UserTransaction."); ut = UserTransactionHelper.lookupUserTransaction(); if (transactionTimeout != null) { ut.setTransactionTimeout(transactionTimeout); } - getLog().debug("Beginning UserTransaction."); + log.debug("Beginning UserTransaction."); ut.begin(); beganSuccessfully = true; @@ -131,7 +133,7 @@ protected void complete(boolean successfulExecution) try { try { if (ut.getStatus() == Status.STATUS_MARKED_ROLLBACK) { - getLog().debug("UserTransaction marked for rollback only."); + log.debug("UserTransaction marked for rollback only."); successfulExecution = false; } } catch (SystemException e) { @@ -141,7 +143,7 @@ protected void complete(boolean successfulExecution) if (successfulExecution) { try { - getLog().debug("Committing UserTransaction."); + log.debug("Committing UserTransaction."); ut.commit(); } catch (Exception nse) { throw new SchedulerException( @@ -149,7 +151,7 @@ protected void complete(boolean successfulExecution) } } else { try { - getLog().debug("Rolling-back UserTransaction."); + log.debug("Rolling-back UserTransaction."); ut.rollback(); } catch (Exception nse) { throw new SchedulerException( diff --git a/quartz/src/main/java/org/quartz/impl/QuartzServer.java b/quartz/src/main/java/org/quartz/impl/QuartzServer.java index 2781383e8..271a85aa5 100644 --- a/quartz/src/main/java/org/quartz/impl/QuartzServer.java +++ b/quartz/src/main/java/org/quartz/impl/QuartzServer.java @@ -24,7 +24,7 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.SchedulerFactory; -import org.quartz.listeners.SchedulerListenerSupport; +import org.quartz.SchedulerListener; /** *

@@ -53,37 +53,12 @@ * * @author James House */ -public class QuartzServer extends SchedulerListenerSupport { - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Data members. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - +public class QuartzServer implements SchedulerListener { private Scheduler sched = null; - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Constructors. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - QuartzServer() { } - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - public void serve(SchedulerFactory schedFact, boolean console) throws Exception { sched = schedFact.getScheduler(); @@ -121,14 +96,6 @@ public void serve(SchedulerFactory schedFact, boolean console) } } - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * SchedulerListener Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** *

* Called by the {@link Scheduler} when a serious error has @@ -161,20 +128,7 @@ public void schedulerShutdown() { sched = null; } - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Main Method. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - public static void main(String[] args) throws Exception { - - // //Configure Log4J - // org.apache.log4j.PropertyConfigurator.configure( - // System.getProperty("log4jConfigFile", "log4j.properties")); - if (System.getSecurityManager() == null) { System.setSecurityManager(new java.rmi.RMISecurityManager()); } @@ -193,5 +147,4 @@ public static void main(String[] args) throws Exception { e.printStackTrace(); } } - } diff --git a/quartz/src/main/java/org/quartz/listeners/JobChainingJobListener.java b/quartz/src/main/java/org/quartz/listeners/JobChainingJobListener.java index 0a9cf4963..f79c136f6 100644 --- a/quartz/src/main/java/org/quartz/listeners/JobChainingJobListener.java +++ b/quartz/src/main/java/org/quartz/listeners/JobChainingJobListener.java @@ -19,10 +19,9 @@ import java.util.HashMap; import java.util.Map; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.quartz.JobKey; -import org.quartz.SchedulerException; +import org.quartz.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Keeps a collection of mappings of which Job to trigger after the completion @@ -42,8 +41,8 @@ * * @author James House (jhouse AT revolition DOT net) */ -public class JobChainingJobListener extends JobListenerSupport { - +public class JobChainingJobListener implements JobListener { + private static final Logger LOG = LoggerFactory.getLogger(JobChainingJobListener.class); private final String name; private final Map chainLinks; @@ -94,12 +93,12 @@ public void jobWasExecuted(JobExecutionContext context, JobExecutionException jo return; } - getLog().info("Job '{}' will now chain to Job '{}'", context.getJobDetail().getKey(), sj); + LOG.info("Job '{}' will now chain to Job '{}'", context.getJobDetail().getKey(), sj); try { - context.getScheduler().triggerJob(sj); + context.getScheduler().triggerJob(sj); } catch(SchedulerException se) { - getLog().error("Error encountered during chaining to Job '{}'", sj, se); + LOG.error("Error encountered during chaining to Job '{}'", sj, se); } } } diff --git a/quartz/src/main/java/org/quartz/listeners/JobListenerSupport.java b/quartz/src/main/java/org/quartz/listeners/JobListenerSupport.java index c8d3c4d2e..048f9a664 100644 --- a/quartz/src/main/java/org/quartz/listeners/JobListenerSupport.java +++ b/quartz/src/main/java/org/quartz/listeners/JobListenerSupport.java @@ -39,6 +39,7 @@ * * @see org.quartz.JobListener */ +@Deprecated public abstract class JobListenerSupport implements JobListener { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -49,13 +50,4 @@ public abstract class JobListenerSupport implements JobListener { protected Logger getLog() { return log; } - - public void jobToBeExecuted(JobExecutionContext context) { - } - - public void jobExecutionVetoed(JobExecutionContext context) { - } - - public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) { - } } diff --git a/quartz/src/main/java/org/quartz/listeners/SchedulerListenerSupport.java b/quartz/src/main/java/org/quartz/listeners/SchedulerListenerSupport.java index 8d67e102d..d9d853055 100644 --- a/quartz/src/main/java/org/quartz/listeners/SchedulerListenerSupport.java +++ b/quartz/src/main/java/org/quartz/listeners/SchedulerListenerSupport.java @@ -37,6 +37,7 @@ * * @see org.quartz.SchedulerListener */ +@Deprecated public abstract class SchedulerListenerSupport implements SchedulerListener { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -47,65 +48,4 @@ public abstract class SchedulerListenerSupport implements SchedulerListener { protected Logger getLog() { return log; } - - public void jobAdded(JobDetail jobDetail) { - } - - public void jobDeleted(JobKey jobKey) { - } - - public void jobPaused(JobKey jobKey) { - } - - public void jobResumed(JobKey jobKey) { - } - - public void jobScheduled(Trigger trigger) { - } - - public void jobsPaused(String jobGroup) { - } - - public void jobsResumed(String jobGroup) { - } - - public void jobUnscheduled(TriggerKey triggerKey) { - } - - public void schedulerError(String msg, SchedulerException cause) { - } - - public void schedulerInStandbyMode() { - } - - public void schedulerShutdown() { - } - - public void schedulerShuttingdown() { - } - - public void schedulerStarted() { - } - - public void schedulerStarting() { - } - - public void triggerFinalized(Trigger trigger) { - } - - public void triggerPaused(TriggerKey triggerKey) { - } - - public void triggerResumed(TriggerKey triggerKey) { - } - - public void triggersPaused(String triggerGroup) { - } - - public void triggersResumed(String triggerGroup) { - } - - public void schedulingDataCleared() { - } - } diff --git a/quartz/src/main/java/org/quartz/listeners/TriggerListenerSupport.java b/quartz/src/main/java/org/quartz/listeners/TriggerListenerSupport.java index 6354e3271..80f94a483 100644 --- a/quartz/src/main/java/org/quartz/listeners/TriggerListenerSupport.java +++ b/quartz/src/main/java/org/quartz/listeners/TriggerListenerSupport.java @@ -40,6 +40,7 @@ * * @see org.quartz.TriggerListener */ +@Deprecated public abstract class TriggerListenerSupport implements TriggerListener { private final Logger log = LoggerFactory.getLogger(getClass()); @@ -50,20 +51,4 @@ public abstract class TriggerListenerSupport implements TriggerListener { protected Logger getLog() { return log; } - - public void triggerFired(Trigger trigger, JobExecutionContext context) { - } - - public boolean vetoJobExecution(Trigger trigger, JobExecutionContext context) { - return false; - } - - public void triggerMisfired(Trigger trigger) { - } - - public void triggerComplete( - Trigger trigger, - JobExecutionContext context, - CompletedExecutionInstruction triggerInstructionCode) { - } } diff --git a/quartz/src/main/java/org/quartz/plugins/history/LoggingJobHistoryPlugin.java b/quartz/src/main/java/org/quartz/plugins/history/LoggingJobHistoryPlugin.java index 80017c043..e0b853f73 100644 --- a/quartz/src/main/java/org/quartz/plugins/history/LoggingJobHistoryPlugin.java +++ b/quartz/src/main/java/org/quartz/plugins/history/LoggingJobHistoryPlugin.java @@ -415,19 +415,6 @@ public void initialize(String pname, Scheduler scheduler,ClassLoadHelper classLo scheduler.getListenerManager().addJobListener(this, EverythingMatcher.allJobs()); } - public void start() { - // do nothing... - } - - /** - * Called in order to inform the SchedulerPlugin that it - * should free up all of it's resources because the scheduler is shutting - * down. - */ - public void shutdown() { - // nothing to do... - } - /* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * @@ -436,14 +423,6 @@ public void shutdown() { * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - /* - * Object[] arguments = { new Integer(7), new - * Date(System.currentTimeMillis()), "a disturbance in the Force" }; - * - * String result = MessageFormat.format( "At {1,time} on {1,date}, there - * was {2} on planet {0,number,integer}.", arguments); - */ - public String getName() { return name; } diff --git a/quartz/src/main/java/org/quartz/plugins/history/LoggingTriggerHistoryPlugin.java b/quartz/src/main/java/org/quartz/plugins/history/LoggingTriggerHistoryPlugin.java index 67ded06fc..48df11a72 100644 --- a/quartz/src/main/java/org/quartz/plugins/history/LoggingTriggerHistoryPlugin.java +++ b/quartz/src/main/java/org/quartz/plugins/history/LoggingTriggerHistoryPlugin.java @@ -234,25 +234,6 @@ public class LoggingTriggerHistoryPlugin implements SchedulerPlugin, private final Logger log = LoggerFactory.getLogger(getClass()); - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Constructors. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - - public LoggingTriggerHistoryPlugin() { - } - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - protected Logger getLog() { return log; } @@ -316,14 +297,6 @@ public void setTriggerMisfiredMessage(String triggerMisfiredMessage) { this.triggerMisfiredMessage = triggerMisfiredMessage; } - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * SchedulerPlugin Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** * Called during creation of the Scheduler in order to give * the SchedulerPlugin a chance to initialize. @@ -338,35 +311,6 @@ public void initialize(String pname, Scheduler scheduler, ClassLoadHelper classL scheduler.getListenerManager().addTriggerListener(this, EverythingMatcher.allTriggers()); } - public void start() { - // do nothing... - } - - /** - * Called in order to inform the SchedulerPlugin that it - * should free up all of it's resources because the scheduler is shutting - * down. - */ - public void shutdown() { - // nothing to do... - } - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * TriggerListener Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - - /* - * Object[] arguments = { new Integer(7), new - * Date(System.currentTimeMillis()), "a disturbance in the Force" }; - * - * String result = MessageFormat.format( "At {1,time} on {1,date}, there - * was {2} on planet {0,number,integer}.", arguments); - */ - public String getName() { return name; } @@ -432,9 +376,4 @@ public void triggerComplete(Trigger trigger, JobExecutionContext context, getLog().info(MessageFormat.format(getTriggerCompleteMessage(), args)); } - - public boolean vetoJobExecution(Trigger trigger, JobExecutionContext context) { - return false; - } - } diff --git a/quartz/src/main/java/org/quartz/plugins/interrupt/JobInterruptMonitorPlugin.java b/quartz/src/main/java/org/quartz/plugins/interrupt/JobInterruptMonitorPlugin.java index 8ce94a8af..c2d81584a 100644 --- a/quartz/src/main/java/org/quartz/plugins/interrupt/JobInterruptMonitorPlugin.java +++ b/quartz/src/main/java/org/quartz/plugins/interrupt/JobInterruptMonitorPlugin.java @@ -21,13 +21,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.quartz.JobExecutionContext; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.Trigger; +import org.quartz.*; import org.quartz.Trigger.CompletedExecutionInstruction; -import org.quartz.listeners.TriggerListenerSupport; import org.quartz.spi.ClassLoadHelper; import org.quartz.spi.SchedulerPlugin; import org.slf4j.Logger; @@ -43,7 +38,7 @@ * @author Rama Chavali */ -public class JobInterruptMonitorPlugin extends TriggerListenerSupport implements SchedulerPlugin { +public class JobInterruptMonitorPlugin implements SchedulerPlugin, TriggerListener { private static final String JOB_INTERRUPT_MONITOR_KEY = "JOB_INTERRUPT_MONITOR_KEY"; @@ -66,15 +61,7 @@ public class JobInterruptMonitorPlugin extends TriggerListenerSupport implements public static final String MAX_RUN_TIME = "MaxRunTime"; - public JobInterruptMonitorPlugin() { - } - - @Override - public void start() { - } - @Override - public void shutdown() { this.executor.shutdown(); } diff --git a/quartz/src/main/java/org/quartz/plugins/management/ShutdownHookPlugin.java b/quartz/src/main/java/org/quartz/plugins/management/ShutdownHookPlugin.java index 29d008db9..a55de2935 100644 --- a/quartz/src/main/java/org/quartz/plugins/management/ShutdownHookPlugin.java +++ b/quartz/src/main/java/org/quartz/plugins/management/ShutdownHookPlugin.java @@ -36,36 +36,9 @@ */ public class ShutdownHookPlugin implements SchedulerPlugin { - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Data members. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - private boolean cleanShutdown = true; private final Logger log = LoggerFactory.getLogger(getClass()); - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Constructors. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - - public ShutdownHookPlugin() { - } - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ /** * Determine whether or not the plug-in is configured to cause a clean @@ -99,14 +72,6 @@ protected Logger getLog() { return log; } - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * SchedulerPlugin Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** *

* Called during creation of the Scheduler in order to give @@ -136,23 +101,4 @@ public void run() { Runtime.getRuntime().addShutdownHook(t); } - - public void start() { - // do nothing. - } - - /** - *

- * Called in order to inform the SchedulerPlugin that it - * should free up all of it's resources because the scheduler is shutting - * down. - *

- */ - public void shutdown() { - // nothing to do in this case (since the scheduler is already shutting - // down) - } - -} - -// EOF +} \ No newline at end of file diff --git a/quartz/src/main/java/org/quartz/plugins/xml/FileScanListener.java b/quartz/src/main/java/org/quartz/plugins/xml/FileScanListener.java index ed127b634..0538eb235 100644 --- a/quartz/src/main/java/org/quartz/plugins/xml/FileScanListener.java +++ b/quartz/src/main/java/org/quartz/plugins/xml/FileScanListener.java @@ -27,5 +27,5 @@ */ public interface FileScanListener { - void fileUpdated(String fileName); + default void fileUpdated(String fileName){} } diff --git a/quartz/src/main/java/org/quartz/simpl/RAMJobStore.java b/quartz/src/main/java/org/quartz/simpl/RAMJobStore.java index 247e37a96..b100fb45b 100644 --- a/quartz/src/main/java/org/quartz/simpl/RAMJobStore.java +++ b/quartz/src/main/java/org/quartz/simpl/RAMJobStore.java @@ -183,16 +183,6 @@ public void setMisfireThreshold(long misfireThreshold) { this.misfireThreshold = misfireThreshold; } - /** - *

- * Called by the QuartzScheduler to inform the JobStore that - * it should free up all of it's resources because the scheduler is - * shutting down. - *

- */ - public void shutdown() { - } - public boolean supportsPersistence() { return false; } diff --git a/quartz/src/main/java/org/quartz/spi/JobStore.java b/quartz/src/main/java/org/quartz/spi/JobStore.java index 582b67538..ec6e24b89 100644 --- a/quartz/src/main/java/org/quartz/spi/JobStore.java +++ b/quartz/src/main/java/org/quartz/spi/JobStore.java @@ -95,11 +95,9 @@ void initialize(ClassLoadHelper loadHelper, SchedulerSignaler signaler) void schedulerResumed(); /** - * Called by the QuartzScheduler to inform the JobStore that - * it should free up all of it's resources because the scheduler is - * shutting down. + * Shutdown the JOBStore and close all resources */ - void shutdown(); + default void shutdown(){}; boolean supportsPersistence(); diff --git a/quartz/src/main/java/org/quartz/spi/SchedulerPlugin.java b/quartz/src/main/java/org/quartz/spi/SchedulerPlugin.java index afe13351b..2b79a9fe5 100644 --- a/quartz/src/main/java/org/quartz/spi/SchedulerPlugin.java +++ b/quartz/src/main/java/org/quartz/spi/SchedulerPlugin.java @@ -49,15 +49,6 @@ * @author James House */ public interface SchedulerPlugin { - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Interface. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** *

* Called during creation of the Scheduler in order to give @@ -87,8 +78,8 @@ public interface SchedulerPlugin { * @throws org.quartz.SchedulerConfigException * if there is an error initializing. */ - void initialize(String name, Scheduler scheduler, ClassLoadHelper loadHelper) - throws SchedulerException; + default void initialize(String name, Scheduler scheduler, ClassLoadHelper loadHelper) + throws SchedulerException {} /** *

@@ -97,7 +88,7 @@ void initialize(String name, Scheduler scheduler, ClassLoadHelper loadHelper) * needs to. *

*/ - void start(); + default void start(){} /** *

@@ -106,6 +97,6 @@ void initialize(String name, Scheduler scheduler, ClassLoadHelper loadHelper) * down. *

*/ - void shutdown(); + default void shutdown(){} } diff --git a/quartz/src/main/java/org/quartz/xml/XMLSchedulingDataProcessor.java b/quartz/src/main/java/org/quartz/xml/XMLSchedulingDataProcessor.java index 65d67c065..ab4e337b7 100644 --- a/quartz/src/main/java/org/quartz/xml/XMLSchedulingDataProcessor.java +++ b/quartz/src/main/java/org/quartz/xml/XMLSchedulingDataProcessor.java @@ -85,14 +85,6 @@ * @since Quartz 1.8 */ public class XMLSchedulingDataProcessor implements ErrorHandler { - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Constants. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - public static final String QUARTZ_NS = "http://www.quartz-scheduler.org/xml/JobSchedulingData"; public static final String QUARTZ_SCHEMA_WEB_URL = "http://www.quartz-scheduler.org/xml/job_scheduling_data_2_0.xsd"; @@ -103,15 +95,6 @@ public class XMLSchedulingDataProcessor implements ErrorHandler { public static final String QUARTZ_SYSTEM_ID_JAR_PREFIX = "jar:"; - - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Data members. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - // pre-processing commands protected final List jobGroupsToDelete = new LinkedList<>(); protected final List triggerGroupsToDelete = new LinkedList<>(); @@ -138,14 +121,6 @@ public class XMLSchedulingDataProcessor implements ErrorHandler { private final Logger log = LoggerFactory.getLogger(getClass()); - /* - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Constructors. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - */ - /** * Constructor for JobSchedulingDataLoader. * diff --git a/quartz/src/test/java/org/quartz/DisallowConcurrentExecutionJobTest.java b/quartz/src/test/java/org/quartz/DisallowConcurrentExecutionJobTest.java index f3607d444..9372a69f0 100755 --- a/quartz/src/test/java/org/quartz/DisallowConcurrentExecutionJobTest.java +++ b/quartz/src/test/java/org/quartz/DisallowConcurrentExecutionJobTest.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test; import org.quartz.impl.StdSchedulerFactory; -import org.quartz.listeners.JobListenerSupport; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.number.OrderingComparison.greaterThanOrEqualTo; @@ -66,7 +65,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException { } } - public static class TestJobListener extends JobListenerSupport { + public static class TestJobListener implements JobListener { private final AtomicInteger jobExCount = new AtomicInteger(0); private final int jobExecutionCountToSyncAfter; diff --git a/quartz/src/test/java/org/quartz/core/ListenerManagerTest.java b/quartz/src/test/java/org/quartz/core/ListenerManagerTest.java index 8a84fcbac..51c1a503c 100644 --- a/quartz/src/test/java/org/quartz/core/ListenerManagerTest.java +++ b/quartz/src/test/java/org/quartz/core/ListenerManagerTest.java @@ -32,19 +32,15 @@ import org.quartz.TriggerKey; import org.quartz.TriggerListener; import org.quartz.impl.matchers.NameMatcher; -import org.quartz.listeners.JobListenerSupport; -import org.quartz.listeners.SchedulerListenerSupport; -import org.quartz.listeners.TriggerListenerSupport; - /** * Test ListenerManagerImpl functionality */ class ListenerManagerTest { - public static class TestJobListener extends JobListenerSupport { + public static class TestJobListener implements JobListener { - private String name; + private final String name; public TestJobListener(String name) { this.name = name; @@ -55,9 +51,9 @@ public String getName() { } } - public static class TestTriggerListener extends TriggerListenerSupport { + public static class TestTriggerListener implements TriggerListener { - private String name; + private final String name; public TestTriggerListener(String name) { this.name = name; @@ -68,12 +64,6 @@ public String getName() { } } - public static class TestSchedulerListener extends SchedulerListenerSupport { - - } - - - @Test void testManagementOfJobListeners() throws Exception { @@ -158,8 +148,10 @@ void testManagementOfTriggerListeners() throws Exception { @Test void testManagementOfSchedulerListeners() throws Exception { - SchedulerListener tl1 = new TestSchedulerListener(); - SchedulerListener tl2 = new TestSchedulerListener(); + SchedulerListener tl1 = new SchedulerListener() { + }; + SchedulerListener tl2 = new SchedulerListener(){ + }; ListenerManagerImpl manager = new ListenerManagerImpl(); @@ -180,7 +172,7 @@ void testManagementOfSchedulerListeners() throws Exception { manager = new ListenerManagerImpl(); SchedulerListener[] listeners = new SchedulerListener[numListenersToTestOrderOf]; for (int i = 0; i < numListenersToTestOrderOf; i++) { - listeners[i] = new TestSchedulerListener(); + listeners[i] = new SchedulerListener(){}; manager.addSchedulerListener(listeners[i]); } List mls = manager.getSchedulerListeners(); diff --git a/quartz/src/test/java/org/quartz/core/QTZ212_SchedulerListener_Test.java b/quartz/src/test/java/org/quartz/core/QTZ212_SchedulerListener_Test.java index 6916a8c71..a9bd6db2d 100644 --- a/quartz/src/test/java/org/quartz/core/QTZ212_SchedulerListener_Test.java +++ b/quartz/src/test/java/org/quartz/core/QTZ212_SchedulerListener_Test.java @@ -28,7 +28,6 @@ import org.quartz.SchedulerListener; import org.quartz.impl.StdSchedulerFactory; import org.quartz.listeners.BroadcastSchedulerListener; -import org.quartz.listeners.SchedulerListenerSupport; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -78,7 +77,7 @@ void broadcastSchedulerListenerCallsSchedulerStartingOnAllItsListeners() throws sched.shutdown(); } - public static class TestSchedulerListener extends SchedulerListenerSupport { + public static class TestSchedulerListener implements SchedulerListener { @Override public void schedulerStarted() { diff --git a/quartz/src/test/java/org/quartz/core/QTZ385Test.java b/quartz/src/test/java/org/quartz/core/QTZ385Test.java index f4d45c1e9..e11b9be04 100644 --- a/quartz/src/test/java/org/quartz/core/QTZ385Test.java +++ b/quartz/src/test/java/org/quartz/core/QTZ385Test.java @@ -26,20 +26,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; - import org.junit.jupiter.api.Test; -import org.quartz.JobBuilder; -import org.quartz.JobExecutionContext; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.SimpleScheduleBuilder; -import org.quartz.TriggerBuilder; +import org.quartz.*; import org.quartz.impl.DirectSchedulerFactory; import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities; import org.quartz.impl.jdbcjobstore.JobStoreTX; import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities.DatabaseType; import org.quartz.integrations.tests.HelloJob; -import org.quartz.listeners.JobListenerSupport; import org.quartz.simpl.SimpleThreadPool; import org.quartz.spi.JobStore; @@ -111,7 +104,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl factory.createScheduler(new SimpleThreadPool(1, Thread.NORM_PRIORITY), realJobStore); Scheduler recovery = factory.getScheduler(); try { - recovery.getListenerManager().addJobListener(new JobListenerSupport() { + recovery.getListenerManager().addJobListener(new JobListener() { @Override public String getName() { @@ -135,6 +128,4 @@ public void jobToBeExecuted(JobExecutionContext context) { JdbcQuartzTestUtilities.destroyDatabase("testShutdownOrdering", DatabaseType.DERBY); } } - - } diff --git a/quartz/src/test/java/org/quartz/core/RecoverJobsTest.java b/quartz/src/test/java/org/quartz/core/RecoverJobsTest.java index 01555a7d3..25566adf4 100644 --- a/quartz/src/test/java/org/quartz/core/RecoverJobsTest.java +++ b/quartz/src/test/java/org/quartz/core/RecoverJobsTest.java @@ -23,7 +23,6 @@ import org.quartz.impl.jdbcjobstore.JobStoreTX; import org.quartz.impl.jdbcjobstore.JdbcQuartzTestUtilities.DatabaseType; import org.quartz.*; -import org.quartz.listeners.JobListenerSupport; import org.quartz.simpl.SimpleThreadPool; import org.quartz.utils.DBConnectionManager; import org.slf4j.Logger; @@ -109,7 +108,7 @@ void testRecoveringRepeatJobWhichIsFiredAndMisfiredAtTheSameTime() throws Schedu final AtomicBoolean isJobRecovered = new AtomicBoolean(false); factory.createScheduler(new SimpleThreadPool(1, Thread.NORM_PRIORITY), jobStore); Scheduler recovery = factory.getScheduler(); - recovery.getListenerManager().addJobListener(new JobListenerSupport() { + recovery.getListenerManager().addJobListener(new JobListener() { @Override public String getName() { return RecoverJobsTest.class.getSimpleName();