c1987e5b8c
Merge branch '5.3.x'
2022-02-16 12:12:37 +01:00
3ac60147f3
Improve documentation for uri(URI) method in WebTestClient
...
Prior to this commit, it was not clear that a configured base URI would
not be applied when invoking uri(URI).
This commit adds a note to the Javadoc to clarify that behavior.
Closes gh-28058
2022-02-16 12:11:33 +01:00
5ae9217271
Merge branch '5.3.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/annotation/SynthesizedMergedAnnotationInvocationHandler.java
# src/eclipse/org.eclipse.jdt.ui.prefs
2022-02-11 15:01:47 +01:00
ce87285be5
Use canonical names for types in synthesized annotation toString
...
My proposal for the same change in the JDK is currently targeted for
JDK 19.
- https://bugs.openjdk.java.net/browse/JDK-8281462
- https://bugs.openjdk.java.net/browse/JDK-8281568
- https://github.com/openjdk/jdk/pull/7418
See gh-28015
2022-02-10 16:59:00 +01:00
e077a753f8
Polish JsonContentTests
2022-02-05 20:37:42 +01:00
2ae6431a50
Merge branch '5.3.x'
2022-02-05 20:26:10 +01:00
038b88e2a1
Polishing
2022-02-05 20:23:45 +01:00
eb84c84373
Polish contribution
...
See gh-27993
2022-02-05 20:15:30 +01:00
920be8e1b2
Add support for strict JSON comparison in WebTestClient
...
Prior to this commit, WebTestClient only supported "lenient" comparison
of the expected JSON body.
This commit introduces an overloaded variant of `json()` in the
BodyContentSpec that accepts an additional boolean flag to specify
whether a "strict" comparison should be performed.
This new feature is analogous to the existing support in MockMvc.
Closes gh-27993
2022-02-05 20:15:30 +01:00
a13ad3e969
Polishing
2022-02-05 20:15:30 +01:00
9688e61e20
Upgrade to Groovy 4.0
...
Closes gh-27985
2022-02-04 21:01:02 +01:00
d6e56ce327
Merge branch '5.3.x'
2022-01-13 08:39:12 +01:00
cfefcee788
Polishing
...
See gh-27926
2022-01-13 08:28:54 +01:00
148d7ab1df
Merge branch '5.3.x'
2022-01-12 17:13:03 +01:00
5fb58e51e5
Infer UTF-8 encoding for JSON response with MockMvc's andDo(print(...))
...
Prior to this commit, the PrintingResultHandler in MockMvc -- typically
invoked via .andDo(print()) -- printed an `application/json` response
body using the default encoding (ISO-8859-1), which resulted in UTF-8
characters being garbled.
Since an `application/json` response is implicitly encoded using UTF-8,
the PrintingResultHandler now infers UTF-8 encoding for such response
bodies.
Closes gh-27926
2022-01-12 17:07:45 +01:00
3477ec0a35
Decode servletPath in HtmlUnitRequestBuilder
...
Closes gh-27837
2022-01-11 14:54:14 +00:00
9346c89f5c
Polishing in HtmlUnitRequestBuilder
...
Order methods according to Spring Framework conventions.
Order request initialization by URI component.
See gh-27837
2022-01-11 14:33:12 +00:00
d57bc176f2
Merge branch '5.3.x'
2022-01-10 14:21:25 +01:00
df263d01b9
Use idiomatic AssertJ assertions for true, false, and null
2022-01-10 14:15:55 +01:00
7769ded887
Merge branch '5.3.x'
2022-01-07 14:31:32 +01:00
ed4e2289cd
Support H2 1.4 & 2.0 in H2SequenceMaxValueIncrementer
...
Prior to this commit, H2SequenceMaxValueIncrementer only supported H2
database 1.4.
This commit updates H2SequenceMaxValueIncrementer's getSequenceQuery()
method so that the syntax used supports version 1.4 and 2.0 of the H2
database.
This commit also updates several test schemas so that they work with H2
1.4 and 2.0 as well as HSQL.
Closes gh-27870
2022-01-07 10:09:27 +01:00
61c3d7a989
Merge branch '5.3.x'
2022-01-04 14:09:02 +01:00
03668f9c10
Replace remaining use of StringBuffer with StringBuilder
...
Although this commit only applies to test classes, it serves to reduce
the noise when searching for undesirable usage of StringBuffer in
production code.
2022-01-04 14:06:13 +01:00
97625e3658
Additional changes because HttpMethod changed from enum to class
...
See gh-27697
2022-01-03 16:12:14 +01:00
bfdb93b406
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
# src/docs/asciidoc/integration.adoc
2021-12-14 16:51:00 +01:00
ca84559588
Provide findAnnotationOnBean variant with allowFactoryBeanInit flag
...
Closes gh-27796
2021-12-14 16:47:12 +01:00
8d93dc4abb
Merge branch '5.3.x'
2021-12-14 14:05:18 +01:00
b06d267232
Remove references to AsyncConfigurerSupport
...
Closes gh-27812
2021-12-14 13:59:05 +01:00
7f43128a0e
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
# spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
# spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
# spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
2021-12-03 22:42:05 +01:00
14f24f43d7
Polishing
2021-12-03 22:36:31 +01:00
7a4207cd7b
Changes because HttpMethod changed to class
...
This commit contains changes made because HttpMethod changed from enum
to class.
See gh-27697
2021-11-30 13:44:36 +01:00
44950bb862
Merge branch '5.3.x'
2021-11-30 12:27:41 +01:00
40d2058b97
Upgrade to JUnit 5.8.2
...
Closes gh-27744
2021-11-30 12:22:31 +01:00
804b343cab
Use parseInt without substring method
2021-11-25 16:14:59 +01:00
2be80b8fc8
Merge branch '5.3.x'
2021-11-18 19:23:49 +01:00
c37d6c30a0
Fix nullability declarations in MergedContextConfiguration
2021-11-18 19:23:28 +01:00
4750a9430c
Early removal of 5.x-deprecated code
...
Closes gh-27686
2021-11-18 09:18:06 +01:00
5c972fcc54
Use Charset variants of URLEncoder and URLDecoder methods
2021-11-10 16:12:11 +01:00
32af39d6e6
Use 'toString(Charset)' instead of 'toString(String)' for encodings ( #27646 )
...
Co-authored-by: 홍성민(SungMin Hong)/Platform Engineering팀/11ST <devmonster@11stcorp.com>
2021-11-10 15:11:33 +01:00
75036fa0ad
Merge branch '5.3.x'
2021-11-10 14:22:58 +01:00
15a6373fed
Avoid nullability warnings
2021-11-10 14:22:06 +01:00
32c14a2b42
Update Javadoc regarding repeatable annotation support
2021-10-29 11:04:01 +02:00
d9e9a33b66
Merge branch '5.3.x'
2021-10-22 15:29:37 +02:00
66826ac960
Fix typo in Javadoc in HeaderAssertions
...
Closes gh-27589
2021-10-22 15:28:27 +02:00
b8fc79543d
Polish tests and test fixtures in spring-test
2021-10-14 22:12:23 +02:00
fba92c0120
Update copyright date
2021-10-14 16:03:39 +02:00
940a37f9ce
Apply "final fields" Eclipse clean-up in spring-test
...
This has only been applied to `src/main/java`.
2021-10-14 15:53:54 +02:00
7e4870577d
Apply "instanceof pattern matching" Eclipse clean-up in spring-test
...
This has only been applied to `src/main/java`.
2021-10-14 15:50:36 +02:00
373b90d263
Simplify JsonPathExpectationsHelperTests with text blocks
2021-10-13 20:43:13 +02:00
1ef47fa369
Use instanceof pattern matching in select classes in spring-test
2021-10-13 20:41:49 +02:00
Sam Brannen
Gleidson Leopoldo
Juergen Hoeller
Stephane Nicoll
rstoyanchev
Henning Poettker
Arjen Poutsma
김보배(Bobae Kim)/Platform Engineering팀/11ST
Christoph Dreis
SungMin
xxpain