Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,548 Commits 18 Branches 0 Tags
3804b1c602a79283364d2e8afe320b6311a56513
Commit Graph

3429 Commits

Author SHA1 Message Date
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
Sam Brannen
bd23798323 Polish Javadoc for PropertySourceDescriptor 2023-08-03 14:33:53 +03: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
Juergen Hoeller
2f33e77ab4 Consistent equals/hashCode style (and related polishing) 2023-07-19 00:35:19 +02:00
Juergen Hoeller
c504ac5a47 Merge branch '6.0.x' 2023-07-18 12:57:18 +02:00
Juergen Hoeller
616f728afa MethodIntrospector handles overriding bridge method correctly 
Closes gh-30906
 2023-07-18 12:54:59 +02:00
Sam Brannen
2ba9939bd8 Revise changes to DefaultGenerationContext and GeneratedClasses 
In order to reduce the surface area of published APIs in the affected
classes, this commit:

- Reverts the changes made to GeneratedClasses in c354b1014d.

- Reverts the changes made to DefaultGenerationContext in a28ec3a0a8.

- Makes the DefaultGenerationContext(DefaultGenerationContext, String)
  constructor protected.

- Reworks the internals of TestContextGenerationContext to align with
  the above changes.

See gh-30861
Closes gh-30895
Closes gh-30897
 2023-07-15 14:43:39 +02:00
Juergen Hoeller
3a278cc66d Polishing 2023-07-15 14:20:00 +02:00
Juergen Hoeller
6183f06846 Cache DependencyDescriptor per autowired constructor argument 
Aligned with shortcut handling in AutowiredAnnotationBeanPostProcessor.
Includes minor MethodInvoker optimization for pre-resolved targetClass.

Closes gh-30883
 2023-07-15 14:17:52 +02:00
Sam Brannen
a34f9fa66c Update copyright headers 2023-07-15 13:10:46 +02:00
Sam Brannen
c354b1014d Make GeneratedClasses#withFeatureNamePrefix(String) public 
See gh-30861
Closes gh-30897
 2023-07-15 12:01:56 +02:00
Sam Brannen
a28ec3a0a8 Make DefaultGenerationContext(<classes>,<files>,<hints>) constructor protected 
See gh-30861
Closes gh-30895
 2023-07-15 12:01:49 +02:00
Juergen Hoeller
0d8a8432d1 Upgrade to ASM master (including early support for Java 22 bytecode) 
Closes gh-30845
 2023-07-17 21:17:15 +02:00
Sam Brannen
889fca98ac Merge branch '6.0.x' 2023-07-15 14:45:52 +02:00
Juergen Hoeller
351a200747 Merge branch '6.0.x' 2023-07-15 14:21:05 +02:00
Sam Brannen
5ce8ffd197 Merge branch '6.0.x' 2023-07-15 13:11:03 +02:00
Sam Brannen
56c7b4065d Merge branch '6.0.x' 2023-07-15 13:09:12 +02:00
Juergen Hoeller
064cd3b7af Merge branch '6.0.x' 
# Conflicts:
#	gradle.properties
#	spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
 2023-07-14 12:18:41 +02:00
Juergen Hoeller
75f5dac16b Polishing 2023-07-14 12:16:37 +02:00
Juergen Hoeller
d24c131130 Expose convert(Object, TypeDescriptor) in ConversionService interface 
Closes gh-25394
 2023-07-14 11:49:26 +02:00
Juergen Hoeller
357d5b4e6e Merge branch '6.0.x' 2023-07-12 19:23:26 +02:00
Juergen Hoeller
c873a597c7 Polishing 2023-07-12 19:21:44 +02:00
Sam Brannen
16b9640af2 Merge branch '6.0.x' 2023-07-12 11:50:11 +02:00
Sam Brannen
68f2b0ca59 Rely on auto-boxing in tests 2023-07-12 11:49:02 +02:00
Juergen Hoeller
3a481a7d7f Merge branch '6.0.x' 2023-07-11 18:02:25 +02:00
Juergen Hoeller
f19433f2d8 Polishing 2023-07-11 18:01:07 +02:00
Juergen Hoeller
e2b24f3c12 Improve diagnostics for LinkageError in case of ClassLoader mismatch 
Closes gh-25940
 2023-07-11 17:50:44 +02:00