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

Merge branch '6.1.x'

This commit is contained in:
Juergen Hoeller 2024-04-09 16:15:19 +02:00
parent bb04c6b1f3 c5590ae9e6
commit a9fffa844f
4 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 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.
@ -68,7 +68,7 @@ public interface TaskScheduler {
* @param trigger an implementation of the {@link Trigger} interface, * @param trigger an implementation of the {@link Trigger} interface,
* e.g. a {@link org.springframework.scheduling.support.CronTrigger} object * e.g. a {@link org.springframework.scheduling.support.CronTrigger} object
* wrapping a cron expression * wrapping a cron expression
* @return a {@link ScheduledFuture} representing pending completion of the task, * @return a {@link ScheduledFuture} representing pending execution of the task,
* or {@code null} if the given Trigger object never fires (i.e. returns * or {@code null} if the given Trigger object never fires (i.e. returns
* {@code null} from {@link Trigger#nextExecution}) * {@code null} from {@link Trigger#nextExecution})
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
@ -85,7 +85,7 @@ public interface TaskScheduler {
* @param task the Runnable to execute whenever the trigger fires * @param task the Runnable to execute whenever the trigger fires
* @param startTime the desired execution time for the task * @param startTime the desired execution time for the task
* (if this is in the past, the task will be executed immediately, i.e. as soon as possible) * (if this is in the past, the task will be executed immediately, i.e. as soon as possible)
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @since 5.0 * @since 5.0
@ -99,7 +99,7 @@ public interface TaskScheduler {
* @param task the Runnable to execute whenever the trigger fires * @param task the Runnable to execute whenever the trigger fires
* @param startTime the desired execution time for the task * @param startTime the desired execution time for the task
* (if this is in the past, the task will be executed immediately, i.e. as soon as possible) * (if this is in the past, the task will be executed immediately, i.e. as soon as possible)
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #schedule(Runnable, Instant)} * @deprecated as of 6.0, in favor of {@link #schedule(Runnable, Instant)}
@ -118,7 +118,7 @@ public interface TaskScheduler {
* @param startTime the desired first execution time for the task * @param startTime the desired first execution time for the task
* (if this is in the past, the task will be executed immediately, i.e. as soon as possible) * (if this is in the past, the task will be executed immediately, i.e. as soon as possible)
* @param period the interval between successive executions of the task * @param period the interval between successive executions of the task
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @since 5.0 * @since 5.0
@ -134,7 +134,7 @@ public interface TaskScheduler {
* @param startTime the desired first execution time for the task * @param startTime the desired first execution time for the task
* (if this is in the past, the task will be executed immediately, i.e. as soon as possible) * (if this is in the past, the task will be executed immediately, i.e. as soon as possible)
* @param period the interval between successive executions of the task (in milliseconds) * @param period the interval between successive executions of the task (in milliseconds)
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #scheduleAtFixedRate(Runnable, Instant, Duration)} * @deprecated as of 6.0, in favor of {@link #scheduleAtFixedRate(Runnable, Instant, Duration)}
@ -151,7 +151,7 @@ public interface TaskScheduler {
* {@link ScheduledFuture} gets cancelled. * {@link ScheduledFuture} gets cancelled.
* @param task the Runnable to execute whenever the trigger fires * @param task the Runnable to execute whenever the trigger fires
* @param period the interval between successive executions of the task * @param period the interval between successive executions of the task
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @since 5.0 * @since 5.0
@ -165,7 +165,7 @@ public interface TaskScheduler {
* {@link ScheduledFuture} gets cancelled. * {@link ScheduledFuture} gets cancelled.
* @param task the Runnable to execute whenever the trigger fires * @param task the Runnable to execute whenever the trigger fires
* @param period the interval between successive executions of the task (in milliseconds) * @param period the interval between successive executions of the task (in milliseconds)
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #scheduleAtFixedRate(Runnable, Duration)} * @deprecated as of 6.0, in favor of {@link #scheduleAtFixedRate(Runnable, Duration)}
@ -185,7 +185,7 @@ public interface TaskScheduler {
* @param startTime the desired first execution time for the task * @param startTime the desired first execution time for the task
* (if this is in the past, the task will be executed immediately, i.e. as soon as possible) * (if this is in the past, the task will be executed immediately, i.e. as soon as possible)
* @param delay the delay between the completion of one execution and the start of the next * @param delay the delay between the completion of one execution and the start of the next
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @since 5.0 * @since 5.0
@ -203,7 +203,7 @@ public interface TaskScheduler {
* (if this is in the past, the task will be executed immediately, i.e. as soon as possible) * (if this is in the past, the task will be executed immediately, i.e. as soon as possible)
* @param delay the delay between the completion of one execution and the start of the next * @param delay the delay between the completion of one execution and the start of the next
* (in milliseconds) * (in milliseconds)
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #scheduleWithFixedDelay(Runnable, Instant, Duration)} * @deprecated as of 6.0, in favor of {@link #scheduleWithFixedDelay(Runnable, Instant, Duration)}
@ -220,7 +220,7 @@ public interface TaskScheduler {
* {@link ScheduledFuture} gets cancelled. * {@link ScheduledFuture} gets cancelled.
* @param task the Runnable to execute whenever the trigger fires * @param task the Runnable to execute whenever the trigger fires
* @param delay the delay between the completion of one execution and the start of the next * @param delay the delay between the completion of one execution and the start of the next
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @since 5.0 * @since 5.0
@ -235,7 +235,7 @@ public interface TaskScheduler {
* @param task the Runnable to execute whenever the trigger fires * @param task the Runnable to execute whenever the trigger fires
* @param delay the delay between the completion of one execution and the start of the next * @param delay the delay between the completion of one execution and the start of the next
* (in milliseconds) * (in milliseconds)
* @return a {@link ScheduledFuture} representing pending completion of the task * @return a {@link ScheduledFuture} representing pending execution of the task
* @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
* for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress) * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
* @deprecated as of 6.0, in favor of {@link #scheduleWithFixedDelay(Runnable, Duration)} * @deprecated as of 6.0, in favor of {@link #scheduleWithFixedDelay(Runnable, Duration)}

6
spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java
View File

@ -76,6 +76,12 @@ import org.springframework.util.concurrent.ListenableFuture;
* which tend to have specific constraints for the scheduler thread pool, * which tend to have specific constraints for the scheduler thread pool,
* requiring a separate thread pool for general executor purposes in practice. * requiring a separate thread pool for general executor purposes in practice.
* *
* <p><b>NOTE: This scheduler variant does not track the actual completion of tasks
* but rather just the hand-off to an execution thread.</b> As a consequence,
* a {@link ScheduledFuture} handle (e.g. from {@link #schedule(Runnable, Instant)})
* represents that hand-off rather than the actual completion of the provided task
* (or series of repeated tasks).
*
* <p>As an alternative to the built-in thread-per-task capability, this scheduler * <p>As an alternative to the built-in thread-per-task capability, this scheduler
* can also be configured with a separate target executor for scheduled task * can also be configured with a separate target executor for scheduled task
* execution through {@link #setTargetTaskExecutor}: e.g. pointing to a shared * execution through {@link #setTargetTaskExecutor}: e.g. pointing to a shared

11
spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
View File

@ -53,7 +53,14 @@ import org.springframework.util.concurrent.ListenableFutureTask;
/** /**
* A standard implementation of Spring's {@link TaskScheduler} interface, wrapping * A standard implementation of Spring's {@link TaskScheduler} interface, wrapping
* a native {@link java.util.concurrent.ScheduledThreadPoolExecutor} and providing * a native {@link java.util.concurrent.ScheduledThreadPoolExecutor} and providing
* all applicable configuration options for it. * all applicable configuration options for it. The default number of scheduler
* threads is 1; a higher number can be configured through {@link #setPoolSize}.
*
* <p>This is Spring's traditional scheduler variant, staying as close as possible to
* {@link java.util.concurrent.ScheduledExecutorService} semantics. Task execution happens
* on the scheduler thread(s) rather than on separate execution threads. As a consequence,
* a {@link ScheduledFuture} handle (e.g. from {@link #schedule(Runnable, Instant)})
* represents the actual completion of the provided task (or series of repeated tasks).
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Mark Fisher * @author Mark Fisher
@ -64,6 +71,8 @@ import org.springframework.util.concurrent.ListenableFutureTask;
* @see #setExecuteExistingDelayedTasksAfterShutdownPolicy * @see #setExecuteExistingDelayedTasksAfterShutdownPolicy
* @see #setThreadFactory * @see #setThreadFactory
* @see #setErrorHandler * @see #setErrorHandler
* @see ThreadPoolTaskExecutor
* @see SimpleAsyncTaskScheduler
*/ */
@SuppressWarnings({"serial", "deprecation"}) @SuppressWarnings({"serial", "deprecation"})
public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport

10
spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
View File

@ -229,14 +229,14 @@ public abstract class JdbcUtils {
try { try {
return rs.getObject(index, requiredType); return rs.getObject(index, requiredType);
} }
catch (AbstractMethodError err) { catch (SQLFeatureNotSupportedException | AbstractMethodError ex) {
logger.debug("JDBC driver does not implement JDBC 4.1 'getObject(int, Class)' method", err);
}
catch (SQLFeatureNotSupportedException ex) {
logger.debug("JDBC driver does not support JDBC 4.1 'getObject(int, Class)' method", ex); logger.debug("JDBC driver does not support JDBC 4.1 'getObject(int, Class)' method", ex);
} }
catch (SQLException ex) { catch (SQLException ex) {
logger.debug("JDBC driver has limited support for JDBC 4.1 'getObject(int, Class)' method", ex); if (logger.isDebugEnabled()) {
logger.debug("JDBC driver has limited support for 'getObject(int, Class)' with column type: " +
requiredType.getName(), ex);
}
} }
// Corresponding SQL types for JSR-310 / Joda-Time types, left up // Corresponding SQL types for JSR-310 / Joda-Time types, left up