Skip to content

Commit ec985d2

Browse files
wilkinsonawilkinsona
committed
Merge branch '3.3.x' into 3.4.x
Closes gh-44641
2 parents d93f4f5 + edf3cb1 commit ec985d2

File tree

29 files changed

+85
-109
lines changed

29 files changed

+85
-109
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ dependencies {
196196
tasks.named("test") {
197197
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
198198
filter {
199-
excludeTestsMatching("org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.*")
199+
excludeTestsMatching("*DocumentationTests")
200200
}
201201
}
202202

@@ -205,7 +205,7 @@ def documentationTest = tasks.register("documentationTest", Test) {
205205
classpath = testing.suites.test.sources.runtimeClasspath
206206
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
207207
filter {
208-
includeTestsMatching("org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.*")
208+
includeTestsMatching("*DocumentationTests")
209209
}
210210
outputs.dir(layout.buildDirectory.dir("generated-snippets"))
211211
develocity {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AuditEventsEndpointDocumentationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointDocumentationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
17+
package org.springframework.boot.actuate.autoconfigure.audit;
1818

1919
import java.time.OffsetDateTime;
2020
import java.time.format.DateTimeFormatter;
@@ -26,9 +26,9 @@
2626
import org.springframework.boot.actuate.audit.AuditEvent;
2727
import org.springframework.boot.actuate.audit.AuditEventRepository;
2828
import org.springframework.boot.actuate.audit.AuditEventsEndpoint;
29+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2930
import org.springframework.context.annotation.Bean;
3031
import org.springframework.context.annotation.Configuration;
31-
import org.springframework.context.annotation.Import;
3232
import org.springframework.test.context.bean.override.mockito.MockitoBean;
3333

3434
import static org.assertj.core.api.Assertions.assertThat;
@@ -89,7 +89,6 @@ void filteredAuditEvents() {
8989
}
9090

9191
@Configuration(proxyBeanMethods = false)
92-
@Import(BaseDocumentationConfiguration.class)
9392
static class TestConfiguration {
9493

9594
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/BeansEndpointDocumentationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/beans/BeansEndpointDocumentationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
17+
package org.springframework.boot.actuate.autoconfigure.beans;
1818

1919
import java.util.Collection;
2020
import java.util.List;
@@ -23,11 +23,11 @@
2323

2424
import org.junit.jupiter.api.Test;
2525

26+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2627
import org.springframework.boot.actuate.beans.BeansEndpoint;
2728
import org.springframework.context.ConfigurableApplicationContext;
2829
import org.springframework.context.annotation.Bean;
2930
import org.springframework.context.annotation.Configuration;
30-
import org.springframework.context.annotation.Import;
3131
import org.springframework.restdocs.payload.FieldDescriptor;
3232
import org.springframework.restdocs.payload.JsonFieldType;
3333
import org.springframework.restdocs.payload.ResponseFieldsSnippet;
@@ -72,7 +72,6 @@ private boolean isIndependentBean(Entry<String, Map<String, Object>> bean) {
7272
}
7373

7474
@Configuration(proxyBeanMethods = false)
75-
@Import(BaseDocumentationConfiguration.class)
7675
static class TestConfiguration {
7776

7877
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/CachesEndpointDocumentationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cache/CachesEndpointDocumentationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
17+
package org.springframework.boot.actuate.autoconfigure.cache;
1818

1919
import java.util.Collections;
2020
import java.util.HashMap;
@@ -23,13 +23,13 @@
2323

2424
import org.junit.jupiter.api.Test;
2525

26+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2627
import org.springframework.boot.actuate.cache.CachesEndpoint;
2728
import org.springframework.boot.actuate.cache.CachesEndpointWebExtension;
2829
import org.springframework.cache.CacheManager;
2930
import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
3031
import org.springframework.context.annotation.Bean;
3132
import org.springframework.context.annotation.Configuration;
32-
import org.springframework.context.annotation.Import;
3333
import org.springframework.http.HttpStatus;
3434
import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
3535
import org.springframework.restdocs.payload.FieldDescriptor;
@@ -89,7 +89,6 @@ void evictNamedCache() {
8989
}
9090

9191
@Configuration(proxyBeanMethods = false)
92-
@Import(BaseDocumentationConfiguration.class)
9392
static class TestConfiguration {
9493

9594
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConditionsReportEndpointDocumentationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpointDocumentationTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,19 +14,18 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
17+
package org.springframework.boot.actuate.autoconfigure.condition;
1818

1919
import java.util.List;
2020

2121
import org.junit.jupiter.api.Test;
2222

23-
import org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpoint;
23+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2424
import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
2525
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
2626
import org.springframework.context.ConfigurableApplicationContext;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
29-
import org.springframework.context.annotation.Import;
3029
import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
3130
import org.springframework.restdocs.payload.FieldDescriptor;
3231
import org.springframework.restdocs.payload.JsonFieldType;
@@ -74,7 +73,6 @@ void conditions() {
7473
}
7574

7675
@Configuration(proxyBeanMethods = false)
77-
@Import(BaseDocumentationConfiguration.class)
7876
static class TestConfiguration {
7977

8078
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ShutdownEndpointDocumentationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/ShutdownEndpointDocumentationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
17+
package org.springframework.boot.actuate.autoconfigure.context;
1818

1919
import org.junit.jupiter.api.Test;
2020

21+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2122
import org.springframework.boot.actuate.context.ShutdownEndpoint;
2223
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
2324
import org.springframework.context.annotation.Bean;
2425
import org.springframework.context.annotation.Configuration;
25-
import org.springframework.context.annotation.Import;
2626
import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
2727
import org.springframework.test.context.TestPropertySource;
2828

@@ -46,7 +46,6 @@ void shutdown() {
4646
}
4747

4848
@Configuration(proxyBeanMethods = false)
49-
@Import(BaseDocumentationConfiguration.class)
5049
static class TestConfiguration {
5150

5251
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/ConfigurationPropertiesReportEndpointDocumentationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/context/properties/ConfigurationPropertiesReportEndpointDocumentationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,17 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
17+
package org.springframework.boot.actuate.autoconfigure.context.properties;
1818

1919
import java.util.Collections;
2020

2121
import org.junit.jupiter.api.Test;
2222

23+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2324
import org.springframework.boot.actuate.context.properties.ConfigurationPropertiesReportEndpoint;
2425
import org.springframework.boot.actuate.endpoint.Show;
2526
import org.springframework.context.annotation.Bean;
2627
import org.springframework.context.annotation.Configuration;
27-
import org.springframework.context.annotation.Import;
2828
import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
2929

3030
import static org.assertj.core.api.Assertions.assertThat;
@@ -77,7 +77,6 @@ void configPropsFilterByPrefix() {
7777
}
7878

7979
@Configuration(proxyBeanMethods = false)
80-
@Import(BaseDocumentationConfiguration.class)
8180
static class TestConfiguration {
8281

8382
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java‎

Lines changed: 4 additions & 1 deletion
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-2025 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.
@@ -31,6 +31,7 @@
3131
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
3232
import org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointAutoConfiguration;
3333
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
34+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.AbstractEndpointDocumentationTests.BaseDocumentationConfiguration;
3435
import org.springframework.boot.actuate.autoconfigure.endpoint.web.reactive.WebFluxEndpointManagementContextConfiguration;
3536
import org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet.WebMvcEndpointManagementContextConfiguration;
3637
import org.springframework.boot.actuate.endpoint.jackson.EndpointObjectMapper;
@@ -44,6 +45,7 @@
4445
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
4546
import org.springframework.context.annotation.Bean;
4647
import org.springframework.context.annotation.Configuration;
48+
import org.springframework.context.annotation.Import;
4749
import org.springframework.restdocs.operation.preprocess.ContentModifyingOperationPreprocessor;
4850
import org.springframework.restdocs.operation.preprocess.OperationPreprocessor;
4951
import org.springframework.restdocs.payload.FieldDescriptor;
@@ -60,6 +62,7 @@
6062
* @author Andy Wilkinson
6163
*/
6264
@TestPropertySource(properties = { "management.endpoints.web.exposure.include=*" })
65+
@Import(BaseDocumentationConfiguration.class)
6366
public abstract class AbstractEndpointDocumentationTests {
6467

6568
protected static String describeEnumValues(Class<? extends Enum<?>> enumType) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/EnvironmentEndpointDocumentationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/env/EnvironmentEndpointDocumentationTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
17+
package org.springframework.boot.actuate.autoconfigure.env;
1818

1919
import java.io.IOException;
2020
import java.util.Collections;
@@ -28,11 +28,11 @@
2828
import com.fasterxml.jackson.databind.SerializationFeature;
2929
import org.junit.jupiter.api.Test;
3030

31+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
3132
import org.springframework.boot.actuate.endpoint.Show;
3233
import org.springframework.boot.actuate.env.EnvironmentEndpoint;
3334
import org.springframework.context.annotation.Bean;
3435
import org.springframework.context.annotation.Configuration;
35-
import org.springframework.context.annotation.Import;
3636
import org.springframework.core.env.AbstractEnvironment;
3737
import org.springframework.core.env.ConfigurableEnvironment;
3838
import org.springframework.core.env.EnumerablePropertySource;
@@ -142,7 +142,6 @@ private boolean retainKey(String key) {
142142
}
143143

144144
@Configuration(proxyBeanMethods = false)
145-
@Import(BaseDocumentationConfiguration.class)
146145
static class TestConfiguration {
147146

148147
@Bean

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/FlywayEndpointDocumentationTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/flyway/FlywayEndpointDocumentationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation;
17+
package org.springframework.boot.actuate.autoconfigure.flyway;
1818

1919
import java.util.List;
2020

@@ -23,14 +23,14 @@
2323
import org.flywaydb.core.api.MigrationState;
2424
import org.junit.jupiter.api.Test;
2525

26+
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2627
import org.springframework.boot.actuate.flyway.FlywayEndpoint;
2728
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2829
import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
2930
import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
3031
import org.springframework.context.ApplicationContext;
3132
import org.springframework.context.annotation.Bean;
3233
import org.springframework.context.annotation.Configuration;
33-
import org.springframework.context.annotation.Import;
3434
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
3535
import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
3636
import org.springframework.restdocs.payload.FieldDescriptor;
@@ -83,7 +83,6 @@ private List<FieldDescriptor> migrationFieldDescriptors() {
8383
}
8484

8585
@Configuration(proxyBeanMethods = false)
86-
@Import(BaseDocumentationConfiguration.class)
8786
@ImportAutoConfiguration(FlywayAutoConfiguration.class)
8887
static class TestConfiguration {
8988

0 commit comments

Comments
 (0)