updated Quartz support package for full Quartz 2.0 support (SPR-8275)

Author: jhoeller

org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/AdaptableJobFactory.java

@@ -16,17 +16,21 @@
 
 package org.springframework.scheduling.quartz;
 
+import java.lang.reflect.Method;
+
 import org.quartz.Job;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.quartz.spi.JobFactory;
 import org.quartz.spi.TriggerFiredBundle;
 
+import org.springframework.util.ReflectionUtils;
+
 /**
  * JobFactory implementation that supports {@link java.lang.Runnable}
  * objects as well as standard Quartz {@link org.quartz.Job} instances.
  *
- * <p>Compatible with Quartz 1.x as well as Quartz 2.0, as of Spring 3.1.
+ * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0, as of Spring 3.1.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -65,7 +69,12 @@ public Job newJob(TriggerFiredBundle bundle) throws SchedulerException {
 	 * @throws Exception if job instantiation failed
 	 */
 	protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
-		return bundle.getJobDetail().getJobClass().newInstance();
+		// Reflectively adapting to differences between Quartz 1.x and Quartz 2.0...
+		Method getJobDetail = bundle.getClass().getMethod("getJobDetail");
+		Object jobDetail = ReflectionUtils.invokeMethod(getJobDetail, bundle);
+		Method getJobClass = jobDetail.getClass().getMethod("getJobClass");
+		Class jobClass = (Class) ReflectionUtils.invokeMethod(getJobClass, jobDetail);
+		return jobClass.newInstance();
 	}
 
 	/**

org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,10 +43,9 @@
  * to automatically register a trigger for the corresponding JobDetail,
  * instead of registering the JobDetail separately.
  *
- * <p><b>NOTE:</b> This convenience subclass does not work with trigger
- * persistence in Quartz 1.6, due to a change in Quartz's trigger handling.
- * Use Quartz 1.5 if you rely on trigger persistence based on this class,
- * or the standard Quartz {@link org.quartz.CronTrigger} class instead.
+ * <p><b>NOTE: This convenience subclass does not work against Quartz 2.0.</b>
+ * Use Quartz 2.0's native <code>CronTriggerImpl</code> class or the new
+ * Quartz 2.0 builder API instead.
  *
  * @author Juergen Hoeller
  * @since 18.02.2004

org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,10 @@
  * sensible defaults. This class uses the Spring bean name as job name,
  * and the Quartz default group ("DEFAULT") as job group if not specified.
  *
+ * <p><b>NOTE: This convenience subclass does not work against Quartz 2.0.</b>
+ * Use Quartz 2.0's native <code>JobDetailImpl</code> class or the new
+ * Quartz 2.0 builder API instead.
+ *
  * @author Juergen Hoeller
  * @since 18.02.2004
  * @see #setName

org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,16 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.quartz.Scheduler;
 import org.quartz.StatefulJob;
 
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.PropertyAccessorFactory;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -61,6 +65,8 @@
  * You need to implement your own Quartz Job as a thin wrapper for each case
  * where you want a persistent job to delegate to a specific service method.
  *
+ * <p>Compatible with Quartz 1.5+ as well as Quartz 2.0, as of Spring 3.1.
+ *
  * @author Juergen Hoeller
  * @author Alef Arendsen
  * @since 18.02.2004
@@ -70,7 +76,19 @@
  * @see #setConcurrent
  */
 public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethodInvoker
-	implements FactoryBean<Object>, BeanNameAware, BeanClassLoaderAware, BeanFactoryAware, InitializingBean {
+		implements FactoryBean<JobDetail>, BeanNameAware, BeanClassLoaderAware, BeanFactoryAware, InitializingBean {
+
+	private static Class<?> jobDetailImplClass;
+
+	static {
+		try {
+			jobDetailImplClass = Class.forName("org.quartz.impl.JobDetailImpl");
+		}
+		catch (ClassNotFoundException ex) {
+			jobDetailImplClass = null;
+		}
+	}
+
 
 	private String name;
 
@@ -174,14 +192,31 @@ public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodExce
 		Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class);
 
 		// Build JobDetail instance.
-		this.jobDetail = new JobDetail(name, this.group, jobClass);
-		this.jobDetail.getJobDataMap().put("methodInvoker", this);
-		this.jobDetail.setVolatility(true);
-		this.jobDetail.setDurability(true);
+		if (jobDetailImplClass != null) {
+			// Using Quartz 2.0 JobDetailImpl class...
+			Object jobDetail = BeanUtils.instantiate(jobDetailImplClass);
+			BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(jobDetail);
+			bw.setPropertyValue("name", name);
+			bw.setPropertyValue("group", this.group);
+			bw.setPropertyValue("jobClass", jobClass);
+			bw.setPropertyValue("durability", true);
+			((JobDataMap) bw.getPropertyValue("jobDataMap")).put("methodInvoker", this);
+		}
+		else {
+			// Using Quartz 1.x JobDetail class...
+			this.jobDetail = new JobDetail(name, this.group, jobClass);
+			this.jobDetail.setVolatility(true);
+			this.jobDetail.setDurability(true);
+			this.jobDetail.getJobDataMap().put("methodInvoker", this);
+		}
 
 		// Register job listener names.
 		if (this.jobListenerNames != null) {
 			for (String jobListenerName : this.jobListenerNames) {
+				if (jobDetailImplClass != null) {
+					throw new IllegalStateException("Non-global JobListeners not supported on Quartz 2 - " +
+							"manually register a Matcher against the Quartz ListenerManager instead");
+				}
 				this.jobDetail.addJobListener(jobListenerName);
 			}
 		}
@@ -225,12 +260,12 @@ public Object getTargetObject() {
 	}
 
 
-	public Object getObject() {
+	public JobDetail getObject() {
 		return this.jobDetail;
 	}
 
-	public Class<?> getObjectType() {
-		return JobDetail.class;
+	public Class<? extends JobDetail> getObjectType() {
+		return (this.jobDetail != null ? this.jobDetail.getClass() : JobDetail.class);
 	}
 
 	public boolean isSingleton() {