From f1c00dd8a615ba436f8df7685d5cc593f36bdacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Fri, 17 Jun 2022 12:15:22 +0200 Subject: [PATCH 1/3] Fix a typo in ResponseEntity documentation Closes gh-28647 --- src/docs/asciidoc/web/webflux.adoc | 2 +- src/docs/asciidoc/web/webmvc.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index 611cf6ba66..9e543d80b9 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -2975,7 +2975,7 @@ configure or customize message writing. public ResponseEntity 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"] diff --git a/src/docs/asciidoc/web/webmvc.adoc b/src/docs/asciidoc/web/webmvc.adoc index 20964461ed..82efd4eeab 100644 --- a/src/docs/asciidoc/web/webmvc.adoc +++ b/src/docs/asciidoc/web/webmvc.adoc @@ -3386,7 +3386,7 @@ See <> for details. public ResponseEntity 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"] From 3401359bdf892b7da509a2d364f6d91a2248d8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Fri, 17 Jun 2022 12:25:52 +0200 Subject: [PATCH 2/3] Refine @Required Kotlin documentation Refine @Required Kotlin documentation to use annotation use site targets. Closes gh-28630 --- src/docs/asciidoc/core/core-beans.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/docs/asciidoc/core/core-beans.adoc b/src/docs/asciidoc/core/core-beans.adoc index 80d3a2c5d1..e446fb081f 100644 --- a/src/docs/asciidoc/core/core-beans.adoc +++ b/src/docs/asciidoc/core/core-beans.adoc @@ -4689,9 +4689,8 @@ example: ---- class SimpleMovieLister { + @set:Autowired lateinit var movieFinder: MovieFinder - @Required - set // ... } From 854307d8d8e77e24ec7ab2a8045d19de4bc76ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Fri, 17 Jun 2022 12:34:58 +0200 Subject: [PATCH 3/3] Document that Kotlin inline classes are not supported Closes gh-28642 --- src/docs/asciidoc/languages/kotlin.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/docs/asciidoc/languages/kotlin.adoc b/src/docs/asciidoc/languages/kotlin.adoc index 8b557af245..e1e0448a01 100644 --- a/src/docs/asciidoc/languages/kotlin.adoc +++ b/src/docs/asciidoc/languages/kotlin.adoc @@ -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.