From fc8f9a322df1fc9655c69c0ec6de338e8fec29a0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 21 Nov 2025 16:35:14 +0000 Subject: [PATCH] Annotation Kotlin auto-config examples with @AutoConfiguration Closes gh-48220 --- .../beanconditions/MyAutoConfiguration.kt | 4 ++-- .../classconditions/MyAutoConfiguration.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.kt index 0af0e6eb45b..302af6f81cc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/beanconditions/MyAutoConfiguration.kt @@ -16,11 +16,11 @@ package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.beanconditions +import org.springframework.boot.autoconfigure.AutoConfiguration import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -@Configuration(proxyBeanMethods = false) +@AutoConfiguration class MyAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.kt index 19b0a192308..4f1a4425300 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/developingautoconfiguration/conditionannotations/classconditions/MyAutoConfiguration.kt @@ -16,12 +16,13 @@ package org.springframework.boot.docs.features.developingautoconfiguration.conditionannotations.classconditions +import org.springframework.boot.autoconfigure.AutoConfiguration import org.springframework.boot.autoconfigure.condition.ConditionalOnClass import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration -@Configuration(proxyBeanMethods = false) +@AutoConfiguration // Some conditions ... class MyAutoConfiguration {