From 60df7e3bce6873a21351e2164e835233c7e3159f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 17 Jul 2023 13:33:23 +0200 Subject: [PATCH] Polish contribution See gh-36251 --- .../src/docs/asciidoc/howto/application.adoc | 1 - .../config/DelegatingApplicationContextInitializer.java | 6 +++--- .../boot/context/config/DelegatingApplicationListener.java | 6 +++--- .../DelegatingApplicationContextInitializerTests.java | 3 +-- .../context/config/DelegatingApplicationListenerTests.java | 3 +-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/application.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/application.adoc index 6388647788..26b1da2c2e 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/application.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/application.adoc @@ -61,7 +61,6 @@ Spring Boot loads a number of such customizations for use internally from `META- There is more than one way to register additional customizations: * Programmatically, per application, by calling the `addListeners` and `addInitializers` methods on `SpringApplication` before you run it. -* Declaratively, per application, by setting the `context.initializer.classes` or `context.listener.classes` properties. * Declaratively, for all applications, by adding a `META-INF/spring.factories` and packaging a jar file that the applications all use as a library. The `SpringApplication` sends some special `ApplicationEvents` to the listeners (some even before the context is created) and then registers the listeners for events published by the `ApplicationContext` as well. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java index a5bb72cf7a..3cf1721734 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2023 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. @@ -38,8 +38,8 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Phillip Webb * @since 1.0.0 - * - * @deprecated since 3.2 for removal in 3.4 as property based initialization is no longer recommended + * @deprecated since 3.2.0 for removal in 3.4.0 as property based initialization is no + * longer recommended */ @Deprecated(since = "3.2.0", forRemoval = true) public class DelegatingApplicationContextInitializer diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java index 7933217851..41c85cc354 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2023 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. @@ -40,8 +40,8 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Phillip Webb * @since 1.0.0 - * - * @deprecated since 3.2 for removal in 3.4 as property based initialization is no longer recommended + * @deprecated since 3.2.0 for removal in 3.4.0 as property based initialization is no + * longer recommended */ @Deprecated(since = "3.2.0", forRemoval = true) public class DelegatingApplicationListener implements ApplicationListener, Ordered { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java index 2a3eb495ef..2436489db8 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializerTests.java @@ -35,10 +35,9 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * Tests for {@link DelegatingApplicationContextInitializer}. * * @author Phillip Webb - * - * @deprecated since 3.2 for removal in 3.4 as property based initialization is no longer recommended */ @Deprecated(since = "3.2.0", forRemoval = true) +@SuppressWarnings("removal") class DelegatingApplicationContextInitializerTests { private final DelegatingApplicationContextInitializer initializer = new DelegatingApplicationContextInitializer(); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java index 0b63f1a563..c56460014a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/DelegatingApplicationListenerTests.java @@ -36,10 +36,9 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link DelegatingApplicationListener}. * * @author Dave Syer - * - * @deprecated since 3.2 for removal in 3.4 as property based initialization is no longer recommended */ @Deprecated(since = "3.2.0", forRemoval = true) +@SuppressWarnings("removal") class DelegatingApplicationListenerTests { private final DelegatingApplicationListener listener = new DelegatingApplicationListener();