Merge branch '5.3.x'

This commit is contained in:
Sébastien Deleuze 2022-06-17 12:58:27 +02:00
commit 36012ffea9
3 changed files with 4 additions and 2 deletions

View File

@ -30,6 +30,8 @@ and https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-reflect[`kotli
to be present on the classpath. They are provided by default if you bootstrap a Kotlin project on
https://start.spring.io/#!language=kotlin&type=gradle-project[start.spring.io].
WARNING: Kotlin https://kotlinlang.org/docs/inline-classes.html[inline classes] are not yet supported.
NOTE: The https://github.com/FasterXML/jackson-module-kotlin[Jackson Kotlin module] is required
for serializing or deserializing JSON data for Kotlin classes with Jackson, so make sure to add the
`com.fasterxml.jackson.module:jackson-module-kotlin` dependency to your project if you have such need.

View File

@ -2998,7 +2998,7 @@ configure or customize message writing.
public ResponseEntity<String> handle() {
String body = ... ;
String etag = ... ;
return ResponseEntity.ok().eTag(etag).build(body);
return ResponseEntity.ok().eTag(etag).body(body);
}
----
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]

View File

@ -3392,7 +3392,7 @@ See <<mvc-ann-jackson>> for details.
public ResponseEntity<String> handle() {
String body = ... ;
String etag = ... ;
return ResponseEntity.ok().eTag(etag).build(body);
return ResponseEntity.ok().eTag(etag).body(body);
}
----
[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]