fad544e077
Merge branch '6.1.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
2024-03-08 19:51:05 +01:00
c1287d48e2
Polishing
2024-03-08 19:31:01 +01:00
19fec0633f
Local root directory and jar caching in PathMatchingResourcePatternResolver
...
Closes gh-21190
2024-03-08 19:12:14 +01:00
ac1176af53
Use Map#computeIfAbsent in SpEL support classes
...
Closes gh-32385
2024-03-07 13:55:35 +01:00
dcbc2ef134
Polishing
2024-03-07 13:55:35 +01:00
7f0ab22c47
Merge branch '6.1.x'
2024-03-07 12:10:07 +01:00
6d9a2eb9b8
Improve fix of duplicate upstream subscription during reactive cache put
...
This commit fixes an issue where a Cacheable method which returns a
Flux (or multi-value publisher) will be invoked once, but the returned
publisher is actually subscribed twice.
The previous fix 988f3630c
2024-03-07 12:08:28 +01:00
13221ac0ef
Merge branch '6.1.x'
...
# Conflicts:
# spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
# spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
2024-03-06 18:09:32 +01:00
e5e61dfa3f
Ignore scheduled task exceptions after shutdown
...
Includes suppression after logging, not propagating exceptions to the thread itself.
Closes gh-32381
See gh-32298
2024-03-06 18:03:31 +01:00
19b5f11734
Merge branch '6.1.x'
2024-03-05 18:33:48 +01:00
988f3630c4
Avoid duplicate upstream subscription during reactive cache put
...
This commit fixes an issue where a Cacheable method which returns a
Flux (or multi-value publisher) will be invoked once, but the returned
publisher is actually subscribed twice.
By using the Reactor `tap` operator, we ensure that we can emit values
downstream AND accumulate emitted values into the List with a single
subscription.
The SignalListener additionally handles scenarios involving cancel,
for instance in case of a `take(1)` in the chain. In that case values
emitted up until that point will have been stored into the List buffer,
so we can still put it in the cache. In case of error, no caching occurs
and the internal buffer is cleared. This implementation also protects
against competing onComplete/onError signals and cancel signals.
Closes gh-32370
2024-03-05 18:32:32 +01:00
6f7f032ced
Merge branch '6.1.x'
2024-03-05 18:24:01 +01:00
a0ae849856
Polishing
2024-03-05 18:23:13 +01:00
7d4c8a403e
Introduce configurable default rollback rules
...
Includes rollbackOn annotation attribute on @EnableTransactionManagement and addDefaultRollbackRule method on AnnotationTransactionAttributeSource, as well as publicMethodsOnly as instance-level flag (also on AnnotationCacheOperationSource).
Closes gh-23473
2024-03-05 18:08:08 +01:00
30e75e4a09
Enable efficient pointcut checks for composite sources as well
...
Closes gh-20072
2024-03-05 13:34:48 +01:00
1cb2dfa459
enh: use isEmpty() instead of length()
2024-03-04 23:55:33 +01:00
dc6c96de0a
Merge branch '6.1.x'
...
# Conflicts:
# spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractFallbackJCacheOperationSource.java
# spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
# spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
2024-03-04 22:50:22 +01:00
e9110c0729
Polishing
2024-03-04 22:48:52 +01:00
b5ca646431
Leniently tolerate late bean retrieval during destroySingletons()
...
Closes gh-22526
Closes gh-29730
2024-03-04 17:21:02 +01:00
3d7ef3ebfc
Avoid storage of null marker per method for proxy decision purposes
...
Includes missing isCandidateClass support on JCacheOperationSource.
Closes gh-20072
2024-03-04 12:55:33 +01:00
9a1e5eb8d7
Add test for @Fallback with BeanFactory.getBean(Class)
2024-02-29 13:33:43 +01:00
f22a1eece4
Polishing
2024-02-28 19:14:37 +01:00
3477738bed
Consistently pick lowest superclass level to replace
...
See gh-28676
2024-02-28 15:49:05 +01:00
fa5d246a1b
Replace all exposed superclasses in final step after traversal
...
See gh-28676
2024-02-28 15:39:53 +01:00
17b2087198
Introduce background bootstrapping for individual singleton beans
...
Closes gh-13410
Closes gh-19487
See gh-23501
2024-02-27 22:33:18 +01:00
c2d2e99c2f
Polishing
2024-02-23 13:18:09 +01:00
122372c580
Spring cleaning: update copyright headers
2024-02-23 12:21:22 +01:00
c98bebd6d3
Spring cleaning: add missing @Override annotations
2024-02-23 12:20:11 +01:00
d0ffc16efc
Spring cleaning: avoid unnecessary static imports
2024-02-23 12:20:11 +01:00
4bd1485ce4
Spring cleaning: use method references
2024-02-23 12:20:11 +01:00
3c00637c88
Fix @inheritDoc usage
2024-02-23 12:08:29 +01:00
524588ef93
Avoid transaction listener execution without transaction management setup
...
Closes gh-32319
2024-02-23 11:53:05 +01:00
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
7ffeb59b40
Polishing
2024-02-21 22:45:39 +01:00
8d4953d8d6
Add test for cleanup after configuration class creation failure
...
See gh-23343
2024-02-21 22:45:32 +01:00
f811f0dc18
Clarify primary/fallback autowiring for arrays/collections/maps
...
Closes gh-32301
2024-02-21 20:24:57 +01:00
f5397d6426
Consistent processing of overridden bean methods
...
Closes gh-28286
2024-02-21 18:36:03 +01:00
644887e094
Polish (Linked)HashSet usage
...
See gh-32291
2024-02-21 16:22:31 +01:00
b9c304b890
Polish contribution
...
See gh-32291
2024-02-21 16:19:53 +01:00
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
3fb170058f
Polish contribution
...
See gh-32294
2024-02-21 14:09:09 +01:00
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
ff9c7141c5
Replace superclass exposure in case of late configuration class skipping
...
Closes gh-28676
2024-02-21 11:10:27 +01:00
871f705bca
Remove ComponentScan duplicate condition
...
Closes gh-27077
2024-02-21 10:09:31 +01:00
22b41c33ba
Preserve existing imported class over scanned configuration class
...
Closes gh-24643
2024-02-20 20:43:41 +01:00
266953195c
Avoid enhancement of configuration class in case of existing instance
...
Closes gh-25738
2024-02-20 20:43:09 +01:00
ad2e95be4b
Merge branch '6.1.x'
2024-02-20 15:43:24 +01:00
93f0ec2fa1
Polishing
2024-02-20 15:42:15 +01:00
85c9279431
Consistent default error handling/logging for all scheduled tasks
...
Closes gh-32298
2024-02-20 15:42:07 +01:00
63ca8d5d17
Consider defaultCandidate flag in case of no annotations as well
...
See gh-26528
2024-02-20 15:30:38 +01:00
480051a21c
Introduce fallback flag and annotation (as companion to primary)
...
Closes gh-26241
2024-02-20 13:37:41 +01:00
a8fb16b47c
Introduce defaultCandidate flag (for plain type vs. qualified match)
...
Closes gh-26528
2024-02-20 12:00:47 +01:00
874e61a0c6
Test for async event publication before listener initialized
...
Closes gh-20904
See gh-23501
See gh-25799
2024-02-19 18:18:09 +01:00
c6e6a3e44d
Link to section in reference manual
2024-02-18 18:19:59 +01:00
0ddfe3977a
Merge branch '6.1.x'
2024-02-16 22:50:04 +01:00
7bb9e85723
Avoid trivial static import
2024-02-16 22:43:56 +01:00
3aae7a66e6
Polishing
2024-02-16 22:27:09 +01:00
71dfebbfe5
Polishing
2024-02-16 16:45:18 +01:00
7c07c43201
Polishing
2024-02-16 15:00:06 +01:00
6791ea94a0
Change executor phase to MAX_VALUE/2 and reduce timeout to 10 seconds
...
Closes gh-32152
2024-02-16 14:16:32 +01:00
7e67da8a26
Support for matching partial generics
...
Closes gh-20727
2024-02-15 16:51:09 +01:00
e788aeb25b
Improve GenericTypeResolver to resolve type variable recursively
...
Fix GH-24963
2024-02-15 16:28:45 +01:00
aef4b21f19
Polish "Add ThreadLocalAccessor for LocaleContext and RequestAttributes"
...
See gh-32243
2024-02-15 15:57:43 +01:00
5bd1c1fddb
Add ThreadLocalAccessor for LocaleContext and RequestAttributes
...
Add `ThreadLocalAccessor` implementations:
- `LocaleThreadLocalAccessor`
- `RequestAttributesThreadLocalAccessor`
See gh-32243
2024-02-15 15:49:55 +01:00
e3aa5b6b11
Use new implementation in PropertyPlaceholderHelper
...
This commit removes the previous implementation in favor of the new
PlaceholderParser. The only noticeable side effect is that the exception
is no longer an IllegalArgumentException, but rather the dedicated
PlaceholderResolutionException.
See gh-9628
2024-02-15 15:27:13 +01:00
cc6dd19324
Polishing
2024-02-13 14:29:18 +01:00
b4153618a4
Consistent Lock field declaration (instead of ReentrantLock field type)
2024-02-13 11:07:20 +01:00
a2000dba33
Leniently accept tasks after context close in lifecycle stop phase
...
Schedulers remain strict, just plain executors are lenient on shutdown now.
An early shutdown for executors can be enforced via setStrictEarlyShutdown.
Closes gh-32226
2024-02-11 21:33:53 +01:00
ce43d1b1da
Simplify logic in ApplicationContextAwareProcessor.postProcessBeforeInitialization()
2024-02-10 15:46:38 +01:00
1080c145e3
Polish ApplicationContextAwareProcessor
2024-02-10 11:46:09 +01:00
3ecbc4de13
Polishing
2024-02-06 17:57:47 +01:00
9698dbc232
Add javadoc and rename merge method to mergeProperties
...
See gh-32118
2024-02-06 09:13:09 +01:00
c559ec4dfb
Refactor ReloadableResourceBundleMessageSource
...
This change allows subclasses to reuse collecting and merging
algorithm when overriding getMergedProperties method.
2024-02-06 08:23:51 +01:00
3d4d68c26f
Run listener/send task locally as fallback on RejectedExecutionException
...
Closes gh-32171
2024-02-01 11:07:02 +01:00
db535863dd
Consistently use class literals for primitive types
...
To improve consistency and avoid confusion regarding primitive types
and their wrapper types, this commit ensures that we always use class
literals for primitive types.
For example, instead of using the `Void.TYPE` constant, we now
consistently use `void.class`.
2024-01-30 15:26:12 +01:00
005d5ef922
Polishing
2024-01-29 16:53:35 +01:00
5dc26460fb
Eagerly initialize ZERO_NANOS constant
2024-01-29 16:48:08 +01:00
969b18b0e8
Polishing
2024-01-29 15:25:43 +01:00
08e6df8832
Revise shutdown phase log message and executor shutdown documentation
...
Closes gh-32109
2024-01-29 13:03:20 +01:00
a738e4d5fd
Explicit documentation note on cron-vs-quartz parsing convention
...
Closes gh-32128
2024-01-29 13:02:43 +01:00
2e56361fe4
Simplify implementation of internal VariableNotAvailableException
...
Since VariableNotAvailableException is not a public type, there is no
need to store the variable name in a field/property.
2024-01-28 17:05:30 +01:00
0e45f4cec4
Polishing
2024-01-26 11:08:58 +01:00
c6121da151
Polishing
2024-01-24 22:30:33 +01:00
c5a75219ce
Compare qualifier value arrays with equality semantics
...
Closes gh-32106
2024-01-24 22:30:28 +01:00
6bd7f0231d
Avoid double exists() call for common resource resolution
...
See gh-30369
See gh-18990
2024-01-22 13:40:51 +01:00
5856d2e54e
Polish contribution
...
See gh-32069
2024-01-21 16:27:59 +01:00
a8fa98e2a6
Remove unnecessary semicolons in enum declarations
...
Closes gh-32069
2024-01-21 16:25:36 +01:00
00bda65848
Polishing
2024-01-19 17:09:58 +01:00
f5b0d9509d
Polish
2024-01-17 18:41:15 +01:00
0c42965fc3
Polish
2024-01-15 11:17:19 +01:00
c4831d2586
Document that Conditions can be ordered
...
Closes gh-32019
2024-01-12 16:30:24 +01:00
e4569defd9
Polish Javadoc for Condition
2024-01-12 16:24:20 +01:00
4d11307b84
Polishing
2024-01-09 11:55:04 +01:00
785598629a
Make max length of SpEL expressions in an ApplicationContext configurable
...
This commit introduces support for a Spring property named
`spring.context.expression.maxLength`. When set, the value of that
property is used internally in StandardBeanExpressionResolver to
configure the SpelParserConfiguration used when evaluating String
values in bean definitions, @Value, etc.
Closes gh-31952
2024-01-09 11:15:32 +01:00
37fa82c578
Lenient rejectedValue lookup in SpringValidatorAdapter
...
Closes gh-29043
2024-01-08 16:39:53 +00:00
1f2d29ee08
Polish
2024-01-08 17:12:33 +01:00
8552e149b5
Improve method validation for container elements
...
This change moves container element properties from ParameterErrors
to base class ParameterValidationResult, and makes that support
independent of whether violations are nested within a container
element bean or through constraints on container elements, e.g.
`List<@NotBlank String>`.
Closes gh-31887
2024-01-05 16:32:14 +00:00
9912a52bb8
Avoid getMostSpecificMethod resolution for non-annotated methods
...
This is aligned with AutowiredAnnotationBeanPostProcessor now.
Closes gh-31967
2024-01-07 16:33:49 +01:00
419e34e571
Introduce getMostSpecificMethod variant on BridgeMethodResolver
...
This is able to resolve the original method even if no bridge method has been generated at the same class hierarchy level (a known difference between the Eclipse compiler and regular javac).
Closes gh-21843
2024-01-07 16:33:06 +01:00
f6b36a689a
Introduce processInjection() in CommonAnnotationBeanPostProcessor
...
To align with the existing processInjection() method in
AutowiredAnnotationBeanPostProcessor, this commit introduces an analogous
method in CommonAnnotationBeanPostProcessor.
Closes gh-31956
2024-01-05 16:05:07 +01:00
Juergen Hoeller
Sam Brannen
Simon Baslé
ali dandach
Yanming Zhou
Patrick Strawderman
Stéphane Nicoll
Tadaya Tsuyukubo
Sébastien Deleuze
Andrei Bastun
mnhock
Juergen Hoeller
rstoyanchev