424e28bc35
Merge branch '5.2.x' into master
2020-10-15 17:18:33 +01:00
4952336419
Polishing contribution
...
See gh-25856
2020-10-15 17:14:27 +01:00
babcbd0d2b
Simplify code for SimpleClientHttpRequestFactory.prepareConnection
2020-10-15 17:14:27 +01:00
c45b106d95
Fix race issue and improve readAsynchronousFileChannel
...
Before this commit, ReadCompletionHandler delayed closing the channel
to allow an ongoing read to complete/fail so we can get a hold of the
associated DataBuffer and release it. This can be problematic since the
read take time to complete but even more importantly there was a race
condition where we didn't check if we've been disposed concurrently
while releasing the read flag.
This commit removes the delay and closes the channel immediately from
cancel() and that should in turn fail any ongoing read operation,
according to AsynchronousChannel, and the DataBuffer is released.
Further improvements include:
- combining the "reading" and "disposed" AtomicBoolean's into a
single "state" AtomicReference.
- an optimistic check to remain in READING mode and avoid state
switches when there is demand to continue reading.
Closes gh-25831
2020-10-15 17:10:22 +01:00
b7d1bbb991
Configure Concourse release pipeline
...
Closes gh-25911
2020-10-15 18:06:37 +02:00
603a1dd319
Upgrade to Concourse Release Scripts 0.2.1
...
This release fixes a bug where Spring Boot specifics were baked in the
application itself.
2020-10-15 18:02:32 +02:00
6b978cb5dc
Refactor Concourse pipeline
...
Extract duplicate snippets as document anchors.
2020-10-15 18:02:00 +02:00
b79548d12e
Add notes regarding enclosing test configuration inheritance
...
See gh-25912
2020-10-15 16:23:29 +02:00
f9e11593a6
Document @NestedTestConfiguration support in reference manual
...
See gh-25912
2020-10-15 16:04:59 +02:00
57ac32b808
Upgrade to Gradle 6.7
...
Closes gh-25918
2020-10-15 13:48:50 +02:00
2eee56d0e2
Polish TestPropertySourceUtils
2020-10-14 15:03:22 +02:00
a271a0a2bf
Ignore @NestedTestConfiguration on enclosing class for nested interface
...
Closes gh-25917
2020-10-14 14:21:25 +02:00
69af56c4e9
Polish MetaAnnotationUtils
2020-10-14 14:21:13 +02:00
a924677b49
Document @NestedTestConfiguration support in reference manual
...
See gh-25912
2020-10-14 11:04:46 +02:00
7e647ab1d8
HttpHeadResponseDecorator sets Content-Length for Mono only
...
See gh-25908
2020-10-13 23:45:51 +01:00
abd79d43af
Merge branch '5.2.x' into master
2020-10-13 23:42:43 +01:00
431ec906c4
Ensure buffers released in HttpHeadResponseDecorator
...
See gh-25908
2020-10-13 23:38:59 +01:00
1d96f6a266
HttpHeaderResponseDecorator checks for "Transfer-Encoding"
...
This commit extends the fix from b86c11cc9b
2020-10-13 23:06:06 +01:00
e5ae2cb0fe
Support Propagation.NEVER for disabling test-managed transactions
...
Prior to this commit only Propagation.NOT_SUPPORTED was supported for
disabling test-managed transactions via the `propagation` attribute of
`@Transactional`.
This commit allows users to specify Propagation.NOT_SUPPORTED or
Propagation.NEVER to disable test-managed transactions.
Closes gh-25909
2020-10-13 18:30:50 +02:00
33fcba55d1
Disable KotlinPropertyResolverExtensionsTests for now
...
Those tests produce intermittent build errors.
2020-10-13 16:19:01 +02:00
3ed8813bbf
Upgrade to Coroutines 1.4.0-M1 and use awaitSingle()
...
This commit raises the minimum Coroutines version supported
to 1.4.0-M1 and above, and changes usages of awaitFirst() or
awaitFirstOrNull() to awaitSingle() or awaitSingleOrNull()
to fix gh-25007.
Closes gh-25914
Closes gh-25007
2020-10-13 15:26:39 +02:00
cd835b3124
Merge branch '5.2.x'
...
# Conflicts:
# spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
# spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
2020-10-13 11:35:36 +02:00
7b6293fa05
Avoid outdated Jackson API in tests
...
See gh-25907
2020-10-13 11:13:54 +02:00
a6e48811c0
Compatibility with Jackson 2.12 (tested against 2.12.0-rc1)
...
Closes gh-25907
2020-10-13 11:04:55 +02:00
4a608e97dc
Cross reference @NestedTestConfiguration and supported annotations
...
See gh-19930
2020-10-13 10:35:51 +02:00
74c2df43cc
Improve Javadoc for @NestedTestConfiguration
...
See gh-19930
2020-10-13 09:58:07 +02:00
2934a823ed
Suppress deprecation warnings in MvcNamespaceTests
2020-10-13 09:44:42 +02:00
379d9167d9
Merge branch '5.2.x'
...
# Conflicts:
# build.gradle
2020-10-13 01:41:48 +02:00
cd7e5f61f0
Upgrade to Caffeine 2.8.6 and OpenPDF 1.3.22
2020-10-13 01:39:42 +02:00
06b6a4be16
Polishing
2020-10-13 01:39:12 +02:00
e9cd37a4ee
Merge branch '5.2.x'
...
# Conflicts:
# spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
2020-10-13 00:25:04 +02:00
f3f19504c6
Polishing
2020-10-13 00:21:07 +02:00
72b2dda17f
Avoid creation of unused logger instance in AbstractMediaTypeExpression
...
Closes gh-25901
2020-10-13 00:20:06 +02:00
0af09e076b
Make default @NestedTestConfiguration mode configurable
...
Prior to this commit, the EnclosingConfiguration mode used in
conjunction with @NestedTestConfiguration defaulted to INHERIT.
In other to allow development teams to change the default to OVERRIDE
(e.g., for compatibility with Spring Framework 5.0 through 5.2), this
commit introduces support for changing the default EnclosingConfiguration
mode globally via a JVM system property or via the SpringProperties
mechanism.
For example, the default may be changed to
EnclosingConfiguration.OVERRIDE by supplying the following JVM system
property via the command line.
-Dspring.test.enclosing.configuration=override
Closes gh-19930
2020-10-13 00:12:52 +02:00
7f365942a5
Nullability refinements and related polishing
2020-10-13 00:08:15 +02:00
1b63c31722
Avoid creation of unnecessary logger instances in web request abstraction
...
Closes gh-25900
2020-10-13 00:06:38 +02:00
37e35b37d4
Upgrade to RSocket 1.1 RC1
...
See gh-25898
2020-10-12 20:06:59 +01:00
a9d458f5fc
Merge branch '5.2.x'
2020-10-12 19:54:21 +02:00
e176c4e799
Polishing
2020-10-12 19:40:50 +02:00
9dc64f5f5f
Upgrade to Commons Pool 2.9
2020-10-12 18:37:36 +02:00
ca2b412905
Merge branch '5.2.x'
2020-10-12 18:36:35 +02:00
690e219fe8
Upgrade to Commons Pool 2.8.1 and WebJars Locator 0.46
2020-10-12 18:34:17 +02:00
fbb3c5cce7
Switch the default @NestedTestConfiguration mode to INHERIT.
...
See gh-19930
2020-10-12 18:33:20 +02:00
66a67ec807
Polishing
2020-10-12 18:26:14 +02:00
69c330d905
Attempt fallback Part resolution even without StandardMultipartHttpServletRequest
...
Closes gh-25829
2020-10-12 18:25:55 +02:00
8c47c7c797
Upgrade to Jetty 9.4.32 and JUnit 4.13.1
2020-10-12 18:07:17 +02:00
21f2863d8e
ControllerAdvice resolution detects @Order declared on @Bean method as well
...
Closes gh-25872
2020-10-12 18:07:17 +02:00
83bfee9201
Return null in case of no matching part even for array/collection parameter
...
Closes gh-25819
2020-10-12 18:07:17 +02:00
50b9542402
Apply handleMissingValue in case of null conversion result as well
...
Closes gh-23939
2020-10-12 18:07:17 +02:00
2a34c0ea70
Return early from composed Converter if initial conversion step returned null
...
See gh-23379
2020-10-12 18:07:17 +02:00
Rossen Stoyanchev
Rostislav Svoboda
Brian Clozel
Sam Brannen
Sébastien Deleuze
Juergen Hoeller