From 2a7f12532e2f1aa6d7d461d928caac484e6a5986 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 3 Sep 2025 22:35:27 +0900 Subject: [PATCH] Polish Signed-off-by: Johnny Lim --- .../configurationprocessor/test/ItemMetadataAssert.java | 6 +++--- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../boot/logging/LoggingSystemPropertiesTests.java | 4 ++-- .../antora/modules/reference/pages/features/logging.adoc | 2 +- .../http/client/JdkClientHttpRequestFactoryBuilder.java | 4 ++-- .../boot/http/client/JdkHttpClientBuilder.java | 2 +- .../http/client/reactive/JdkClientHttpConnectorBuilder.java | 4 ++-- .../autoconfigure/HttpClientAutoConfigurationTests.java | 2 +- .../reactive/ClientHttpConnectorAutoConfigurationTests.java | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/ItemMetadataAssert.java b/configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/ItemMetadataAssert.java index e64b12c13623..909a2fdfde35 100644 --- a/configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/ItemMetadataAssert.java +++ b/configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/ItemMetadataAssert.java @@ -83,8 +83,8 @@ public ItemMetadataAssert hasSourceType(Class type) { return hasSourceType(type.getName()); } - public ItemMetadataAssert hasSourceMethod(String type) { - extracting(ItemMetadata::getSourceMethod).isEqualTo(type); + public ItemMetadataAssert hasSourceMethod(String method) { + extracting(ItemMetadata::getSourceMethod).isEqualTo(method); return this; } @@ -120,7 +120,7 @@ private ObjectAssert assertItemDeprecation() { } private ObjectAssert extracting(Function extractor) { - return super.extracting(extractor, Assertions::assertThat); + return extracting(extractor, Assertions::assertThat); } @Override diff --git a/core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 28e404f93515..26d63493f927 100644 --- a/core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -32,7 +32,7 @@ { "name": "logging.console.enabled", "type": "java.lang.Boolean", - "description": "Whether to enable console based logging", + "description": "Whether to enable console-based logging.", "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener" }, { diff --git a/core/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java b/core/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java index 7475f31db8d4..2e3707c3f04d 100644 --- a/core/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java +++ b/core/spring-boot/src/test/java/org/springframework/boot/logging/LoggingSystemPropertiesTests.java @@ -233,14 +233,14 @@ void shouldSetConsoleStructuredLogging() { } @Test - void shouldSetConsoleLevelThreshholdToOffWhenConsoleLoggingDisabled() { + void shouldSetConsoleLevelThresholdToOffWhenConsoleLoggingDisabled() { new LoggingSystemProperties(new MockEnvironment().withProperty("logging.console.enabled", "false")).apply(null); assertThat(System.getProperty(LoggingSystemProperty.CONSOLE_THRESHOLD.getEnvironmentVariableName())) .isEqualTo("OFF"); } @Test - void shouldNotChangeConsoleLevelThreshholdWhenConsoleLoggingEnabled() { + void shouldNotChangeConsoleLevelThresholdWhenConsoleLoggingEnabled() { new LoggingSystemProperties(new MockEnvironment().withProperty("logging.console.enabled", "true") .withProperty("logging.threshold.console", "TRACE")).apply(null); assertThat(System.getProperty(LoggingSystemProperty.CONSOLE_THRESHOLD.getEnvironmentVariableName())) diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc index 453b7938af2b..cf0e156f63e5 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc @@ -71,7 +71,7 @@ Enabling the debug mode does _not_ configure your application to log all message Alternatively, you can enable a "`trace`" mode by starting your application with a `--trace` flag (or `trace=true` in your `application.properties`). Doing so enables trace logging for a selection of core loggers (embedded container, Hibernate schema generation, and the whole Spring portfolio). -If you wan to disable console based logging, you can set the configprop:logging.console.enabled[] property to `false`. +If you want to disable console-based logging, you can set the configprop:logging.console.enabled[] property to `false`. diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java index 78f0f26a96ad..ba703b95ef4f 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JdkClientHttpRequestFactoryBuilder.java @@ -65,8 +65,8 @@ public JdkClientHttpRequestFactoryBuilder withCustomizers( } /** - * Return a new {@link JdkClientHttpRequestFactoryBuilder} uses the given executor - * with the underlying {@link java.net.http.HttpClient.Builder}. + * Return a new {@link JdkClientHttpRequestFactoryBuilder} that uses the given + * executor with the underlying {@link java.net.http.HttpClient.Builder}. * @param executor the executor to use * @return a new {@link JdkClientHttpRequestFactoryBuilder} instance * @since 4.0.0 diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java index ded55622ee4d..c9b9f27e9048 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/JdkHttpClientBuilder.java @@ -51,7 +51,7 @@ private JdkHttpClientBuilder(Consumer customizer) { } /** - * Return a new {@link JdkHttpClientBuilder} uses the given executor with the + * Return a new {@link JdkHttpClientBuilder} that uses the given executor with the * underlying {@link java.net.http.HttpClient.Builder}. * @param executor the executor to use * @return a new {@link JdkHttpClientBuilder} instance diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java index 63f3011fb4ec..9480f6e22f98 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/reactive/JdkClientHttpConnectorBuilder.java @@ -61,8 +61,8 @@ public JdkClientHttpConnectorBuilder withCustomizers(Collection { ClientHttpRequestFactory factory = context.getBean(ClientHttpRequestFactoryBuilder.class).build(); HttpClient httpClient = (HttpClient) ReflectionTestUtils.getField(factory, "httpClient"); - assertThat(httpClient.executor().get()).isInstanceOf(VirtualThreadTaskExecutor.class); + assertThat(httpClient.executor()).containsInstanceOf(VirtualThreadTaskExecutor.class); }); } diff --git a/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/autoconfigure/reactive/ClientHttpConnectorAutoConfigurationTests.java b/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/autoconfigure/reactive/ClientHttpConnectorAutoConfigurationTests.java index a8d7b8948df1..c3005a6ac0b4 100644 --- a/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/autoconfigure/reactive/ClientHttpConnectorAutoConfigurationTests.java +++ b/module/spring-boot-http-client/src/test/java/org/springframework/boot/http/client/autoconfigure/reactive/ClientHttpConnectorAutoConfigurationTests.java @@ -184,7 +184,7 @@ void whenVirtualThreadsEnabledAndUsingJdkHttpClientUsesVirtualThreadExecutor() { ClientHttpConnector connector = context.getBean(ClientHttpConnectorBuilder.class).build(); java.net.http.HttpClient httpClient = (java.net.http.HttpClient) ReflectionTestUtils.getField(connector, "httpClient"); - assertThat(httpClient.executor().get()).isInstanceOf(VirtualThreadTaskExecutor.class); + assertThat(httpClient.executor()).containsInstanceOf(VirtualThreadTaskExecutor.class); }); }