diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingProperties.java index 4d06499f7ab7..9a2d2fc446ce 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingProperties.java @@ -50,7 +50,7 @@ public class OtlpLoggingProperties { private Duration connectTimeout = Duration.ofSeconds(10); /** - * Transport used to send the spans. + * Transport used to send the logs. */ private Transport transport = Transport.HTTP; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index aaf6c8a9ada6..126ffd065f31 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -187,9 +187,9 @@ public static class Listener { private Duration receiveTimeout = Duration.ofSeconds(1); /** - * Specify the maximum number of messages to process in one task. By default, - * unlimited unless a SchedulingTaskExecutor is configured on the listener (10 - * messages), as it indicates a preference for short-lived tasks. + * Maximum number of messages to process in one task. By default, unlimited unless + * a SchedulingTaskExecutor is configured on the listener (10 messages), as it + * indicates a preference for short-lived tasks. */ private Integer maxMessagesPerTask; diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryLoggingDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryLoggingDockerComposeConnectionDetailsFactory.java index 92ea28f71732..a4a6da3abc9c 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryLoggingDockerComposeConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryLoggingDockerComposeConnectionDetailsFactory.java @@ -55,19 +55,19 @@ private static final class OpenTelemetryLoggingDockerComposeConnectionDetails ex private final int grpcPort; - private final int httPort; + private final int httpPort; private OpenTelemetryLoggingDockerComposeConnectionDetails(RunningService source) { super(source); this.host = source.host(); this.grpcPort = source.ports().get(OTLP_GRPC_PORT); - this.httPort = source.ports().get(OTLP_HTTP_PORT); + this.httpPort = source.ports().get(OTLP_HTTP_PORT); } @Override public String getUrl(Transport transport) { int port = switch (transport) { - case HTTP -> this.httPort; + case HTTP -> this.httpPort; case GRPC -> this.grpcPort; }; return "http://%s:%d/v1/logs".formatted(this.host, port); diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java index 725600e063af..abacdf68bfaf 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java @@ -56,19 +56,19 @@ private static final class OpenTelemetryTracingDockerComposeConnectionDetails ex private final int grpcPort; - private final int httPort; + private final int httpPort; private OpenTelemetryTracingDockerComposeConnectionDetails(RunningService source) { super(source); this.host = source.host(); this.grpcPort = source.ports().get(OTLP_GRPC_PORT); - this.httPort = source.ports().get(OTLP_HTTP_PORT); + this.httpPort = source.ports().get(OTLP_HTTP_PORT); } @Override public String getUrl(Transport transport) { int port = switch (transport) { - case HTTP -> this.httPort; + case HTTP -> this.httpPort; case GRPC -> this.grpcPort; }; return "http://%s:%d/v1/traces".formatted(this.host, port); diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc index 98cfc40bd740..9447c5830385 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc @@ -307,7 +307,7 @@ Information returned by the `/env`, `/configprops` and `/quartz` endpoints can b Values can only be viewed in an unsanitized form when: -- The `show-values` property has been set to something other than `NEVER` +- The `show-values` property has been set to something other than `never` - No custom xref:how-to:actuator.adoc#howto.actuator.customizing-sanitization[`SanitizingFunction`] beans apply The `show-values` property can be configured for sanitizable endpoints to one of the following values: diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java similarity index 95% rename from spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java index 0dde259bbaf4..458c5418a113 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupIntegrationTests.java @@ -22,7 +22,7 @@ import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; -import org.springframework.boot.testcontainers.lifecycle.TestContainersParallelStartupIntegrationTests.ContainerConfig; +import org.springframework.boot.testcontainers.lifecycle.TestcontainersParallelStartupIntegrationTests.ContainerConfig; import org.springframework.boot.testsupport.container.DisabledIfDockerUnavailable; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; @@ -43,7 +43,7 @@ @TestPropertySource(properties = "spring.testcontainers.beans.startup=parallel") @DisabledIfDockerUnavailable @ExtendWith(OutputCaptureExtension.class) -class TestContainersParallelStartupIntegrationTests { +class TestcontainersParallelStartupIntegrationTests { @Test void startsInParallel(CapturedOutput out) { diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java similarity index 94% rename from spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java index e3a9cfb57fbb..0c7ea77e2105 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestContainersParallelStartupWithImportTestcontainersIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.java @@ -24,7 +24,7 @@ import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.boot.testcontainers.context.ImportTestcontainers; -import org.springframework.boot.testcontainers.lifecycle.TestContainersParallelStartupWithImportTestcontainersIntegrationTests.Containers; +import org.springframework.boot.testcontainers.lifecycle.TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.Containers; import org.springframework.boot.testsupport.container.DisabledIfDockerUnavailable; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.test.context.TestPropertySource; @@ -42,7 +42,7 @@ @DisabledIfDockerUnavailable @ExtendWith(OutputCaptureExtension.class) @ImportTestcontainers(Containers.class) -class TestContainersParallelStartupWithImportTestcontainersIntegrationTests { +class TestcontainersParallelStartupWithImportTestcontainersIntegrationTests { @Test void startsInParallel(CapturedOutput out) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/aot.adoc b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/aot.adoc index b3e53cecef4a..442f2877bf78 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/aot.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/aot.adoc @@ -43,7 +43,7 @@ The `native` profile configures the following: [WARNING] ==== -The use of the raw classpath means that native image does not know about the generated `MANIFEST`. +The use of the raw classpath means that native image does not know about the generated `MANIFEST.MF`. If you need to read the content of the manifest in a native image, for instance to get the implementation version of your application, configure the `classesDirectory` option to use the regular jar. ==== diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/ScheduledExecutorServiceAssert.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/ScheduledExecutorServiceAssert.java index 50ba12648662..3c6dc4f0221a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/ScheduledExecutorServiceAssert.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/ScheduledExecutorServiceAssert.java @@ -19,7 +19,6 @@ import java.lang.reflect.Method; import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; import org.assertj.core.api.AbstractAssert; @@ -28,7 +27,7 @@ import org.springframework.util.ReflectionUtils; /** - * AssertJ {@link Assert} for {@link ScheduledThreadPoolExecutor}. + * AssertJ {@link Assert} for {@link ScheduledExecutorService}. * * @author Mike Turbe * @author Moritz Halbritter @@ -82,9 +81,9 @@ private boolean producesVirtualThreads() { } /** - * Creates a new assertion class with the given {@link ScheduledExecutorService}. + * Creates a new assertion instance with the given {@link ScheduledExecutorService}. * @param actual the {@link ScheduledExecutorService} - * @return the assertion class + * @return the assertion instance */ public static ScheduledExecutorServiceAssert assertThat(ScheduledExecutorService actual) { return new ScheduledExecutorServiceAssert(actual); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/SimpleAsyncTaskExecutorAssert.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/SimpleAsyncTaskExecutorAssert.java index 8b6b25e7a543..5e8fa4752e33 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/SimpleAsyncTaskExecutorAssert.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/SimpleAsyncTaskExecutorAssert.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. @@ -73,9 +73,9 @@ private boolean producesVirtualThreads() { } /** - * Creates a new assertion class with the given {@link SimpleAsyncTaskExecutor}. + * Creates a new assertion instance with the given {@link SimpleAsyncTaskExecutor}. * @param actual the {@link SimpleAsyncTaskExecutor} - * @return the assertion class + * @return the assertion instance */ public static SimpleAsyncTaskExecutorAssert assertThat(SimpleAsyncTaskExecutor actual) { return new SimpleAsyncTaskExecutorAssert(actual); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java index 6bedd39637c8..9a160a02c424 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java @@ -55,7 +55,7 @@ void closeContext() { } @Test - void jsonWithModuleEmptyMixInWithEmptyTypesShouldFailed() { + void jsonWithModuleEmptyMixInWithEmptyTypesShouldFail() { assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> load(EmptyMixIn.class)) .withMessageContaining("Error creating bean with name 'jsonMixinModule'") .withStackTraceContaining("@JsonMixin annotation on class "