See gh-43316
This commit is contained in:
Johnny Lim 2024-11-28 23:17:38 +09:00 committed by Stéphane Nicoll
parent a0309a5475
commit 859c235a95
11 changed files with 22 additions and 23 deletions

View File

@ -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;

View File

@ -187,9 +187,9 @@ public class JmsProperties {
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;

View File

@ -55,19 +55,19 @@ class OpenTelemetryLoggingDockerComposeConnectionDetailsFactory
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);

View File

@ -56,19 +56,19 @@ class OpenTelemetryTracingDockerComposeConnectionDetailsFactory
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);

View File

@ -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:

View File

@ -22,7 +22,7 @@ import org.testcontainers.containers.PostgreSQLContainer;
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 @@ import static org.assertj.core.api.Assertions.assertThat;
@TestPropertySource(properties = "spring.testcontainers.beans.startup=parallel")
@DisabledIfDockerUnavailable
@ExtendWith(OutputCaptureExtension.class)
class TestContainersParallelStartupIntegrationTests {
class TestcontainersParallelStartupIntegrationTests {
@Test
void startsInParallel(CapturedOutput out) {

View File

@ -24,7 +24,7 @@ import org.testcontainers.junit.jupiter.Container;
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 @@ import static org.assertj.core.api.Assertions.assertThat;
@DisabledIfDockerUnavailable
@ExtendWith(OutputCaptureExtension.class)
@ImportTestcontainers(Containers.class)
class TestContainersParallelStartupWithImportTestcontainersIntegrationTests {
class TestcontainersParallelStartupWithImportTestcontainersIntegrationTests {
@Test
void startsInParallel(CapturedOutput out) {

View File

@ -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.
====

View File

@ -19,7 +19,6 @@ package org.springframework.boot.testsupport.assertj;
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.assertj.core.api.Assert;
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 @@ public final class ScheduledExecutorServiceAssert
}
/**
* 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);

View File

@ -73,9 +73,9 @@ public final class SimpleAsyncTaskExecutorAssert
}
/**
* 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);

View File

@ -55,7 +55,7 @@ class JsonMixinModuleTests {
}
@Test
void jsonWithModuleEmptyMixInWithEmptyTypesShouldFailed() {
void jsonWithModuleEmptyMixInWithEmptyTypesShouldFail() {
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> load(EmptyMixIn.class))
.withMessageContaining("Error creating bean with name 'jsonMixinModule'")
.withStackTraceContaining("@JsonMixin annotation on class "