Juergen Hoeller
376223c87d
Merge branch '6.0.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
2023-07-27 21:48:42 +02:00
Juergen Hoeller
abbea39855
Polishing
2023-07-27 21:47:54 +02:00
Juergen Hoeller
ce80637891
Add option for graceful shutdown (setTaskTerminationTimeout)
...
See gh-30956
2023-07-27 21:39:58 +02:00
Juergen Hoeller
7681200ee7
Introduce SimpleAsyncTaskScheduler (extending SimpleAsyncTaskExecutor)
...
Closes gh-30956
2023-07-26 23:56:59 +02:00
Juergen Hoeller
3437e61f98
Merge branch '6.0.x'
2023-07-26 12:08:20 +02:00
Juergen Hoeller
2573ba4a50
Polishing
2023-07-26 12:07:11 +02:00
Juergen Hoeller
bbde68c49e
Polishing
2023-07-25 19:12:07 +02:00
rstoyanchev
67e3d86bd8
Support declarativeBinding mode in DataBinder
...
Closes gh-30948
2023-07-25 18:04:21 +03:00
rstoyanchev
37eaded63d
Support BindParam annotation
...
Allows customizing the name of the request parameter to bind a
constructor parameter to.
Closes gh-30947
2023-07-25 16:15:55 +03:00
Juergen Hoeller
5ebbb3ff3e
Merge branch '6.0.x'
...
# Conflicts:
# spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java
# spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
# spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
2023-07-25 19:13:33 +02:00
Juergen Hoeller
021161ea38
Make bean property method accessible as well (for non-public types)
...
See gh-19877
2023-07-25 18:10:43 +02:00
Juergen Hoeller
4786e2bf53
Introduce PREFERRED_CONSTRUCTORS_ATTRIBUTE on AbstractBeanDefinition
...
Closes gh-30917
2023-07-22 16:06:14 +02:00
Juergen Hoeller
27f9473422
Merge branch '6.0.x'
...
# Conflicts:
# spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
2023-07-21 20:42:56 +02:00
Juergen Hoeller
4ce1ac0dcb
Polishing
2023-07-21 20:36:43 +02:00
Juergen Hoeller
f99faac073
Add caching annotation support for CompletableFuture and reactive return values
...
Includes CompletableFuture-based retrieve operations on Spring's Cache interface.
Includes support for retrieve operations on CaffeineCache and ConcurrentMapCache.
Includes async cache mode option on CaffeineCacheManager.
Closes gh-17559
Closes gh-17920
Closes gh-30122
2023-07-21 20:27:23 +02:00
Juergen Hoeller
3d57425dcb
Return rejected value from getFieldValue in case of error
...
See gh-19877
2023-07-19 23:08:42 +02:00
Juergen Hoeller
d4caaebab0
Merge branch '6.0.x'
...
# Conflicts:
# spring-context/src/main/java/org/springframework/validation/Errors.java
# spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
2023-07-19 23:01:02 +02:00
Juergen Hoeller
8cc6dd629a
Polishing
2023-07-19 22:58:27 +02:00
Juergen Hoeller
391d7f2c6a
Polishing
2023-07-19 22:47:20 +02:00
Juergen Hoeller
10cb2322e9
Introduce Validator.validateObject(Object) with returned Errors
...
Includes failOnError method on Errors interface for use with validateObject.
Declares many Errors methods as default methods for lean SimpleErrors class.
Closes gh-19877
2023-07-19 21:56:44 +02:00
Juergen Hoeller
2ac55659c8
Merge branch '6.0.x'
2023-07-19 01:26:05 +02:00
Juergen Hoeller
c64a322e19
Polishing
2023-07-19 01:25:20 +02:00
Juergen Hoeller
25ea1f4c0f
Merge branch '6.0.x'
...
# Conflicts:
# spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
2023-07-19 00:37:06 +02:00
Juergen Hoeller
2f33e77ab4
Consistent equals/hashCode style (and related polishing)
2023-07-19 00:35:19 +02:00
Juergen Hoeller
33862d98ea
Merge branch '6.0.x'
2023-07-18 22:03:03 +02:00
Juergen Hoeller
bbcc788f60
Decouple exception messages for sync=true from @Cacheable
2023-07-18 22:02:09 +02:00
Juergen Hoeller
c504ac5a47
Merge branch '6.0.x'
2023-07-18 12:57:18 +02:00
Juergen Hoeller
616f728afa
MethodIntrospector handles overriding bridge method correctly
...
Closes gh-30906
2023-07-18 12:54:59 +02:00
Sam Brannen
544f594592
Update copyright headers
2023-07-15 18:23:37 +02:00
jongwooo
c21a8aa8b0
Wrap ternary operator within parentheses as outlined in Code Style
...
Closes gh-30358
2023-07-15 18:04:01 +02:00
Sam Brannen
a34f9fa66c
Update copyright headers
2023-07-15 13:10:46 +02:00
Sam Brannen
1058fed339
Merge branch '6.0.x'
2023-07-15 18:24:00 +02:00
Sam Brannen
63fe45d92a
Update copyright headers
2023-07-15 13:11:29 +02:00
Sam Brannen
5ce8ffd197
Merge branch '6.0.x'
2023-07-15 13:11:03 +02:00
Sam Brannen
8629182822
Suppress deprecation warnings in tests
2023-07-15 12:16:38 +02:00
Stephane Nicoll
d8854a2f3f
Polish "Evaluate key only if necessary"
...
See gh-22769
2023-07-14 14:43:04 +02:00
liguoxiong
806c83591c
Evaluate key only if necessary
...
Prior to this commit a @CachePut operation would fail if the key
expression is invalid, but guarded with an unless condition as the
former was evaluated too early. This commit makes sure that key for
a put is only evaluated if the put operation is active.
Note that this does not apply for @Cacheable as the key needs to be
computed early to determine if a matching entry exists in the cache.
See gh-22769
2023-07-14 14:43:04 +02:00
Juergen Hoeller
fd17df91fd
Merge branch '6.0.x'
...
# Conflicts:
# spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
2023-07-14 14:38:24 +02:00
Juergen Hoeller
384246c360
Polishing
2023-07-14 14:37:34 +02:00
Juergen Hoeller
e30391661d
Document repeatable annotation semantics for @Scheduled
...
Closes gh-23959
2023-07-14 14:37:28 +02:00
Juergen Hoeller
52c19272c6
Deprecate MBeanExporter's AUTODETECT constants
...
Closes gh-30874
2023-07-14 14:12:39 +02:00
Juergen Hoeller
357d5b4e6e
Merge branch '6.0.x'
2023-07-12 19:23:26 +02:00
Juergen Hoeller
c873a597c7
Polishing
2023-07-12 19:21:44 +02:00
Sébastien Deleuze
490ff0af5e
Refine the log message printed after restoration
...
Closes gh-30876
2023-07-12 15:20:33 +02:00
Sam Brannen
16b9640af2
Merge branch '6.0.x'
2023-07-12 11:50:11 +02:00
Sam Brannen
68f2b0ca59
Rely on auto-boxing in tests
2023-07-12 11:49:02 +02:00
Sam Brannen
2e3fbac9a0
Merge branch '6.0.x'
2023-07-12 10:36:21 +02:00
Sam Brannen
1edc0d8002
Remove outdated Javadoc cross references
2023-07-12 10:36:02 +02:00
Sam Brannen
18c11e84f3
Merge branch '6.0.x'
2023-07-12 10:34:43 +02:00
Sam Brannen
a6dc020dc4
Remove since tag
2023-07-12 10:33:24 +02:00