Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
31,788 Commits 18 Branches 0 Tags
9107f7b5928ea46cfcd2ff16f3df6bfe464ff653
Commit Graph

31788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshiaki Maki
8f7d61650d Add @Nullable to value in param() methods in JdbcClient 
Closes gh-31084
 2023-08-21 15:50:38 +02:00
Juergen Hoeller
c2bdc23b5e Merge branch '6.0.x' 2023-08-21 15:45:22 +02:00
Juergen Hoeller
8be77cc650 Revise documentation for cache infrastructure setup 
Closes gh-28250
 2023-08-21 15:42:50 +02:00
Juergen Hoeller
26da0e49e4 Show example for CaffeineCacheManager async cache setup 
See gh-28250
 2023-08-21 15:39:02 +02:00
Sam Brannen
583d92e69a Merge branch '6.0.x' 2023-08-21 15:19:27 +02:00
Sam Brannen
d0d0ed0578 Update copyright headers 2023-08-21 15:18:04 +02:00
Sam Brannen
9911d91f08 Add implementation note 
See gh-31083
 2023-08-21 15:17:57 +02:00
Sam Brannen
758dddce3b Merge branch '6.0.x' 2023-08-21 14:18:38 +02:00
Sam Brannen
620a87bcbc Polishing 2023-08-21 14:17:05 +02:00
Yanming Zhou
368036cab4 Allow overriding dynamic property from enclosing class in nested test class 
Prior to this commit, a dynamic property registered via a
@DynamicPropertySource method in a @Nested test class was not able to
override a property registered via a @DynamicPropertySource method in
the enclosing class.

See gh-26091
Closes gh-31083
 2023-08-21 14:03:24 +02:00
Juergen Hoeller
430cc2edc0 Merge branch '6.0.x' 2023-08-21 12:38:43 +02:00
Juergen Hoeller
8a6c0cd221 Polishing 2023-08-21 12:37:58 +02:00
Juergen Hoeller
b0fc2fe473 Document destroy method inference more prominently 
Closes gh-29546
 2023-08-21 12:32:45 +02:00
Juergen Hoeller
2952cb95f5 Document custom SimpleApplicationEventMulticaster setup 
Closes gh-29996
 2023-08-21 12:32:33 +02:00
Sam Brannen
1e3099759e Polishing 2023-08-20 19:32:07 +02:00
Harry Yang
0e0c298dcf Optimize InlineMap and InlineList in SpEL 
- Make InlineList#constant and InlineMap#constant final.

- Add more assertions for InlineMap tests.

Closes gh-30251
 2023-08-20 17:52:27 +02:00
Sam Brannen
baf367831f Add @AliasFor tip to Javadoc for @TestPropertySource 2023-08-19 15:40:31 +02:00
Sam Brannen
8f71bea553 Avoid unnecessary synchronization in SequencedProperties 2023-08-19 15:32:37 +02:00
Sam Brannen
94d9a71bb5 Polishing 2023-08-19 15:21:55 +02:00
Sébastien Deleuze
11abd8b04f Merge branch '6.0.x' 2023-08-18 17:25:50 +02:00
Sébastien Deleuze
c91708c1c0 Add missing proxy hints for Hibernate native query 
This commit contributes proxy hints needed by
SharedEntityManagerCreator for
org.hibernate.query.sql.internal.NativeQueryImpl interfaces.

A related smoke test has been contributed via
spring-projects/spring-aot-smoke-tests#188.

Closes gh-29603
 2023-08-18 17:22:57 +02:00
Sam Brannen
74130d007b Ensure direct @PropertySource annotations override meta-annotations 
Prior to this commit, there was an issue with the semantics of property
source overrides. Specifically, a @PropertySource annotation present as
a meta-annotation on a @Configuration class was registered with higher
precedence than a @PropertySource annotation declared closer to (or
directly on) the @Configuration class. Consequently, there was no way
for a "local" @PropertySource annotation to override properties
registered via @PropertySource as a meta-annotation.

This commit addresses this issue by introducing a new overloaded
getMergedRepeatableAnnotationAttributes() variant in
AnnotatedTypeMetadata that allows the caller to supply a
sortByReversedMetaDistance flag. When set to `true`, the annotation
search results will be sorted in reversed order based on each
annotation's meta distance, which effectively orders meta-annotations
before annotations that are declared directly on the underlying element.

ConfigurationClassParser and AnnotationConfigUtils have been updated to
use this new repeatable annotation search method for @PropertySource.

Closes gh-31074
 2023-08-18 16:43:44 +02:00
Sam Brannen
285c92bb03 Store reversedMetaDistance Comparator in static field 2023-08-18 16:33:51 +02:00
Sam Brannen
ee6998ba52 Polishing 2023-08-18 16:21:50 +02:00
Stephane Nicoll
9583d18896 Merge branch '6.0.x' 2023-08-18 15:39:49 +02:00
Stephane Nicoll
47b1a2bc55 Clarify usage of FilePatternResourceHintsRegistrar 
This commit review the API using a builder to make it more clear what
the registrar does.

Closes gh-29161
 2023-08-18 15:35:20 +02:00
Sébastien Deleuze
334b1548b7 Merge branch '6.0.x' 
Adapt gh-31045 fix to the main branch, and throw a
WebExchangeBindException instead of a ServerWebInputException.
 2023-08-18 15:11:16 +02:00
Sébastien Deleuze
e6565c600a Refine type conversion errors in ModelAttributeMethodProcessor 
This commit turns TypeMismatchException thrown in
ModelAttributeMethodArgumentResolver#createAttribute into
proper ServerWebInputException in order get HTTP response
with 400 Bad Request status code instead of 500 Internal error.

Closes gh-31045
 2023-08-18 14:31:43 +02:00
Sébastien Deleuze
8af9648c43 Polish ModelAttributeMethodArgumentResolverTests 2023-08-18 12:47:44 +02:00
Sam Brannen
3dcac0cf80 Clean up / Suppress warnings 2023-08-18 12:46:17 +02:00
Sam Brannen
ca118ca4a0 Introduce overloaded methods in JdbcTestUtils that accept JdbcClient 
Closes gh-31066
 2023-08-18 12:20:57 +02:00
Sam Brannen
e0fb777325 Introduce var-args params() method in JdbcClient's StatementSpec 
Closes gh-31070
 2023-08-18 12:00:28 +02:00
Sam Brannen
48e94f535c Polish JdbcClient 2023-08-18 12:00:28 +02:00
Sam Brannen
77067d0e6b Revise JdbcTestUtils method signatures to accept JdbcOperations 
Closes gh-31065
 2023-08-18 12:00:28 +02:00
Juergen Hoeller
1a137c2e61 Merge branch '6.0.x' 
# Conflicts:
#	spring-core/src/main/java/org/springframework/util/StringUtils.java
 2023-08-18 11:27:03 +02:00
Juergen Hoeller
c5bdd9d79d Optimize whitespace checks in StringUtils 
Closes gh-31067
 2023-08-18 11:25:48 +02:00
Sam Brannen
f43f1e12f1 Merge branch '6.0.x' 2023-08-17 17:59:30 +02:00
Sam Brannen
9efa99e0d8 Update link to "Method visibility and @Transactional in proxy mode" 
See gh-31057
See gh-25582
 2023-08-17 17:54:44 +02:00
Sam Brannen
957eb021d7 Upgrade to Gradle 8.3 
Closes gh-31061
 2023-08-17 17:32:05 +02:00
Arjen Poutsma
34477b4f03 Schedule FreeMarker template lookup on bounded elastic scheduler 
This commit makes sure that FreeMarker template lookups, which
potentially block, are scheduled on the bounded elastic scheduler.

Closes gh-30903
 2023-08-17 16:42:44 +02:00
Juergen Hoeller
d41f546c43 Merge branch '6.0.x' 2023-08-17 10:24:34 +02:00
Juergen Hoeller
c8a4026512 Revise note on non-public transactional methods for 6.0 
Closes gh-31057
See gh-25582
 2023-08-17 10:24:03 +02:00
Juergen Hoeller
e685ff0416 Always accept existing explicit definition for same class name 
See gh-25952
 2023-08-16 18:46:32 +02:00
Juergen Hoeller
4bfbf7d3c8 Merge branch '6.0.x' 2023-08-16 17:56:18 +02:00
Juergen Hoeller
2111bf9b9d Upgrade to Caffeine 3.1.8 and Apache HttpComponents Core Reactive 5.2.2 2023-08-16 17:53:02 +02:00
Juergen Hoeller
c72dd1ff66 Change "!void" pointcut expression to "int" for AspectJ 1.9.20 2023-08-16 17:32:26 +02:00
Sam Brannen
279e6eb423 Document best practices for inlined properties in @TestPropertySource 2023-08-16 17:27:18 +02:00
Juergen Hoeller
eb65939341 Add examples for new bind/map methods on DatabaseClient 
See gh-27282
See gh-26021
 2023-08-16 17:02:41 +02:00
Juergen Hoeller
3f79b267b1 Merge branch '6.0.x' 2023-08-16 16:55:01 +02:00
Juergen Hoeller
43bd78913c Polishing 2023-08-16 16:52:53 +02:00