From a0d1c10d8aa35c37d77850b8b7ef1b7d9f399002 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 18 Sep 2024 00:30:20 +0900 Subject: [PATCH] Polish See gh-42340 --- .../autoconfigure/r2dbc/R2dbcObservationAutoConfiguration.java | 1 + .../boot/autoconfigure/graphql/GraphQlProperties.java | 2 +- .../autoconfigure/liquibase/LiquibaseAutoConfiguration.java | 2 +- .../springframework/boot/devtools/restart/MainMethodTests.java | 2 +- .../src/docs/antora/modules/reference/pages/using/devtools.adoc | 2 +- ...eKafkaContainerConnectionDetailsFactoryIntegrationTests.java | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/r2dbc/R2dbcObservationAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/r2dbc/R2dbcObservationAutoConfiguration.java index fca8478ced..b9fe808709 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/r2dbc/R2dbcObservationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/r2dbc/R2dbcObservationAutoConfiguration.java @@ -50,6 +50,7 @@ public class R2dbcObservationAutoConfiguration { /** * {@code @Order} value of the observation customizer. + * @since 3.4.0 */ public static final int R2DBC_PROXY_OBSERVATION_CUSTOMIZER_ORDER = 0; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java index 62e81f68a5..b39692f83f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java @@ -220,7 +220,7 @@ public class GraphQlProperties { /** * Maximum idle period before a server keep-alive ping is sent to client. */ - private Duration keepAlive = null; + private Duration keepAlive; public String getPath() { return this.path; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index e82a99b479..66db731097 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -182,7 +182,7 @@ public class LiquibaseAutoConfiguration { @Bean @ConditionalOnBean(Customizer.class) - SpringLiquibaseCustomizer customizerSpringLiquibaseCustomizer(Customizer customizer) { + SpringLiquibaseCustomizer springLiquibaseCustomizer(Customizer customizer) { return (springLiquibase) -> springLiquibase.setCustomizer(customizer); } diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java index b8fce3b1a3..758c3f95c7 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java @@ -66,7 +66,7 @@ class MainMethodTests { } @Test // gh-39733 - void vaiJarLauncher() throws Exception { + void viaJarLauncher() throws Exception { FakeJarLauncher.action = (args) -> Valid.main(args); MainMethod method = new TestThread(FakeJarLauncher::main).test(); Method expectedMain = Valid.class.getMethod("main", String[].class); diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/using/devtools.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/using/devtools.adoc index 80524e5b2a..db9540af56 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/using/devtools.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/using/devtools.adoc @@ -243,7 +243,7 @@ If this causes issues, you can diagnose the problem by using the `spring.devtool By default, any open project in your IDE is loaded with the "`restart`" classloader, and any regular `.jar` file is loaded with the "`base`" classloader. The same is true if you use `mvn spring-boot:run` or `gradle bootRun`: the project containing your `@SpringBootApplication` is loaded with the "`restart`" classloader, and everything else with the "`base`" classloader. The classpath is printed on the console when you start the app, which can help to identify any problematic entries. -Classes used reflectively, especially annotations, can be loaded into the parent (fixed) classloader on startup before the application classes which uses them, and this might lead to them not being detected by Spring in the application. +Classes used reflectively, especially annotations, can be loaded into the parent (fixed) classloader on startup before the application classes which use them, and this might lead to them not being detected by Spring in the application. You can instruct Spring Boot to load parts of your project with a different classloader by creating a `META-INF/spring-devtools.properties` file. The `spring-devtools.properties` file can contain properties prefixed with `restart.exclude` and `restart.include`. diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests.java index 516b854d7d..d759a62a1c 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/kafka/ApacheKafkaContainerConnectionDetailsFactoryIntegrationTests.java @@ -41,7 +41,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link ConfluentKafkaContainerConnectionDetailsFactory}. + * Tests for {@link ApacheKafkaContainerConnectionDetailsFactory}. * * @author Moritz Halbritter * @author Andy Wilkinson