Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,604 Commits 18 Branches 0 Tags
20d27e4fb6e7ffcf81d04783ff1592515e2ee3e9
Commit Graph

3523 Commits

Author SHA1 Message Date
Juergen Hoeller
20d27e4fb6 Merge branch '6.0.x' 2023-08-14 15:14:58 +02:00
Juergen Hoeller
389238f622 Add registerReactiveTypeOverride method to ReactiveAdapterRegistry 
Closes gh-31047
 2023-08-14 15:14:22 +02:00
Juergen Hoeller
fd5b0e144d Reuse Reactive Streams 1.0.3 FlowAdapters for Flow.Publisher bridge 
See gh-31000
 2023-08-14 14:25:03 +02:00
Sam Brannen
bfeca4a0bf Polish contribution 
See gh-30744
 2023-08-13 17:03:12 +02:00
Adilson A
4979d8fded Increase code coverage in spring-core serializer package 
Closes gh-30744
 2023-08-13 16:26:02 +02:00
Sam Brannen
f9b6aed6b6 Polishing 
... for consistency with StandardAnnotationMetadata.
 2023-08-13 16:21:18 +02:00
Sam Brannen
156546ad05 Make AnnotationAttributes.validated field immutable 2023-08-13 13:43:27 +02:00
Sam Brannen
0b902f32f6 Support finding repeatable annotations in AnnotatedTypeMetadata 
AnnotatedTypeMetadata has various methods for finding annotations;
however, prior to this commit it did not provide explicit support for
repeatable annotations.

Although it is possible to craft a search "query" for repeatable
annotations using the MergedAnnotations API via getAnnotations(), that
requires intimate knowledge of the MergedAnnotations API as well as the
structure of repeatable annotations.

Furthermore, the bugs reported in gh-30941 result from the fact that
AnnotationConfigUtils attempts to use the existing functionality in
AnnotatedTypeMetadata to find repeatable annotations without success.

This commit introduces a getMergedRepeatableAnnotationAttributes()
method in AnnotatedTypeMetadata that provides dedicated support for
finding merged repeatable annotation attributes with full @AliasFor
semantics.

Closes gh-31041
 2023-08-12 18:49:08 +02:00
Sam Brannen
fb6c325cc0 Document @AliasFor support in AnnotatedTypeMetadata.getAnnotationAttributes() 
The Javadoc for getAnnotationAttributes() states that it supports
"attribute overrides on composed annotations"; however, it actually
supports @AliasFor in general, including attribute aliases within a
given annotation.

This commit updates the Javadoc and corresponding tests to reflect that.

Closes gh-31042
 2023-08-12 18:09:37 +02:00
Sam Brannen
c52bfc0586 Update test names to reflect status quo 
AnnotationMetadataReadingVisitor was replaced by
SimpleAnnotationMetadata in Spring Framework 5.2.
 2023-08-12 18:09:37 +02:00
Sam Brannen
a33b14338f Polishing annotation processing internals 2023-08-12 15:41:48 +02:00
Juergen Hoeller
8973d1ad8a Polishing 2023-08-08 20:10:23 +02:00
Johnny Lim
7f561fb53d Polish AbstractReflectionParameterNameDiscovererKotlinTests 
See gh-30904
 2023-08-08 10:23:07 +02:00
Juergen Hoeller
c4896aca9b Defensively register Flow bridge in delegate class 
See gh-31000
 2023-08-08 09:52:42 +02:00
Juergen Hoeller
3b093754c8 Rename getLastTaskInfo to lastTaskInfo (aligned with currentTaskName) 
See gh-25803
 2023-08-08 09:41:00 +02:00
Juergen Hoeller
8e16e5ea35 Revise StopWatch for flexible time units in nanosecond precision 
Closes gh-25803
 2023-08-08 01:48:58 +02:00
Juergen Hoeller
dedb58f7ed Defensively register default adapters behind Reactive Streams guard 
See gh-31000
 2023-08-07 20:48:10 +02:00
Sam Brannen
f4b5738869 Polishing 2023-08-07 17:51:37 +03:00
Sam Brannen
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, this commit switches
to componentType() for consistent API usage style.
 2023-08-07 12:43:40 +03:00
Sam Brannen
fe5560400c Use Class#arrayType() where feasible 
Closes gh-31002
 2023-08-07 12:07:46 +03:00
Juergen Hoeller
3804b1c602 Merge branch '6.0.x' 
# Conflicts:
#	spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
#	spring-core/src/main/java/org/springframework/core/ReactiveAdapterRegistry.java
#	spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/R2dbcTransactionManagerUnitTests.java
 2023-08-06 14:26:55 +02:00
Juergen Hoeller
6e5af9dccb Polishing 2023-08-06 14:25:39 +02:00
Juergen Hoeller
40b33bca59 Compatibility with Flow-based SmallRye Mutiny 2 at runtime 
Includes simple Flow.Publisher bridge without Reactor.

Closes gh-31000
 2023-08-06 14:04:24 +02:00
ali dandach
6dbd684279 Optimize collection usage in CGLIB fork 
Closes gh-30993
 2023-08-05 16:18:09 +03:00
Sam Brannen
14911fb32f Merge branch '6.0.x' 2023-08-05 10:28:32 +03:00
Sam Brannen
4a81814dbb Check exception cause for @PropertySource(ignoreResourceNotFound) support 
Prior to this commit, the ignoreResourceNotFound flag in
@PropertySource was ignored by PropertySourceProcessor if a
PropertySourceFactory threw an exception which wrapped an exception
that would otherwise be ignored -- for example, a FileNotFoundException.

To address this issue, this commit updates PropertySourceFactory so
that it catches RuntimeException and IOException and then checks if the
exception or its cause is an "ignorable" exception in terms of
ignoreResourceNotFound semantics.

Closes gh-22276
 2023-08-05 10:19:43 +03:00
Sam Brannen
1451f30781 Polish PropertySourceProcessor 2023-08-05 10:19:43 +03:00
Sam Brannen
4b54ca46d3 Polish PropertySourceDescriptor 2023-08-05 10:19:43 +03:00
Sam Brannen
b80872b762 Polishing 2023-08-04 13:52:14 +03:00
Juergen Hoeller
4e863c5a75 Merge branch '6.0.x' 2023-08-04 02:40:17 +02:00
Juergen Hoeller
18966d048c Consistent equals/hashCode style (and related polishing) 2023-08-04 02:39:31 +02:00
Philippe Marschall
4922e0e439 Give spring-core access to org.jboss.vfs for VfsUtils support on WildFly 
This commit gives spring-core access to the org.jboss.vfs module to make
VfsUtils work out of the box on WildFly 28+.

Closes gh-30973
 2023-08-02 09:45:28 +03:00
Juergen Hoeller
d250a5155a Consistent dependency declarations 2023-08-02 00:56:50 +02:00
Sam Brannen
bd23798323 Polish Javadoc for PropertySourceDescriptor 2023-08-03 14:33:53 +03:00
Sam Brannen
aa10d23de4 Merge branch '6.0.x' 2023-08-02 09:48:42 +03:00
Juergen Hoeller
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
Sam Brannen
db8fa4d505 Polish DataSize 2023-08-01 11:20:40 +03:00
Sam Brannen
525621c4d8 Polish contribution 
See gh-30710
 2023-08-01 11:19:54 +03:00
Patrick Strawderman
01e90bbd0e Use Long.parseLong(CharSequence,...) to avoid intermediate String creation 
Where possible, switch to the Long.parseLong variant that accepts a
start and end index for the supplied CharSequence, thus avoiding making
unnecessary copies of the String input.

Closes gh-30710
 2023-08-01 10:53:30 +03:00
Sam Brannen
170d6bfdad Clean up warnings in tests 2023-07-31 16:17:48 +03:00
Sam Brannen
2f7046f572 Deprecate org.springframework.core.Constants utility 
Closes gh-30851
 2023-07-31 16:08:47 +03:00
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
bbde68c49e Polishing 2023-07-25 19:12:07 +02: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
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