From 412b8dd548310c437cce0c78aaf5b34d2d9e4a41 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 12 Mar 2024 23:23:00 +0900 Subject: [PATCH] Polish See gh-39910 --- .../liquibase/LiquibasePropertiesTests.java | 2 +- .../src/docs/asciidoc/actuator/endpoints.adoc | 2 +- .../src/docs/asciidoc/deployment/efficient.adoc | 2 +- .../src/docs/asciidoc/features/ssl.adoc | 2 +- .../src/docs/asciidoc/features/testing.adoc | 2 +- .../observability/AutoConfigureObservability.java | 2 +- ...tartupWithImportTestcontainersIntegrationTests.java | 2 +- .../boot/loader/launch/JarFileArchiveTests.java | 2 +- .../boot/context/properties/bind/DataObjectBinder.java | 2 +- .../analyzer/MissingParameterNamesFailureAnalyzer.java | 2 +- .../boot/web/servlet/server/Session.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 10 +++++----- .../jetty/JettyServletWebServerFactoryTests.java | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibasePropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibasePropertiesTests.java index 8c3f8260baf..93883c3dda4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibasePropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibasePropertiesTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Andy Wilkinson */ -public class LiquibasePropertiesTests { +class LiquibasePropertiesTests { @Test void valuesOfShowSummaryMatchValuesOfUpdateSummaryEnum() { diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc index ad517628012..df503b59aa3 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/endpoints.adoc @@ -1203,7 +1203,7 @@ The `info` endpoint publishes information about your Operating System, see {spri [[actuator.endpoints.info.process-information]] ==== Process Information -The `info` endpoint publishes information about your process, see {spring-boot-module-api}/info/ProcessInfo.html[`Process`] for more details. +The `info` endpoint publishes information about your process, see {spring-boot-module-api}/info/ProcessInfo.html[`ProcessInfo`] for more details. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/efficient.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/efficient.adoc index 37ee8b8fade..7ab708d6136 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/efficient.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/efficient.adoc @@ -72,7 +72,7 @@ To learn more about ahead-of-time processing, please see the < * If this annotation is applied to a sliced test, an in-memory {@code MeterRegistry}, a - * no-op {@code Tracer} and an {@code ObservationRegistry} is added to the application + * no-op {@code Tracer} and an {@code ObservationRegistry} are added to the application * context. * * @author Moritz Halbritter diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java index 7159f470d4f..d908926e61d 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; @DisabledIfDockerUnavailable @ExtendWith(OutputCaptureExtension.class) @ImportTestcontainers(Containers.class) -public class TestContainersParallelStartupWithImportTestcontainersIntegrationTests { +class TestContainersParallelStartupWithImportTestcontainersIntegrationTests { @Test void startsInParallel(CapturedOutput out) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/JarFileArchiveTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/JarFileArchiveTests.java index 94fd60609d9..a6f5786899d 100755 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/JarFileArchiveTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/launch/JarFileArchiveTests.java @@ -113,7 +113,7 @@ class JarFileArchiveTests { URL url = urls.iterator().next(); assertThat(url).isNotEqualTo(JarUrl.create(this.file, "nested.jar")); // The unpack URL must be a raw file URL (see gh-38833) - assertThat(url.toString()).startsWith("file:").endsWith("/nested.jar").doesNotStartWith("jar:"); + assertThat(url.toString()).startsWith("file:").endsWith("/nested.jar"); } @Test diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DataObjectBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DataObjectBinder.java index f57b1c4c446..f265e0cc475 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DataObjectBinder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DataObjectBinder.java @@ -61,7 +61,7 @@ interface DataObjectBinder { * @param context the bind context * @param exception the exception about to be thrown */ - default void onUnableToCreateInstance(Bindable target, Binder.Context context, RuntimeException exception) { + default void onUnableToCreateInstance(Bindable target, Context context, RuntimeException exception) { } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/MissingParameterNamesFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/MissingParameterNamesFailureAnalyzer.java index 68a7aca5b62..396878336f2 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/MissingParameterNamesFailureAnalyzer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/MissingParameterNamesFailureAnalyzer.java @@ -39,7 +39,7 @@ class MissingParameterNamesFailureAnalyzer implements FailureAnalyzer { static final String POSSIBILITY = "This may be due to missing parameter name information"; - static String ACTION = """ + static final String ACTION = """ Ensure that your compiler is configured to use the '-parameters' flag. You may need to update both your build tool settings as well as your IDE. (See https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-6.x#parameter-name-retention) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/Session.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/Session.java index d561342bfac..3b1be74f8ed 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/Session.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/Session.java @@ -104,7 +104,7 @@ public class Session { /** * Session cookie properties. This class is provided only for back-compatibility - * reasons, consider using {@link org.springframework.boot.web.server.Cookie} whever + * reasons, consider using {@link org.springframework.boot.web.server.Cookie} whenever * possible. */ public static class Cookie extends org.springframework.boot.web.server.Cookie { @@ -113,7 +113,7 @@ public class Session { /** * Available session tracking modes (mirrors - * {@link jakarta.servlet.SessionTrackingMode}. + * {@link jakarta.servlet.SessionTrackingMode}). */ public enum SessionTrackingMode { diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories index f6cea1c9e68..9cf4aa5ca70 100644 --- a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories +++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories @@ -69,16 +69,16 @@ org.springframework.boot.diagnostics.analyzer.BeanDefinitionOverrideFailureAnaly org.springframework.boot.diagnostics.analyzer.BeanNotOfRequiredTypeFailureAnalyzer,\ org.springframework.boot.diagnostics.analyzer.BindFailureAnalyzer,\ org.springframework.boot.diagnostics.analyzer.BindValidationFailureAnalyzer,\ -org.springframework.boot.diagnostics.analyzer.UnboundConfigurationPropertyFailureAnalyzer,\ +org.springframework.boot.diagnostics.analyzer.InvalidConfigurationPropertyNameFailureAnalyzer,\ +org.springframework.boot.diagnostics.analyzer.InvalidConfigurationPropertyValueFailureAnalyzer,\ org.springframework.boot.diagnostics.analyzer.MissingParameterNamesFailureAnalyzer,\ org.springframework.boot.diagnostics.analyzer.MutuallyExclusiveConfigurationPropertiesFailureAnalyzer,\ org.springframework.boot.diagnostics.analyzer.NoSuchMethodFailureAnalyzer,\ org.springframework.boot.diagnostics.analyzer.NoUniqueBeanDefinitionFailureAnalyzer,\ -org.springframework.boot.diagnostics.analyzer.PortInUseFailureAnalyzer,\ -org.springframework.boot.diagnostics.analyzer.ValidationExceptionFailureAnalyzer,\ -org.springframework.boot.diagnostics.analyzer.InvalidConfigurationPropertyNameFailureAnalyzer,\ -org.springframework.boot.diagnostics.analyzer.InvalidConfigurationPropertyValueFailureAnalyzer,\ org.springframework.boot.diagnostics.analyzer.PatternParseFailureAnalyzer,\ +org.springframework.boot.diagnostics.analyzer.PortInUseFailureAnalyzer,\ +org.springframework.boot.diagnostics.analyzer.UnboundConfigurationPropertyFailureAnalyzer,\ +org.springframework.boot.diagnostics.analyzer.ValidationExceptionFailureAnalyzer,\ org.springframework.boot.liquibase.LiquibaseChangelogMissingFailureAnalyzer,\ org.springframework.boot.web.context.MissingWebServerFactoryBeanFailureAnalyzer,\ org.springframework.boot.web.embedded.tomcat.ConnectorStartFailureAnalyzer diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java index acac3103c0b..04d5d3a4bd1 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java @@ -545,7 +545,7 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT } @Test - void shouldApplyingMaxConnectionUseConnector() throws Exception { + void shouldApplyMaxConnectionsToConnectors() throws Exception { JettyServletWebServerFactory factory = getFactory(); factory.setMaxConnections(1); this.webServer = factory.getWebServer();