root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixed 'globalJobListeners'/'globalTriggerListeners' to work with Quartz 2.0 & 2.1 as well 

Issue: SPR-11362
This commit is contained in:
Juergen Hoeller 2014-01-28 12:25:24 +01:00
parent 425e5a066e
commit c719c70ea9
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerAccessor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -56,6 +56,7 @@ import org.springframework.util.ReflectionUtils;
* <b>Note:</b> Quartz 1.x support is deprecated - please upgrade to Quartz 2.0+. * <b>Note:</b> Quartz 1.x support is deprecated - please upgrade to Quartz 2.0+.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Stephane Nicoll
* @since 2.5.6 * @since 2.5.6
*/ */
public abstract class SchedulerAccessor implements ResourceLoaderAware { public abstract class SchedulerAccessor implements ResourceLoaderAware {
@ -395,7 +396,8 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
} }
else { else {
try { try {
Map<?, ?> jobDataMap = (Map<?, ?>) ReflectionUtils.invokeMethod(Trigger.class.getMethod("getJobDataMap"), trigger); Map<?, ?> jobDataMap =
(Map<?, ?>) ReflectionUtils.invokeMethod(Trigger.class.getMethod("getJobDataMap"), trigger);
return (JobDetail) jobDataMap.remove(JobDetailAwareTrigger.JOB_DETAIL_KEY); return (JobDetail) jobDataMap.remove(JobDetailAwareTrigger.JOB_DETAIL_KEY);
} }
catch (NoSuchMethodException ex) { catch (NoSuchMethodException ex) {
@ -472,19 +474,33 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
target = getScheduler(); target = getScheduler();
quartz2 = false; quartz2 = false;
} }
Class<?> targetClass = target.getClass();
try { try {
if (this.schedulerListeners != null) { if (this.schedulerListeners != null) {
Method addSchedulerListener = target.getClass().getMethod("addSchedulerListener", SchedulerListener.class); Method addSchedulerListener = targetClass.getMethod("addSchedulerListener", SchedulerListener.class);
for (SchedulerListener listener : this.schedulerListeners) { for (SchedulerListener listener : this.schedulerListeners) {
ReflectionUtils.invokeMethod(addSchedulerListener, target, listener); ReflectionUtils.invokeMethod(addSchedulerListener, target, listener);
} }
} }
if (this.globalJobListeners != null) { if (this.globalJobListeners != null) {
Method addJobListener = target.getClass().getMethod( Method addJobListener;
(quartz2 ? "addJobListener" : "addGlobalJobListener"), JobListener.class); if (quartz2) {
// addJobListener(JobListener) only introduced as late as Quartz 2.2, so we need
// to fall back to the Quartz 2.0/2.1 compatible variant with an empty matchers List
addJobListener = targetClass.getMethod("addJobListener", JobListener.class, List.class);
}
else {
addJobListener = targetClass.getMethod("addGlobalJobListener", JobListener.class);
}
for (JobListener listener : this.globalJobListeners) { for (JobListener listener : this.globalJobListeners) {
ReflectionUtils.invokeMethod(addJobListener, target, listener); if (quartz2) {
List<?> emptyMatchers = new LinkedList<Object>();
ReflectionUtils.invokeMethod(addJobListener, target, listener, emptyMatchers);
}
else {
ReflectionUtils.invokeMethod(addJobListener, target, listener);
}
} }
} }
if (this.jobListeners != null) { if (this.jobListeners != null) {
@ -497,10 +513,23 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
} }
} }
if (this.globalTriggerListeners != null) { if (this.globalTriggerListeners != null) {
Method addTriggerListener = target.getClass().getMethod( Method addTriggerListener;
(quartz2 ? "addTriggerListener" : "addGlobalTriggerListener"), TriggerListener.class); if (quartz2) {
// addTriggerListener(TriggerListener) only introduced as late as Quartz 2.2, so we need
// to fall back to the Quartz 2.0/2.1 compatible variant with an empty matchers List
addTriggerListener = targetClass.getMethod("addTriggerListener", TriggerListener.class, List.class);
}
else {
addTriggerListener = targetClass.getMethod("addGlobalTriggerListener", TriggerListener.class);
}
for (TriggerListener listener : this.globalTriggerListeners) { for (TriggerListener listener : this.globalTriggerListeners) {
ReflectionUtils.invokeMethod(addTriggerListener, target, listener); if (quartz2) {
List<?> emptyMatchers = new LinkedList<Object>();
ReflectionUtils.invokeMethod(addTriggerListener, target, listener, emptyMatchers);
}
else {
ReflectionUtils.invokeMethod(addTriggerListener, target, listener);
}
} }
} }
if (this.triggerListeners != null) { if (this.triggerListeners != null) {