Sam Brannen
122372c580
Spring cleaning: update copyright headers
2024-02-23 12:21:22 +01:00
Sam Brannen
9c610d9a70
Spring cleaning: remove unnecessary semicolon
2024-02-23 12:21:22 +01:00
Sam Brannen
5ae6c0e8ca
Spring cleaning: avoid unnecessary super() invocations
2024-02-23 12:21:22 +01:00
Sam Brannen
eb8492d597
Spring cleaning: avoid use of Iterator for Iterable
2024-02-23 12:21:12 +01:00
Sam Brannen
c98bebd6d3
Spring cleaning: add missing @Override annotations
2024-02-23 12:20:11 +01:00
Sam Brannen
d0ffc16efc
Spring cleaning: avoid unnecessary static imports
2024-02-23 12:20:11 +01:00
Sam Brannen
4bd1485ce4
Spring cleaning: use method references
2024-02-23 12:20:11 +01:00
Sam Brannen
4339c8eac2
Spring cleaning: use diamond operator
2024-02-23 12:20:11 +01:00
Sam Brannen
233b59f144
Polish Javadoc
2024-02-23 12:20:11 +01:00
Sam Brannen
3c00637c88
Fix @inheritDoc usage
2024-02-23 12:08:29 +01:00
Juergen Hoeller
524588ef93
Avoid transaction listener execution without transaction management setup
...
Closes gh-32319
2024-02-23 11:53:05 +01:00
yuhangbin
bed4d684e6
Polishing
2024-02-23 08:37:46 +01:00
Juergen Hoeller
229214a9b0
Merge branch '6.1.x'
...
# Conflicts:
# spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
2024-02-22 17:01:04 +01:00
Juergen Hoeller
4dc3eac864
Polishing
2024-02-22 16:56:22 +01:00
Juergen Hoeller
0188270138
Clarify transaction metadata exposed from currentTransactionStatus()
...
Closes gh-32310
2024-02-22 16:56:17 +01:00
Sébastien Deleuze
906109e129
Merge branch '6.1.x'
2024-02-22 16:37:58 +01:00
Sébastien Deleuze
9430b24eaf
Adapt Hibernate native support for HHH-17643
...
This commit adapts Hibernate native support to handle
the changes performed as part of HHH-17643 which impacts
Hibernate versions 6.4.3+ and 6.2.21+.
It ignores the BytecodeProvider services loaded by the
service loader feature in order to default to the
"no-op" provider with native, and makes the substitutions
more lenient when a substituted field or method does not
exist.
gh-32314 is expected to remove the need for such
substitutions which are not great for maintainability
by design.
Closes gh-32311
2024-02-22 16:30:32 +01:00
cboy
00edba07ff
Polishing Javadoc ( #32313 )
2024-02-22 15:21:33 +01:00
Arjen Poutsma
aee03c5201
Use composite collections in attribute merging
...
This commit introduces composite collections (i.e. Collection, Set, Map)
and uses these composites in request predicates, where before new
collections were instantiated.
Closes gh-32245
2024-02-22 13:11:20 +01:00
Arjen Poutsma
89d746ddf8
Avoid async dispatch if completed in AsyncServerResponse
...
This commit checks whether the CompletableFuture<ServerResponse> passed
to AsyncServerResponse.async has been completed, and if so returns a
CompletedAsyncServerResponse that simply delegates to the completed
response, instead of the DefaultAsyncServerResponse that uses async
dispatch.
Closes gh-32223
2024-02-22 11:29:51 +01:00
Juergen Hoeller
3ddc512108
Add missing @Override annotations
2024-02-22 11:21:51 +01:00
Yanming Zhou
76eb5b8c19
Replace redundant javadoc with {@inheritDoc} for AbstractBeanDefinition
2024-02-22 10:59:35 +01:00
Juergen Hoeller
491ebb4ec4
Merge branch '6.1.x'
...
# Conflicts:
# spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
2024-02-21 23:01:09 +01:00
Juergen Hoeller
41433d445e
Polishing
2024-02-21 22:58:42 +01:00
Juergen Hoeller
7ffeb59b40
Polishing
2024-02-21 22:45:39 +01:00
Juergen Hoeller
8d4953d8d6
Add test for cleanup after configuration class creation failure
...
See gh-23343
2024-02-21 22:45:32 +01:00
Juergen Hoeller
f811f0dc18
Clarify primary/fallback autowiring for arrays/collections/maps
...
Closes gh-32301
2024-02-21 20:24:57 +01:00
Juergen Hoeller
f5397d6426
Consistent processing of overridden bean methods
...
Closes gh-28286
2024-02-21 18:36:03 +01:00
Brian Clozel
2a1b30dbed
Merge branch '6.1.x'
2024-02-21 18:24:45 +01:00
Brian Clozel
f440d8719c
Prepare JDK 23 early access build in CI
...
See gh-32090
2024-02-21 18:23:38 +01:00
Sam Brannen
734fc476ee
Polish SpEL's Indexer and test
2024-02-21 17:44:09 +01:00
Sam Brannen
5a2b127a21
SpEL's StringIndexingValueRef.isWritable() should return false
2024-02-21 17:36:46 +01:00
Sam Brannen
bfed6a3bc5
Clean up warnings in Gradle build
2024-02-21 16:22:38 +01:00
Sam Brannen
644887e094
Polish (Linked)HashSet usage
...
See gh-32291
2024-02-21 16:22:31 +01:00
Sam Brannen
b9c304b890
Polish contribution
...
See gh-32291
2024-02-21 16:19:53 +01:00
Patrick Strawderman
e1a32d4ba9
Avoid resizing of fixed-size HashSet/LinkedHashSet variants
...
Add helpers to CollectionUtils for building HashSets and LinkedHashSets
that can hold an expected number of elements without needing to
resize/rehash.
Closes gh-32291
2024-02-21 16:19:53 +01:00
Stéphane Nicoll
6383a0d7ca
Merge branch '6.1.x'
2024-02-21 15:55:55 +01:00
Stéphane Nicoll
5d6501c75e
Revisit stored procedure detection
...
This commit revisits the improved detection algorithm for stored
procedure as, unfortunately, certain JDBC drivers do not support
the documented pattern for schema and procedure name.
To work around this limitation, this commit applies the escaping of
wildcard characters to the case where multiple procedures have been
found for a given search.
Closes gh-32295
2024-02-21 15:54:34 +01:00
Sam Brannen
3fb170058f
Polish contribution
...
See gh-32294
2024-02-21 14:09:09 +01:00
Patrick Strawderman
f9fe8efb2e
Use ConcurrentHashMap.newKeySet
...
In places where a ConcurrentHashMap was used as a set by wrapping it
with Collections.newSetFromMap, switch to just using the set returned
by ConcurrentHashMap.newKeySet directly.
Closes gh-32294
2024-02-21 14:08:38 +01:00
Juergen Hoeller
ff9c7141c5
Replace superclass exposure in case of late configuration class skipping
...
Closes gh-28676
2024-02-21 11:10:27 +01:00
Stéphane Nicoll
871f705bca
Remove ComponentScan duplicate condition
...
Closes gh-27077
2024-02-21 10:09:31 +01:00
Juergen Hoeller
22b41c33ba
Preserve existing imported class over scanned configuration class
...
Closes gh-24643
2024-02-20 20:43:41 +01:00
Juergen Hoeller
266953195c
Avoid enhancement of configuration class in case of existing instance
...
Closes gh-25738
2024-02-20 20:43:09 +01:00
Juergen Hoeller
889c4e0ff5
Reject multiple primary candidates in ancestor factory as well
...
Closes gh-26612
2024-02-20 16:24:03 +01:00
Juergen Hoeller
ad2e95be4b
Merge branch '6.1.x'
2024-02-20 15:43:24 +01:00
Juergen Hoeller
93f0ec2fa1
Polishing
2024-02-20 15:42:15 +01:00
Juergen Hoeller
85c9279431
Consistent default error handling/logging for all scheduled tasks
...
Closes gh-32298
2024-02-20 15:42:07 +01:00
Juergen Hoeller
63ca8d5d17
Consider defaultCandidate flag in case of no annotations as well
...
See gh-26528
2024-02-20 15:30:38 +01:00
Juergen Hoeller
bc01e3116f
Ignore fallback bean for shortcut resolution
...
See gh-26241
See gh-28122
2024-02-20 13:51:37 +01:00
