Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SchedulerFactoryBean accepts external Quartz SchedulerFactory instance

Browse Source 
Issue: SPR-16439
This commit is contained in:
Juergen Hoeller
2018-01-30 16:55:09 +01:00
parent f4de8615aa
commit 857a5b03b7
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -94,17 +94,13 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
public static final int DEFAULT_THREAD_COUNT = 10;
private static final ThreadLocal<ResourceLoader> configTimeResourceLoaderHolder =
new ThreadLocal<>();
private static final ThreadLocal<ResourceLoader> configTimeResourceLoaderHolder = new ThreadLocal<>();
private static final ThreadLocal<Executor> configTimeTaskExecutorHolder =
new ThreadLocal<>();
private static final ThreadLocal<Executor> configTimeTaskExecutorHolder = new ThreadLocal<>();
private static final ThreadLocal<DataSource> configTimeDataSourceHolder =
new ThreadLocal<>();
private static final ThreadLocal<DataSource> configTimeDataSourceHolder = new ThreadLocal<>();
private static final ThreadLocal<DataSource> configTimeNonTransactionalDataSourceHolder =
new ThreadLocal<>();
private static final ThreadLocal<DataSource> configTimeNonTransactionalDataSourceHolder = new ThreadLocal<>();
/**
@@ -166,6 +162,9 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
private Class<? extends SchedulerFactory> schedulerFactoryClass = StdSchedulerFactory.class;
@Nullable
private SchedulerFactory schedulerFactory;
@Nullable
private String schedulerName;
@@ -185,7 +184,6 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
@Nullable
private DataSource nonTransactionalDataSource;
@Nullable
private Map<String, ?> schedulerContextMap;
@@ -217,7 +215,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
/**
* Set the Quartz SchedulerFactory implementation to use.
* Set the Quartz {@link SchedulerFactory} implementation to use.
* <p>Default is {@link StdSchedulerFactory}, reading in the standard
* {@code quartz.properties} from {@code quartz.jar}.
* To use custom Quartz properties, specify the "configLocation"
@@ -230,6 +228,18 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
this.schedulerFactoryClass = schedulerFactoryClass;
}
/**
* Set an external Quartz {@link SchedulerFactory} instance to use.
* <p>Default is an internal {@link StdSchedulerFactory} instance.
* If this method is being called, it overrides any class specified
* through {@link #setSchedulerFactoryClass}.
* @since 5.0.4
* @see #setSchedulerFactoryClass
*/
public void setSchedulerFactory(SchedulerFactory schedulerFactory) {
this.schedulerFactory = schedulerFactory;
}
/**
* Set the name of the Scheduler to create via the SchedulerFactory.
* <p>If not specified, the bean name will be used as default scheduler name.
@@ -317,7 +327,6 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
this.nonTransactionalDataSource = nonTransactionalDataSource;
}
/**
* Register objects in the Scheduler context via a given Map.
* These objects will be available to any Job that runs in this Scheduler.
@@ -470,8 +479,9 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
this.resourceLoader = this.applicationContext;
}
// Create SchedulerFactory instance...
SchedulerFactory schedulerFactory = BeanUtils.instantiateClass(this.schedulerFactoryClass);
// Initialize the SchedulerFactory instance...
SchedulerFactory schedulerFactory = (this.schedulerFactory != null ? this.schedulerFactory :
BeanUtils.instantiateClass(this.schedulerFactoryClass));
initSchedulerFactory(schedulerFactory);
if (this.resourceLoader != null) {