From 4092afc98fc3493826e876af53eaa36db605513f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 16 Feb 2022 20:42:58 -0800 Subject: [PATCH 1/2] Polish --- .../boot/autoconfigure/AutoConfiguration.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java index a2053cd46e..c3d79a43b1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfiguration.java @@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @@ -29,13 +28,19 @@ import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; /** - * Auto-configuration classes are regular Spring {@link Configuration @Configuration} - * beans. Generally auto-configuration beans are {@link Conditional @Conditional} beans + * Indicates that a class provides configuration that can be automatically applied by + * Spring Boot. Auto-configuration classes are regular + * {@link Configuration @Configuration} with the exception that + * {@literal Configuration#proxyBeanMethods() proxyBeanMethods} is always {@code false}. + *

+ * Generally auto-configuration classes are marked as {@link Conditional @Conditional} * (most often using {@link ConditionalOnClass @ConditionalOnClass} and * {@link ConditionalOnMissingBean @ConditionalOnMissingBean} annotations). * * @author Moritz Halbritter * @see EnableAutoConfiguration + * @see AutoConfigureBefore + * @see AutoConfigureAfter * @see Conditional * @see ConditionalOnClass * @see ConditionalOnMissingBean @@ -44,7 +49,6 @@ import org.springframework.context.annotation.Configuration; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -@Inherited @Configuration(proxyBeanMethods = false) public @interface AutoConfiguration { From c0ffb356689db031fdfea87f6732a33807cd2f73 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 16 Feb 2022 20:43:10 -0800 Subject: [PATCH 2/2] Update copyright year of changed files --- .../orm/jpa/HibernateJpaAutoConfigurationTests.java | 2 +- .../boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index 6b271f10bd..90e605fc8f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java index 3f081b199a..b22d4204a5 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/r2dbc/init/R2dbcScriptDatabaseInitializerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.