Skip to content

Commit dbfe68a

Browse files
committed
Further polishing
Issue: SPR-10940
1 parent ab6c6b1 commit dbfe68a

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void setJobClass(Class jobClass) {
8282
* to adapt the given job class to the Quartz Job interface.
8383
*/
8484
@Override
85-
public Class<?> getJobClass() {
85+
public Class getJobClass() {
8686
return (this.actualJobClass != null ? this.actualJobClass : super.getJobClass());
8787
}
8888

@@ -97,7 +97,7 @@ public Class<?> getJobClass() {
9797
* (for example Spring-managed beans)
9898
* @see SchedulerFactoryBean#setSchedulerContextAsMap
9999
*/
100-
public void setJobDataAsMap(Map jobDataAsMap) {
100+
public void setJobDataAsMap(Map<String, ?> jobDataAsMap) {
101101
getJobDataMap().putAll(jobDataAsMap);
102102
}
103103

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

+3-7
Original file line numberDiff line numberDiff line change
@@ -449,10 +449,8 @@ public void afterPropertiesSet() throws Exception {
449449
this.resourceLoader = this.applicationContext;
450450
}
451451

452-
// Create SchedulerFactory instance.
453-
SchedulerFactory schedulerFactory = (SchedulerFactory)
454-
BeanUtils.instantiateClass(this.schedulerFactoryClass);
455-
452+
// Create SchedulerFactory instance...
453+
SchedulerFactory schedulerFactory = BeanUtils.instantiateClass(this.schedulerFactoryClass);
456454
initSchedulerFactory(schedulerFactory);
457455

458456
if (this.resourceLoader != null) {
@@ -515,9 +513,7 @@ public void afterPropertiesSet() throws Exception {
515513
* Load and/or apply Quartz properties to the given SchedulerFactory.
516514
* @param schedulerFactory the SchedulerFactory to initialize
517515
*/
518-
private void initSchedulerFactory(SchedulerFactory schedulerFactory)
519-
throws SchedulerException, IOException {
520-
516+
private void initSchedulerFactory(SchedulerFactory schedulerFactory) throws SchedulerException, IOException {
521517
if (!(schedulerFactory instanceof StdSchedulerFactory)) {
522518
if (this.configLocation != null || this.quartzProperties != null ||
523519
this.taskExecutor != null || this.dataSource != null) {

0 commit comments

Comments
 (0)