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
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
01ceee8de5 Polishing 2023-07-15 13:36:11 +02:00
Sam Brannen
0611192dac Enable KotlinScriptTemplateTests in Spring MVC on Java 20 
See gh-29249
Closes gh-30896
 2023-07-15 13:36:11 +02:00
Johnny Lim
be8bfad3af Enable KotlinScriptTemplateTests in Spring WebFlux on Java 20 
See gh-29249
Closes gh-30896
 2023-07-15 13:35:59 +02:00
Sam Brannen
63fe45d92a Update copyright headers 2023-07-15 13:11:29 +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
Sam Brannen
680769d770 Remove obsolete private constant 2023-07-15 13:04:50 +02:00
Sam Brannen
70cf754a2f Suppress warnings in tests 2023-07-15 13:02:16 +02:00
Sam Brannen
e6d360c1c6 Polishing 2023-07-15 12:58:18 +02:00
Sam Brannen
8629182822 Suppress deprecation warnings in tests 2023-07-15 12:16:38 +02:00
Juergen Hoeller
37ac3d8764 Merge branch '6.0.x' 2023-07-14 16:44:26 +02:00
Stephane Nicoll
d61b9c6294 Merge pull request #22769 from lgxbslgx 
* pr/22769:
  Polish "Evaluate key only if necessary"
  Evaluate key only if necessary

Closes gh-22769
 2023-07-14 14:43:18 +02:00
Stephane Nicoll
d8854a2f3f Polish "Evaluate key only if necessary" 
See gh-22769
 2023-07-14 14:43:04 +02:00
liguoxiong
806c83591c Evaluate key only if necessary 
Prior to this commit a @CachePut operation would fail if the key
expression is invalid, but guarded with an unless condition as the
former was evaluated too early. This commit makes sure that key for
a put is only evaluated if the put operation is active.

Note that this does not apply for @Cacheable as the key needs to be
computed early to determine if a matching entry exists in the cache.

See gh-22769
 2023-07-14 14:43:04 +02:00
Juergen Hoeller
fd17df91fd Merge branch '6.0.x' 
# Conflicts:
#	spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
 2023-07-14 14:38:24 +02:00
Juergen Hoeller
384246c360 Polishing 2023-07-14 14:37:34 +02:00
Juergen Hoeller
e30391661d Document repeatable annotation semantics for @Scheduled 
Closes gh-23959
 2023-07-14 14:37:28 +02:00
Juergen Hoeller
519927421e Add support for configurable custom translator 
Closes gh-24634
 2023-07-14 14:17:20 +02:00
Juergen Hoeller
52c19272c6 Deprecate MBeanExporter's AUTODETECT constants 
Closes gh-30874
 2023-07-14 14:12:39 +02:00
Juergen Hoeller
0d5a7db238 Remove unused import 
See gh-30886
 2023-07-14 12:24:55 +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
6957ac5324 Trigger late commit in JmsResourceSynchronization.afterCompletion if necessary 
Closes gh-20817
 2023-07-14 11:50:31 +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
0ab94478fe Add since tags and code style refinements 
See gh-27735
 2023-07-14 11:48:37 +02:00
René Wittner
4b80b0f490 DataAccessUtils result accessors with Optional return value (#27735) 2023-07-14 11:37:09 +02:00
rstoyanchev
793581ebde Add ForwardedHeaderUtils 
Closes gh-30886
 2023-07-13 18:12:30 +01:00
Brian Clozel
cc7f3101b7 Upgrade to Context Propagation 1.1.0-M3 
Closes gh-30882
 2023-07-13 11:21:30 +02:00
Spring Builds
bddd3feb83 Next development version (v6.0.12-SNAPSHOT) 2023-07-13 08:37:04 +00:00
Arjen Poutsma
49c463b1d2 Polish RestClient request factories 
This commit changes the default request factory from the
SimpleClientHttpRequestFactory to the JdkClientHttpRequestFactory if
available. It also adds detection logic for OkHttp and Jetty.
 2023-07-13 09:24:21 +02:00
Juergen Hoeller
094eb3e236 Use varargs for array elements 
See gh-1850
 2023-07-13 00:55:35 +02:00
Juergen Hoeller
3fed2ec3a1 Add common SqlValue implementation for JDBC Array creation 
Closes gh-1850
 2023-07-13 00:28:32 +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
Juergen Hoeller
4152034799 Move transaction configuration check to transaction.annotation package 
AbstractTransactionManagementConfiguration.transactionalEventListenerFactory() creating a RestrictedTransactionalEventListenerFactory now.

See gh-30679
 2023-07-12 19:09:48 +02:00
rstoyanchev
3c9cfa8a0f Revise order of method declarations in WebFluxConfigurer 
See gh-30678
 2023-07-12 17:09:57 +01:00
rstoyanchev
b016f385e1 Add BlockingExecutionConfigurer to WebFlux config 
Closes gh-30678
 2023-07-12 16:55:02 +01:00
Stephane Nicoll
f40d1f2329 Merge branch '6.0.x' 2023-07-12 17:23:22 +02:00
Stephane Nicoll
4dc93bc485 Avoid ambiguous call with BeanInstanceSupplier#withGenerator 
Previously, BeanInstanceSupplier had three variants of the
`withGenerator` callback, one with a bi function, one with a function,
and with a supplier. This could lead to compilation failure when the
target type has a method with the same name and a number of arguments
that match another variant.

It turns out the supplier-based variant is only used a shortcut. This
commit deprecates it and update ghe code generation to use the function
instead.

Closes gh-29278
 2023-07-12 17:23:08 +02:00
Stephane Nicoll
f73f1e0687 Merge branch '6.0.x' 2023-07-12 17:22:44 +02:00
Stephane Nicoll
1b09ef5051 Avoid ambiguous call with BeanInstanceSupplier#withGenerator 
Previously, BeanInstanceSupplier had three variants of the
`withGenerator` callback, one with a bi function, one with a function,
and with a supplier. This could lead to compilation failure when the
target type has a method with the same name and a number of arguments
that match another variant.

It turns out the supplier-based variant is only used a shortcut. This
commit deprecates it and update ghe code generation to use the function
instead.

Closes gh-29278
 2023-07-12 16:40:22 +02:00
Juergen Hoeller
c1932dd307 Support for MultiValueMap elements in bean property paths 
Closes gh-26297
 2023-07-12 16:23:39 +02:00
Sébastien Deleuze
490ff0af5e Refine the log message printed after restoration 
Closes gh-30876
 2023-07-12 15:20:33 +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
Sam Brannen
2e3fbac9a0 Merge branch '6.0.x' 2023-07-12 10:36:21 +02:00
Sam Brannen
1edc0d8002 Remove outdated Javadoc cross references 2023-07-12 10:36:02 +02:00
Sam Brannen
18c11e84f3 Merge branch '6.0.x' 2023-07-12 10:34:43 +02:00