Skip to content

Commit 4ee9fae

Browse files
committed
Merge pull request #43316 from izeye
* pr/43316: Update copyright year of changed file Polish Closes gh-43316
2 parents a0309a5 + 615b199 commit 4ee9fae

File tree

11 files changed

+23
-24
lines changed

11 files changed

+23
-24
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class OtlpLoggingProperties {
5050
private Duration connectTimeout = Duration.ofSeconds(10);
5151

5252
/**
53-
* Transport used to send the spans.
53+
* Transport used to send the logs.
5454
*/
5555
private Transport transport = Transport.HTTP;
5656

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ public static class Listener {
187187
private Duration receiveTimeout = Duration.ofSeconds(1);
188188

189189
/**
190-
* Specify the maximum number of messages to process in one task. By default,
191-
* unlimited unless a SchedulingTaskExecutor is configured on the listener (10
192-
* messages), as it indicates a preference for short-lived tasks.
190+
* Maximum number of messages to process in one task. By default, unlimited unless
191+
* a SchedulingTaskExecutor is configured on the listener (10 messages), as it
192+
* indicates a preference for short-lived tasks.
193193
*/
194194
private Integer maxMessagesPerTask;
195195

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryLoggingDockerComposeConnectionDetailsFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ private static final class OpenTelemetryLoggingDockerComposeConnectionDetails ex
5555

5656
private final int grpcPort;
5757

58-
private final int httPort;
58+
private final int httpPort;
5959

6060
private OpenTelemetryLoggingDockerComposeConnectionDetails(RunningService source) {
6161
super(source);
6262
this.host = source.host();
6363
this.grpcPort = source.ports().get(OTLP_GRPC_PORT);
64-
this.httPort = source.ports().get(OTLP_HTTP_PORT);
64+
this.httpPort = source.ports().get(OTLP_HTTP_PORT);
6565
}
6666

6767
@Override
6868
public String getUrl(Transport transport) {
6969
int port = switch (transport) {
70-
case HTTP -> this.httPort;
70+
case HTTP -> this.httpPort;
7171
case GRPC -> this.grpcPort;
7272
};
7373
return "http://%s:%d/v1/logs".formatted(this.host, port);

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@ private static final class OpenTelemetryTracingDockerComposeConnectionDetails ex
5656

5757
private final int grpcPort;
5858

59-
private final int httPort;
59+
private final int httpPort;
6060

6161
private OpenTelemetryTracingDockerComposeConnectionDetails(RunningService source) {
6262
super(source);
6363
this.host = source.host();
6464
this.grpcPort = source.ports().get(OTLP_GRPC_PORT);
65-
this.httPort = source.ports().get(OTLP_HTTP_PORT);
65+
this.httpPort = source.ports().get(OTLP_HTTP_PORT);
6666
}
6767

6868
@Override
6969
public String getUrl(Transport transport) {
7070
int port = switch (transport) {
71-
case HTTP -> this.httPort;
71+
case HTTP -> this.httpPort;
7272
case GRPC -> this.grpcPort;
7373
};
7474
return "http://%s:%d/v1/traces".formatted(this.host, port);

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ Information returned by the `/env`, `/configprops` and `/quartz` endpoints can b
307307

308308
Values can only be viewed in an unsanitized form when:
309309

310-
- The `show-values` property has been set to something other than `NEVER`
310+
- The `show-values` property has been set to something other than `never`
311311
- No custom xref:how-to:actuator.adoc#howto.actuator.customizing-sanitization[`SanitizingFunction`] beans apply
312312

313313
The `show-values` property can be configured for sanitizable endpoints to one of the following values:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import org.springframework.boot.test.system.CapturedOutput;
2424
import org.springframework.boot.test.system.OutputCaptureExtension;
25-
import org.springframework.boot.testcontainers.lifecycle.TestContainersParallelStartupIntegrationTests.ContainerConfig;
25+
import org.springframework.boot.testcontainers.lifecycle.TestcontainersParallelStartupIntegrationTests.ContainerConfig;
2626
import org.springframework.boot.testsupport.container.DisabledIfDockerUnavailable;
2727
import org.springframework.boot.testsupport.container.TestImage;
2828
import org.springframework.context.annotation.Bean;
@@ -43,7 +43,7 @@
4343
@TestPropertySource(properties = "spring.testcontainers.beans.startup=parallel")
4444
@DisabledIfDockerUnavailable
4545
@ExtendWith(OutputCaptureExtension.class)
46-
class TestContainersParallelStartupIntegrationTests {
46+
class TestcontainersParallelStartupIntegrationTests {
4747

4848
@Test
4949
void startsInParallel(CapturedOutput out) {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.boot.test.system.CapturedOutput;
2525
import org.springframework.boot.test.system.OutputCaptureExtension;
2626
import org.springframework.boot.testcontainers.context.ImportTestcontainers;
27-
import org.springframework.boot.testcontainers.lifecycle.TestContainersParallelStartupWithImportTestcontainersIntegrationTests.Containers;
27+
import org.springframework.boot.testcontainers.lifecycle.TestcontainersParallelStartupWithImportTestcontainersIntegrationTests.Containers;
2828
import org.springframework.boot.testsupport.container.DisabledIfDockerUnavailable;
2929
import org.springframework.boot.testsupport.container.TestImage;
3030
import org.springframework.test.context.TestPropertySource;
@@ -42,7 +42,7 @@
4242
@DisabledIfDockerUnavailable
4343
@ExtendWith(OutputCaptureExtension.class)
4444
@ImportTestcontainers(Containers.class)
45-
class TestContainersParallelStartupWithImportTestcontainersIntegrationTests {
45+
class TestcontainersParallelStartupWithImportTestcontainersIntegrationTests {
4646

4747
@Test
4848
void startsInParallel(CapturedOutput out) {

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/antora/modules/maven-plugin/pages/aot.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The `native` profile configures the following:
4343

4444
[WARNING]
4545
====
46-
The use of the raw classpath means that native image does not know about the generated `MANIFEST`.
46+
The use of the raw classpath means that native image does not know about the generated `MANIFEST.MF`.
4747
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.
4848
====
4949

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/ScheduledExecutorServiceAssert.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.lang.reflect.Method;
2020
import java.util.concurrent.ExecutionException;
2121
import java.util.concurrent.ScheduledExecutorService;
22-
import java.util.concurrent.ScheduledThreadPoolExecutor;
2322
import java.util.concurrent.TimeUnit;
2423

2524
import org.assertj.core.api.AbstractAssert;
@@ -28,7 +27,7 @@
2827
import org.springframework.util.ReflectionUtils;
2928

3029
/**
31-
* AssertJ {@link Assert} for {@link ScheduledThreadPoolExecutor}.
30+
* AssertJ {@link Assert} for {@link ScheduledExecutorService}.
3231
*
3332
* @author Mike Turbe
3433
* @author Moritz Halbritter
@@ -82,9 +81,9 @@ private boolean producesVirtualThreads() {
8281
}
8382

8483
/**
85-
* Creates a new assertion class with the given {@link ScheduledExecutorService}.
84+
* Creates a new assertion instance with the given {@link ScheduledExecutorService}.
8685
* @param actual the {@link ScheduledExecutorService}
87-
* @return the assertion class
86+
* @return the assertion instance
8887
*/
8988
public static ScheduledExecutorServiceAssert assertThat(ScheduledExecutorService actual) {
9089
return new ScheduledExecutorServiceAssert(actual);

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/assertj/SimpleAsyncTaskExecutorAssert.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -73,9 +73,9 @@ private boolean producesVirtualThreads() {
7373
}
7474

7575
/**
76-
* Creates a new assertion class with the given {@link SimpleAsyncTaskExecutor}.
76+
* Creates a new assertion instance with the given {@link SimpleAsyncTaskExecutor}.
7777
* @param actual the {@link SimpleAsyncTaskExecutor}
78-
* @return the assertion class
78+
* @return the assertion instance
7979
*/
8080
public static SimpleAsyncTaskExecutorAssert assertThat(SimpleAsyncTaskExecutor actual) {
8181
return new SimpleAsyncTaskExecutorAssert(actual);

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jackson/JsonMixinModuleTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void closeContext() {
5555
}
5656

5757
@Test
58-
void jsonWithModuleEmptyMixInWithEmptyTypesShouldFailed() {
58+
void jsonWithModuleEmptyMixInWithEmptyTypesShouldFail() {
5959
assertThatExceptionOfType(BeanCreationException.class).isThrownBy(() -> load(EmptyMixIn.class))
6060
.withMessageContaining("Error creating bean with name 'jsonMixinModule'")
6161
.withStackTraceContaining("@JsonMixin annotation on class "

0 commit comments

Comments
 (0)