57f675c537
Allow @Bean method to override scanned class matching its return type
...
Closes gh-31052
2023-08-15 13:55:57 +02:00
443e3d5fa6
Polishing
2023-08-14 19:48:32 +02:00
45c20e34e4
Merge branch '6.0.x'
...
# Conflicts:
# spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
2023-08-14 19:29:14 +02:00
2ce75dc415
Polishing
2023-08-14 19:28:19 +02:00
9c74c25961
Support for resource patterns in @PropertySource locations
...
Closes gh-21325
2023-08-14 19:16:52 +02:00
1a05ba3215
Polishing
2023-08-13 12:18:26 +02:00
3bda2b7124
Find all @ComponentScan and @PropertySource annotations
...
Prior to this commit, Spring failed to find multiple composed
@ComponentScan and @PropertySource annotations or multiple
@ComponentScans and @PropertySources container annotations. The reason
was due to lacking support in the AnnotatedTypeMetadata API.
This commit introduces support for finding all @ComponentScan and
@PropertySource annotations by making use of the new
getMergedRepeatableAnnotationAttributes() method in
AnnotatedTypeMetadata.
Closes gh-30941
See gh-31041
2023-08-13 11:33:32 +02:00
a33b14338f
Polishing annotation processing internals
2023-08-12 15:41:48 +02:00
f516431260
Merge branch '6.0.x'
2023-08-09 23:54:30 +02:00
d254bff197
Polishing
2023-08-09 23:53:40 +02:00
6fc5a78252
Cancel without interruption of currently running tasks
...
Leave potential interruption up to scheduler shutdown.
Closes gh-31019
2023-08-09 23:53:35 +02:00
8e16e5ea35
Revise StopWatch for flexible time units in nanosecond precision
...
Closes gh-25803
2023-08-08 01:48:58 +02:00
f4b5738869
Polishing
2023-08-07 17:51:37 +03:00
21a007bb15
Fix misspelling of applicationListenerDectector variable
...
Closes gh-31006
2023-08-07 16:14:55 +02:00
d3d414c3c7
Reject @Bean method with void return type
...
Closes gh-31007
2023-08-07 15:00:08 +02:00
526fc391ee
Use Class#componentType() for consistency with arrayType()
...
Java 12 introduced java.lang.Class#componentType() as a shortcut for
getComponentType().
Since we started using arrayType() in fe5560400c
2023-08-07 12:43:40 +03:00
6e5af9dccb
Polishing
2023-08-06 14:25:39 +02:00
eaf54b54c3
Detect illegal bean definition override during classpath scanning
...
Closes gh-25952
2023-08-06 14:03:29 +02:00
c596ff5c38
Log warn message with specific guidance in BeanPostProcessorChecker
...
Closes gh-24092
2023-08-06 14:03:12 +02:00
376f13f8ef
Update copyright headers
2023-08-04 15:02:41 +03:00
4e863c5a75
Merge branch '6.0.x'
2023-08-04 02:40:17 +02:00
18966d048c
Consistent equals/hashCode style (and related polishing)
2023-08-04 02:39:31 +02:00
f7c3e6480a
Merge branch '6.0.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
2023-08-04 00:49:20 +02:00
7e6612a920
Sort multiple @Autowired methods on same bean class via ASM
...
Closes gh-30359
2023-08-04 00:47:18 +02:00
4b6fabbd2f
Polishing
2023-08-03 18:10:13 +02:00
84b3335e71
Apply array editor to collection of same element type as well
...
Closes gh-24845
2023-08-03 17:55:54 +02:00
c3e18bc173
Retain metadata during bean creation even with cacheBeanMetadata=false
...
Closes gh-23795
Closes gh-25749
2023-08-03 17:55:47 +02:00
c942c04aa0
Support resource bundle custom file extensions
...
This commit allows to configure custom file
extensions in ReloadableResourceBundleMessageSource
thanks to a new setFileExtensions setter.
Combined with setPropertiesPersister, it allows
custom implementations supporting any kind of
property file.
Closes gh-18990
2023-08-03 14:29:29 +02:00
d250a5155a
Consistent dependency declarations
2023-08-02 00:56:50 +02:00
52176edcbf
Polishing
2023-08-02 00:06:49 +02:00
ae279eaced
Polishing
2023-08-01 23:52:48 +02:00
3b1af692cc
Merge branch '6.0.x'
...
# Conflicts:
# spring-beans/spring-beans.gradle
# spring-context/spring-context.gradle
# spring-orm/spring-orm.gradle
# spring-test/spring-test.gradle
# spring-web/spring-web.gradle
# spring-webflux/spring-webflux.gradle
2023-08-02 01:04:31 +02:00
b9ae996dfc
Merge branch '6.0.x'
...
# Conflicts:
# spring-context/spring-context.gradle
# spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
# spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
# spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
# spring-test/spring-test.gradle
# spring-webmvc/spring-webmvc.gradle
2023-08-02 00:16:55 +02:00
450cc212a2
Support for transactional listeners with reactive transactions
...
TransactionalApplicationListener and TransactionalEventListener automatically detect a reactive TransactionContext as the event source and register the synchronization accordingly. TransactionalEventPublisher is a convenient delegate for publishing corresponding events with the current TransactionContext as event source. This can also serve as a guideline for similar reactive event purposes.
Closes gh-27515
Closes gh-21025
Closes gh-30244
2023-08-01 23:27:38 +02:00
a9d100eeee
Support for always executing specific listeners in original thread
...
See gh-30244
2023-08-01 23:26:35 +02:00
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
abbea39855
Polishing
2023-07-27 21:47:54 +02:00
ce80637891
Add option for graceful shutdown (setTaskTerminationTimeout)
...
See gh-30956
2023-07-27 21:39:58 +02:00
7681200ee7
Introduce SimpleAsyncTaskScheduler (extending SimpleAsyncTaskExecutor)
...
Closes gh-30956
2023-07-26 23:56:59 +02:00
3437e61f98
Merge branch '6.0.x'
2023-07-26 12:08:20 +02:00
2573ba4a50
Polishing
2023-07-26 12:07:11 +02:00
bbde68c49e
Polishing
2023-07-25 19:12:07 +02:00
67e3d86bd8
Support declarativeBinding mode in DataBinder
...
Closes gh-30948
2023-07-25 18:04:21 +03:00
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
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
021161ea38
Make bean property method accessible as well (for non-public types)
...
See gh-19877
2023-07-25 18:10:43 +02:00
4786e2bf53
Introduce PREFERRED_CONSTRUCTORS_ATTRIBUTE on AbstractBeanDefinition
...
Closes gh-30917
2023-07-22 16:06:14 +02:00
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
4ce1ac0dcb
Polishing
2023-07-21 20:36:43 +02:00
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
Sam Brannen
xumengqi
Sébastien Deleuze
rstoyanchev