SchedulerFactoryBean always ignores local factory settings in case of an external SchedulerFactory instance (expecting it to be fully initialized)

This commit includes various javadoc fixes and related refinements.

Issue: SPR-16439

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 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.
@@ -25,7 +25,7 @@
 import org.springframework.util.ReflectionUtils;
 
 /**
- * JobFactory implementation that supports {@link java.lang.Runnable}
+ * {@link JobFactory} implementation that supports {@link java.lang.Runnable}
  * objects as well as standard Quartz {@link org.quartz.Job} instances.
  *
  * <p>Compatible with Quartz 2.1.4 and higher, as of Spring 4.1.
@@ -43,7 +43,7 @@ public Job newJob(TriggerFiredBundle bundle, Scheduler scheduler) throws Schedul
 			Object jobObject = createJobInstance(bundle);
 			return adaptJob(jobObject);
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			throw new SchedulerException("Job instantiation failed", ex);
 		}
 	}
@@ -78,7 +78,8 @@ else if (jobObject instanceof Runnable) {
 			return new DelegatingJob((Runnable) jobObject);
 		}
 		else {
-			throw new IllegalArgumentException("Unable to execute job class [" + jobObject.getClass().getName() +
+			throw new IllegalArgumentException(
+					"Unable to execute job class [" + jobObject.getClass().getName() +
 					"]: only [org.quartz.Job] and [java.lang.Runnable] supported.");
 		}
 	}

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

@@ -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.
@@ -34,9 +34,9 @@
 import org.springframework.lang.Nullable;
 
 /**
- * Subclass of Quartz's JobStoreCMT class that delegates to a Spring-managed
- * DataSource instead of using a Quartz-managed connection pool. This JobStore
- * will be used if SchedulerFactoryBean's "dataSource" property is set.
+ * Subclass of Quartz's {@link JobStoreCMT} class that delegates to a Spring-managed
+ * {@link DataSource} instead of using a Quartz-managed JDBC connection pool.
+ * This JobStore will be used if SchedulerFactoryBean's "dataSource" property is set.
  *
  * <p>Supports both transactional and non-transactional DataSource access.
  * With a non-XA DataSource and local Spring transactions, a single DataSource
@@ -84,15 +84,12 @@ public class LocalDataSourceJobStore extends JobStoreCMT {
 
 
 	@Override
-	public void initialize(ClassLoadHelper loadHelper, SchedulerSignaler signaler)
-			throws SchedulerConfigException {
-
+	public void initialize(ClassLoadHelper loadHelper, SchedulerSignaler signaler) throws SchedulerConfigException {
 		// Absolutely needs thread-bound DataSource to initialize.
 		this.dataSource = SchedulerFactoryBean.getConfigTimeDataSource();
 		if (this.dataSource == null) {
-			throw new SchedulerConfigException(
-				"No local DataSource found for configuration - " +
-				"'dataSource' property must be set on SchedulerFactoryBean");
+			throw new SchedulerConfigException("No local DataSource found for configuration - " +
+					"'dataSource' property must be set on SchedulerFactoryBean");
 		}
 
 		// Configure transactional connection settings for Quartz.

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

@@ -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.
@@ -28,8 +28,8 @@
 import org.springframework.util.Assert;
 
 /**
- * Quartz ThreadPool adapter that delegates to a Spring-managed
- * TaskExecutor instance, specified on SchedulerFactoryBean.
+ * Quartz {@link ThreadPool} adapter that delegates to a Spring-managed
+ * {@link Executor} instance, specified on {@link SchedulerFactoryBean}.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -55,12 +55,11 @@ public void setInstanceName(String schedName) {
 
 	@Override
 	public void initialize() throws SchedulerConfigException {
-		// Absolutely needs thread-bound TaskExecutor to initialize.
+		// Absolutely needs thread-bound Executor to initialize.
 		this.taskExecutor = SchedulerFactoryBean.getConfigTimeTaskExecutor();
 		if (this.taskExecutor == null) {
-			throw new SchedulerConfigException(
-				"No local TaskExecutor found for configuration - " +
-				"'taskExecutor' property must be set on SchedulerFactoryBean");
+			throw new SchedulerConfigException("No local Executor found for configuration - " +
+					"'taskExecutor' property must be set on SchedulerFactoryBean");
 		}
 	}