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

27204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
ddc3cf301a Merge branch '6.0.x' 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
 2023-07-07 13:51:08 +02:00
Juergen Hoeller
35c7e3960e Polishing 2023-07-07 13:46:57 +02:00
Juergen Hoeller
8e8c3f5a7c Polishing 2023-07-07 13:14:40 +02:00
Juergen Hoeller
b12115b61f Sophisticated lifecycle support for ThreadPoolTaskExecutor/Scheduler 
Pause/resume capability through SmartLifecycle implementation.
ContextClosedEvent triggers early executor/scheduler shutdown.
Programmatic initiateShutdown() option for custom early shutdown.

Closes gh-30831
Closes gh-27090
Closes gh-24497
 2023-07-07 13:04:52 +02:00
Sébastien Deleuze
029a69f5c1 Upgrade to Kotlin Coroutines 1.7.2 
Closes gh-30833
 2023-07-07 11:44:03 +02:00
Sébastien Deleuze
80d1f12324 Upgrade to Kotlin 1.9.0 
Closes gh-30719
 2023-07-07 11:43:02 +02:00
Sam Brannen
e906eac049 Update regarding Antora, etc. 2023-07-07 11:18:43 +02:00
Sam Brannen
32aa9e4b63 Update links 2023-07-07 11:00:53 +02:00
Sam Brannen
7162faaa4d Merge branch '6.0.x' 2023-07-06 17:30:02 +02:00
Sam Brannen
f50b230fb3 Emphasize that a ContextCustomizer must implement equals() and hashCode() 2023-07-06 17:28:24 +02:00
Sam Brannen
1901b708b2 Merge branch '6.0.x' 2023-07-06 17:21:49 +02:00
Sam Brannen
02ba06953f Polish grammar and formatting 2023-07-06 17:21:30 +02:00
Sam Brannen
d86750372a Improve Javadoc for @Configuration 2023-07-06 17:13:37 +02:00
Brian Clozel
3a0e5c8894 Merge branch '6.0.x' 2023-07-06 17:12:05 +02:00
Brian Clozel
df22ba39f8 Warn against direct usage of Servlet API in WebFlux apps 
Closes gh-28872
 2023-07-06 17:11:24 +02:00
Arjen Poutsma
cf008eb9b1 Revert "Follow redirects in JdkClientHttpRequestFactory" 
This reverts commit 7c37f4bc51.
 2023-07-06 15:53:35 +02:00
Sam Brannen
0bf85af8e9 Merge branch '6.0.x' 
# Conflicts:
#	framework-docs/modules/ROOT/pages/integration/observability.adoc
#	spring-core/src/test/java/org/springframework/core/convert/converter/DefaultConversionServiceTests.java
 2023-07-06 14:11:24 +02:00
Sam Brannen
826776f321 Improve assertions in DefaultConversionServiceTests 
Specifically, we now check the actual type of a converted collection in
various assertions to ensure that converters adhere to their contracts.
 2023-07-06 14:01:26 +02:00
Arjen Poutsma
78bb66b0f2 Reduce flushes in FormHttpMessageConverter 
Before this commit, each part written by the FormHttpMessageConverter
would typically end with a flush, which reduced performance.
 2023-07-06 13:49:57 +02:00
Sam Brannen
29f92c8a2b Polish observability docs 2023-07-06 13:27:20 +02:00
Brian Clozel
246135364c Merge branch '6.0.x' 2023-07-06 13:09:58 +02:00
Brian Clozel
64e04b7bc2 Document limitations of Servlet Filter observations 
This commit documents the fact that the Servlet Filter based
observations for MVC applications is limited by the Servlet Filter
contract in the first place. All processing and logging that happens
outside of the scope of the filter is not observed.
Log statements from the catalina engine (in the case of Tomcat), or any
container-specific infrastructure, is not covered by the
instrumentation.

Closes gh-29398
 2023-07-06 13:09:41 +02:00
Sam Brannen
468ef7a618 Merge branch '6.0.x' 2023-07-06 12:27:47 +02:00
Sam Brannen
ad05b02ff5 Update Javadoc for ObjectUtils.nullSafeConciseToString() 
See gh-30810
 2023-07-06 12:26:47 +02:00
Arjen Poutsma
68b5eedde1 Change OutputStreamPublisher default chunk size 
This commit set the default chunk size to 1024 (from 8192).
 2023-07-06 12:01:24 +02:00
Arjen Poutsma
3d2befc84a Rearrange HttpHeaders adapters 
This commit moves HttpHeaders that are used in multiple places (client
and server, reactive and non-reactive) to a new, separate http.support
package.

Closes gh-30823
 2023-07-06 11:00:26 +02:00
Brian Clozel
8e9528de13 Merge branch '6.0.x' 2023-07-06 09:40:13 +02:00
Brian Clozel
430a24e6bc Further document ShallowEtagHeaderFilter limitations 
This commit improves the documentation for the
`ShallowEtagHeaderFilter`, stating that it is only meant to support a
subset of conditional HTTP requests: GET requests with "If-None-Match"
headers. Other headers and state changing HTTP methods are not supported
here, as the filter only operates on the content of the response and has
no knowledge of the resource being served.

Closes gh-30517
 2023-07-06 09:39:57 +02:00
Juergen Hoeller
0c8d3e70cf Prefer ArrayList for Collection when source is an array 
Closes gh-28048
 2023-07-05 20:23:17 +02:00
Juergen Hoeller
47e631d5ff Merge branch '6.0.x' 2023-07-05 20:15:53 +02:00
Juergen Hoeller
b7b9f2cb6b Expand tests for array to Collection/Set/List interface 
See gh-28048
 2023-07-05 20:15:10 +02:00
Sam Brannen
e86003b692 Merge branch '6.0.x' 2023-07-05 17:02:35 +02:00
Sam Brannen
b76664e757 Support arrays, collections, & maps in ObjectUtils.nullSafeConciseToString() 
Prior to this commit, there was no explicit support for arrays,
collections, and maps in nullSafeConciseToString(). This lead to string
representations such as the following, regardless of whether the array,
collection, or map was empty.

- char[]@1623b78d
- java.util.ImmutableCollections$List12@74fe5c40
- java.util.ImmutableCollections$MapN@10e31a9a

This commit introduces explicit support for arrays, collections, and
maps in nullSafeConciseToString(), which results in the following
empty/non-empty string representations.

- array: {} / {...}
- collection: [] / [...]
- map: {} / {...}

The reason a string representation of an array uses "{}" instead of
"[]" (like in Arrays.toString(...)) is that
ObjectUtils.nullSafeToString(<array>) already follows that convention,
and the implementation of nullSafeConciseToString() aligns with that
for the sake of consistency.

Closes gh-30810
 2023-07-05 17:01:01 +02:00
Sam Brannen
f6218cadd7 Merge branch '6.0.x' 2023-07-05 15:33:26 +02:00
Sam Brannen
ae13823851 Polishing 2023-07-05 15:33:15 +02:00
Sam Brannen
368a917466 Polish RestClient, etc. 2023-07-05 15:22:27 +02:00
Arjen Poutsma
a6c5692586 Make OutputStreamPublisher more generic 
This commit improves the OutputStreamPublisher so that it is capable
of publishing other types that ByteBuffers.
 2023-07-05 15:20:43 +02:00
Sam Brannen
d0a2820af4 Polish AnnotatedMethod 2023-07-05 14:46:19 +02:00
Sam Brannen
299b86bae3 Merge branch '6.0.x' 2023-07-05 14:02:49 +02:00
Sam Brannen
58b4286216 Polish MockHttpServletRequest 2023-07-05 13:59:47 +02:00
Sam Brannen
df079feea9 Update copyright header 2023-07-05 13:48:13 +02:00
Patrick Strawderman
372282457f Use Collections.emptyEnumeration() where appropriate 
Closes gh-30803
 2023-07-05 13:47:11 +02:00
Juergen Hoeller
1218e65ca1 Merge branch '6.0.x' 2023-07-05 12:53:07 +02:00
Juergen Hoeller
79df1da792 Clarify ReactiveTransactionManager exception declarations 
Avoid misleading "throws TransactionException" declarations but preserve javadoc "@throws" notes for specific exceptions (with reactive propagation semantics).

Closes gh-30817
 2023-07-05 12:51:45 +02:00
Juergen Hoeller
c5771bc7c8 Discuss JdbcTransactionManager vs DataSourceTransactionManager 
Includes doc update for 6.0 default exception translation etc.

Closes gh-30802
 2023-07-05 12:51:10 +02:00
Arjen Poutsma
496155525c Allow built ServerResponse to throw exception 
This commit ensures that ServerResponse.HeadersBuilder::build can throw
an exception, by introducing a separate functional interface that does
allow for exceptions to be thrown.

Closes gh-30818
 2023-07-05 12:01:55 +02:00
Arjen Poutsma
7c37f4bc51 Follow redirects in JdkClientHttpRequestFactory 
Make sure we follow redirects in the default HttpClient created by
JdkClientHttpRequestFactory, similar toSimpleClientHttpRequestFactory.
 2023-07-05 11:08:41 +02:00
Arjen Poutsma
6793edc349 Increase Jetty read timeout to 10 seconds 2023-07-05 10:34:20 +02:00
Juergen Hoeller
1777e7f3b7 Merge branch '6.0.x' 
# Conflicts:
#	spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
#	spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java
 2023-07-04 21:40:11 +02:00
Juergen Hoeller
2365581265 Upgrade to HSQLDB 2.7.2 and WebJars Locator 0.53 2023-07-04 21:35:37 +02:00