Skip to content
Closed

Polish #43316

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -43,7 +43,7 @@
@TestPropertySource(properties = "spring.testcontainers.beans.startup=parallel")
@DisabledIfDockerUnavailable
@ExtendWith(OutputCaptureExtension.class)
class TestContainersParallelStartupIntegrationTests {
class TestcontainersParallelStartupIntegrationTests {

@Test
void startsInParallel(CapturedOutput out) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -42,7 +42,7 @@
@DisabledIfDockerUnavailable
@ExtendWith(OutputCaptureExtension.class)
@ImportTestcontainers(Containers.class)
class TestContainersParallelStartupWithImportTestcontainersIntegrationTests {
class TestcontainersParallelStartupWithImportTestcontainersIntegrationTests {

@Test
void startsInParallel(CapturedOutput out) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
====

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down