Skip to content

Commit f10b80c

Browse files
committed
Merge branch '3.5.x'
Closes gh-47480
2 parents 5afbec7 + b99daec commit f10b80c

File tree

139 files changed

+425
-426
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+425
-426
lines changed

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ void recursivePropertiesDoNotCauseAStackOverflow() {
521521
@Test
522522
void recordProperties() {
523523
String source = """
524-
@org.springframework.boot.configurationsample.ConfigurationProperties("implicit")
524+
@org.springframework.boot.configurationsample.TestConfigurationProperties("implicit")
525525
public record ExampleRecord(String someString, Integer someInteger) {
526526
}
527527
""";
@@ -533,10 +533,10 @@ public record ExampleRecord(String someString, Integer someInteger) {
533533
@Test
534534
void recordPropertiesWithDefaultValues() {
535535
String source = """
536-
@org.springframework.boot.configurationsample.ConfigurationProperties("record.defaults")
536+
@org.springframework.boot.configurationsample.TestConfigurationProperties("record.defaults")
537537
public record ExampleRecord(
538-
@org.springframework.boot.configurationsample.DefaultValue("An1s9n") String someString,
539-
@org.springframework.boot.configurationsample.DefaultValue("594") Integer someInteger) {
538+
@org.springframework.boot.configurationsample.TestDefaultValue("An1s9n") String someString,
539+
@org.springframework.boot.configurationsample.TestDefaultValue("594") Integer someInteger) {
540540
}
541541
""";
542542
ConfigurationMetadata metadata = compile(source);
@@ -549,9 +549,9 @@ public record ExampleRecord(
549549
@Test
550550
void multiConstructorRecordProperties() {
551551
String source = """
552-
@org.springframework.boot.configurationsample.ConfigurationProperties("multi")
552+
@org.springframework.boot.configurationsample.TestConfigurationProperties("multi")
553553
public record ExampleRecord(String someString, Integer someInteger) {
554-
@org.springframework.boot.configurationsample.ConstructorBinding
554+
@org.springframework.boot.configurationsample.TestConstructorBinding
555555
public ExampleRecord(String someString) {
556556
this(someString, 42);
557557
}

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/EndpointMetadataGenerationTests.java

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import org.springframework.boot.configurationprocessor.metadata.ConfigurationMetadata;
2525
import org.springframework.boot.configurationprocessor.metadata.Metadata;
26-
import org.springframework.boot.configurationsample.Access;
26+
import org.springframework.boot.configurationsample.TestAccess;
2727
import org.springframework.boot.configurationsample.endpoint.CamelCaseEndpoint;
2828
import org.springframework.boot.configurationsample.endpoint.CustomPropertiesEndpoint;
2929
import org.springframework.boot.configurationsample.endpoint.EnabledEndpoint;
@@ -54,7 +54,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests {
5454
void simpleEndpoint() {
5555
ConfigurationMetadata metadata = compile(SimpleEndpoint.class);
5656
assertThat(metadata).has(Metadata.withGroup("management.endpoint.simple").fromSource(SimpleEndpoint.class));
57-
assertThat(metadata).has(access("simple", Access.UNRESTRICTED));
57+
assertThat(metadata).has(access("simple", TestAccess.UNRESTRICTED));
5858
assertThat(metadata).has(cacheTtl("simple"));
5959
assertThat(metadata.getItems()).hasSize(3);
6060
}
@@ -63,15 +63,15 @@ void simpleEndpoint() {
6363
void enabledEndpoint() {
6464
ConfigurationMetadata metadata = compile(EnabledEndpoint.class);
6565
assertThat(metadata).has(Metadata.withGroup("management.endpoint.enabled").fromSource(EnabledEndpoint.class));
66-
assertThat(metadata).has(access("enabled", Access.UNRESTRICTED));
66+
assertThat(metadata).has(access("enabled", TestAccess.UNRESTRICTED));
6767
assertThat(metadata.getItems()).hasSize(2);
6868
}
6969

7070
@Test
7171
void noAccessEndpoint() {
7272
ConfigurationMetadata metadata = compile(NoAccessEndpoint.class);
7373
assertThat(metadata).has(Metadata.withGroup("management.endpoint.noaccess").fromSource(NoAccessEndpoint.class));
74-
assertThat(metadata).has(access("noaccess", Access.NONE));
74+
assertThat(metadata).has(access("noaccess", TestAccess.NONE));
7575
assertThat(metadata.getItems()).hasSize(2);
7676
}
7777

@@ -80,7 +80,7 @@ void readOnlyAccessEndpoint() {
8080
ConfigurationMetadata metadata = compile(ReadOnlyAccessEndpoint.class);
8181
assertThat(metadata)
8282
.has(Metadata.withGroup("management.endpoint.readonlyaccess").fromSource(ReadOnlyAccessEndpoint.class));
83-
assertThat(metadata).has(access("readonlyaccess", Access.READ_ONLY));
83+
assertThat(metadata).has(access("readonlyaccess", TestAccess.READ_ONLY));
8484
assertThat(metadata.getItems()).hasSize(2);
8585
}
8686

@@ -89,7 +89,7 @@ void unrestrictedAccessEndpoint() {
8989
ConfigurationMetadata metadata = compile(UnrestrictedAccessEndpoint.class);
9090
assertThat(metadata).has(Metadata.withGroup("management.endpoint.unrestrictedaccess")
9191
.fromSource(UnrestrictedAccessEndpoint.class));
92-
assertThat(metadata).has(access("unrestrictedaccess", Access.UNRESTRICTED));
92+
assertThat(metadata).has(access("unrestrictedaccess", TestAccess.UNRESTRICTED));
9393
assertThat(metadata.getItems()).hasSize(2);
9494
}
9595

@@ -101,7 +101,7 @@ void customPropertiesEndpoint() {
101101
assertThat(metadata).has(Metadata.withProperty("management.endpoint.customprops.name")
102102
.ofType(String.class)
103103
.withDefaultValue("test"));
104-
assertThat(metadata).has(access("customprops", Access.UNRESTRICTED));
104+
assertThat(metadata).has(access("customprops", TestAccess.UNRESTRICTED));
105105
assertThat(metadata).has(cacheTtl("customprops"));
106106
assertThat(metadata.getItems()).hasSize(4);
107107
}
@@ -110,7 +110,7 @@ void customPropertiesEndpoint() {
110110
void specificEndpoint() {
111111
ConfigurationMetadata metadata = compile(SpecificEndpoint.class);
112112
assertThat(metadata).has(Metadata.withGroup("management.endpoint.specific").fromSource(SpecificEndpoint.class));
113-
assertThat(metadata).has(access("specific", Access.READ_ONLY));
113+
assertThat(metadata).has(access("specific", TestAccess.READ_ONLY));
114114
assertThat(metadata).has(cacheTtl("specific"));
115115
assertThat(metadata.getItems()).hasSize(3);
116116
}
@@ -120,7 +120,7 @@ void camelCaseEndpoint() {
120120
ConfigurationMetadata metadata = compile(CamelCaseEndpoint.class);
121121
assertThat(metadata)
122122
.has(Metadata.withGroup("management.endpoint.pascal-case").fromSource(CamelCaseEndpoint.class));
123-
assertThat(metadata).has(defaultAccess("PascalCase", "pascal-case", Access.UNRESTRICTED));
123+
assertThat(metadata).has(defaultAccess("PascalCase", "pascal-case", TestAccess.UNRESTRICTED));
124124
assertThat(metadata.getItems()).hasSize(2);
125125
}
126126

@@ -130,15 +130,15 @@ void incrementalEndpointBuildChangeDefaultAccess() {
130130
ConfigurationMetadata metadata = project.compile();
131131
assertThat(metadata)
132132
.has(Metadata.withGroup("management.endpoint.incremental").fromSource(IncrementalEndpoint.class));
133-
assertThat(metadata).has(access("incremental", Access.UNRESTRICTED));
133+
assertThat(metadata).has(access("incremental", TestAccess.UNRESTRICTED));
134134
assertThat(metadata).has(cacheTtl("incremental"));
135135
assertThat(metadata.getItems()).hasSize(3);
136136
project.replaceText(IncrementalEndpoint.class, "id = \"incremental\"",
137-
"id = \"incremental\", defaultAccess = org.springframework.boot.configurationsample.Access.NONE");
137+
"id = \"incremental\", defaultAccess = org.springframework.boot.configurationsample.TestAccess.NONE");
138138
metadata = project.compile();
139139
assertThat(metadata)
140140
.has(Metadata.withGroup("management.endpoint.incremental").fromSource(IncrementalEndpoint.class));
141-
assertThat(metadata).has(access("incremental", Access.NONE));
141+
assertThat(metadata).has(access("incremental", TestAccess.NONE));
142142
assertThat(metadata).has(cacheTtl("incremental"));
143143
assertThat(metadata.getItems()).hasSize(3);
144144
}
@@ -149,14 +149,14 @@ void incrementalEndpointBuildChangeCacheFlag() {
149149
ConfigurationMetadata metadata = project.compile();
150150
assertThat(metadata)
151151
.has(Metadata.withGroup("management.endpoint.incremental").fromSource(IncrementalEndpoint.class));
152-
assertThat(metadata).has(access("incremental", Access.UNRESTRICTED));
152+
assertThat(metadata).has(access("incremental", TestAccess.UNRESTRICTED));
153153
assertThat(metadata).has(cacheTtl("incremental"));
154154
assertThat(metadata.getItems()).hasSize(3);
155155
project.replaceText(IncrementalEndpoint.class, "@Nullable String param", "String param");
156156
metadata = project.compile();
157157
assertThat(metadata)
158158
.has(Metadata.withGroup("management.endpoint.incremental").fromSource(IncrementalEndpoint.class));
159-
assertThat(metadata).has(access("incremental", Access.UNRESTRICTED));
159+
assertThat(metadata).has(access("incremental", TestAccess.UNRESTRICTED));
160160
assertThat(metadata.getItems()).hasSize(2);
161161
}
162162

@@ -165,13 +165,14 @@ void incrementalEndpointBuildChangeAccessOfSpecificEndpoint() {
165165
TestProject project = new TestProject(SpecificEndpoint.class);
166166
ConfigurationMetadata metadata = project.compile();
167167
assertThat(metadata).has(Metadata.withGroup("management.endpoint.specific").fromSource(SpecificEndpoint.class));
168-
assertThat(metadata).has(access("specific", Access.READ_ONLY));
168+
assertThat(metadata).has(access("specific", TestAccess.READ_ONLY));
169169
assertThat(metadata).has(cacheTtl("specific"));
170170
assertThat(metadata.getItems()).hasSize(3);
171-
project.replaceText(SpecificEndpoint.class, "defaultAccess = Access.READ_ONLY", "defaultAccess = Access.NONE");
171+
project.replaceText(SpecificEndpoint.class, "defaultAccess = TestAccess.READ_ONLY",
172+
"defaultAccess = TestAccess.NONE");
172173
metadata = project.compile();
173174
assertThat(metadata).has(Metadata.withGroup("management.endpoint.specific").fromSource(SpecificEndpoint.class));
174-
assertThat(metadata).has(access("specific", Access.NONE));
175+
assertThat(metadata).has(access("specific", TestAccess.NONE));
175176
assertThat(metadata).has(cacheTtl("specific"));
176177
assertThat(metadata.getItems()).hasSize(3);
177178
}
@@ -180,7 +181,7 @@ void incrementalEndpointBuildChangeAccessOfSpecificEndpoint() {
180181
void shouldTolerateEndpointWithSameId() {
181182
ConfigurationMetadata metadata = compile(SimpleEndpoint.class, SimpleEndpoint2.class);
182183
assertThat(metadata).has(Metadata.withGroup("management.endpoint.simple").fromSource(SimpleEndpoint.class));
183-
assertThat(metadata).has(defaultAccess("simple", "simple", Access.UNRESTRICTED));
184+
assertThat(metadata).has(defaultAccess("simple", "simple", TestAccess.UNRESTRICTED));
184185
assertThat(metadata).has(cacheTtl("simple"));
185186
assertThat(metadata.getItems()).hasSize(3);
186187
}
@@ -199,17 +200,17 @@ void endpointWithNullableParameter() {
199200
ConfigurationMetadata metadata = compile(NullableParameterEndpoint.class);
200201
assertThat(metadata)
201202
.has(Metadata.withGroup("management.endpoint.nullable").fromSource(NullableParameterEndpoint.class));
202-
assertThat(metadata).has(access("nullable", Access.UNRESTRICTED));
203+
assertThat(metadata).has(access("nullable", TestAccess.UNRESTRICTED));
203204
assertThat(metadata).has(cacheTtl("nullable"));
204205
assertThat(metadata.getItems()).hasSize(3);
205206
}
206207

207-
private Metadata.MetadataItemCondition access(String endpointId, Access defaultValue) {
208+
private Metadata.MetadataItemCondition access(String endpointId, TestAccess defaultValue) {
208209
return defaultAccess(endpointId, endpointId, defaultValue);
209210
}
210211

211212
private Metadata.MetadataItemCondition defaultAccess(String endpointId, String endpointSuffix,
212-
Access defaultValue) {
213+
TestAccess defaultValue) {
213214
return Metadata.withAccess("management.endpoint." + endpointSuffix + ".access")
214215
.withDefaultValue(defaultValue.name().toLowerCase(Locale.ENGLISH))
215216
.withDescription("Permitted level of access for the %s endpoint.".formatted(endpointId));

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/IncrementalBuildMetadataGenerationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ void incrementalBuildAnnotationRemoved() {
6666
ConfigurationMetadata metadata = project.compile();
6767
assertThat(metadata).has(Metadata.withProperty("foo.counter").withDefaultValue(0));
6868
assertThat(metadata).has(Metadata.withProperty("bar.counter").withDefaultValue(0));
69-
project.replaceText(BarProperties.class, "@ConfigurationProperties", "//@ConfigurationProperties");
70-
project.replaceText(FooProperties.class, "@ConfigurationProperties", "//@ConfigurationProperties");
69+
project.replaceText(BarProperties.class, "@TestConfigurationProperties", "//@TestConfigurationProperties");
70+
project.replaceText(FooProperties.class, "@TestConfigurationProperties", "//@TestConfigurationProperties");
7171
metadata = project.compile();
7272
assertThat(metadata).isNull();
7373
}

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.springframework.boot.configurationprocessor.metadata.JsonMarshaller;
3030
import org.springframework.boot.configurationprocessor.test.CompiledMetadataReader;
3131
import org.springframework.boot.configurationprocessor.test.TestConfigurationMetadataAnnotationProcessor;
32-
import org.springframework.boot.configurationsample.ConfigurationProperties;
33-
import org.springframework.boot.configurationsample.NestedConfigurationProperty;
32+
import org.springframework.boot.configurationsample.TestConfigurationProperties;
33+
import org.springframework.boot.configurationsample.TestNestedConfigurationProperty;
3434
import org.springframework.core.test.tools.ResourceFile;
3535
import org.springframework.core.test.tools.SourceFile;
3636
import org.springframework.core.test.tools.SourceFiles;
@@ -50,8 +50,8 @@
5050
*/
5151
public class TestProject {
5252

53-
private static final Class<?>[] ALWAYS_INCLUDE = { ConfigurationProperties.class,
54-
NestedConfigurationProperty.class };
53+
private static final Class<?>[] ALWAYS_INCLUDE = { TestConfigurationProperties.class,
54+
TestNestedConfigurationProperty.class };
5555

5656
private SourceFiles sources;
5757

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void getFieldValues() {
116116
assertThat(values.get("memberSelectInt")).isNull();
117117
}
118118

119-
@SupportedAnnotationTypes({ "org.springframework.boot.configurationsample.ConfigurationProperties" })
119+
@SupportedAnnotationTypes({ "org.springframework.boot.configurationsample.TestConfigurationProperties" })
120120
@SupportedSourceVersion(SourceVersion.RELEASE_6)
121121
private final class TestProcessor extends AbstractProcessor {
122122

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.hamcrest.collection.IsMapContaining;
2626

2727
import org.springframework.boot.configurationprocessor.metadata.ItemMetadata.ItemType;
28-
import org.springframework.boot.configurationsample.Access;
28+
import org.springframework.boot.configurationsample.TestAccess;
2929
import org.springframework.util.ObjectUtils;
3030

3131
/**
@@ -68,7 +68,7 @@ public static Metadata.MetadataItemCondition withEnabledFlag(String key) {
6868
}
6969

7070
public static Metadata.MetadataItemCondition withAccess(String key) {
71-
return withProperty(key).ofType(Access.class);
71+
return withProperty(key).ofType(TestAccess.class);
7272
}
7373

7474
public static MetadataHintCondition withHint(String name) {

configuration-metadata/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/TestConfigurationMetadataAnnotationProcessor.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,37 +47,37 @@
4747
@SupportedSourceVersion(SourceVersion.RELEASE_6)
4848
public class TestConfigurationMetadataAnnotationProcessor extends ConfigurationMetadataAnnotationProcessor {
4949

50-
public static final String CONFIGURATION_PROPERTIES_ANNOTATION = "org.springframework.boot.configurationsample.ConfigurationProperties";
50+
public static final String CONFIGURATION_PROPERTIES_ANNOTATION = "org.springframework.boot.configurationsample.TestConfigurationProperties";
5151

52-
public static final String CONFIGURATION_PROPERTIES_SOURCE_ANNOTATION = "org.springframework.boot.configurationsample.ConfigurationPropertiesSource";
52+
public static final String CONFIGURATION_PROPERTIES_SOURCE_ANNOTATION = "org.springframework.boot.configurationsample.TestConfigurationPropertiesSource";
5353

54-
public static final String NESTED_CONFIGURATION_PROPERTY_ANNOTATION = "org.springframework.boot.configurationsample.NestedConfigurationProperty";
54+
public static final String NESTED_CONFIGURATION_PROPERTY_ANNOTATION = "org.springframework.boot.configurationsample.TestNestedConfigurationProperty";
5555

56-
public static final String DEPRECATED_CONFIGURATION_PROPERTY_ANNOTATION = "org.springframework.boot.configurationsample.DeprecatedConfigurationProperty";
56+
public static final String DEPRECATED_CONFIGURATION_PROPERTY_ANNOTATION = "org.springframework.boot.configurationsample.TestDeprecatedConfigurationProperty";
5757

58-
public static final String CONSTRUCTOR_BINDING_ANNOTATION = "org.springframework.boot.configurationsample.ConstructorBinding";
58+
public static final String CONSTRUCTOR_BINDING_ANNOTATION = "org.springframework.boot.configurationsample.TestConstructorBinding";
5959

60-
public static final String AUTOWIRED_ANNOTATION = "org.springframework.boot.configurationsample.Autowired";
60+
public static final String AUTOWIRED_ANNOTATION = "org.springframework.boot.configurationsample.TestAutowired";
6161

62-
public static final String DEFAULT_VALUE_ANNOTATION = "org.springframework.boot.configurationsample.DefaultValue";
62+
public static final String DEFAULT_VALUE_ANNOTATION = "org.springframework.boot.configurationsample.TestDefaultValue";
6363

64-
public static final String CONTROLLER_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.ControllerEndpoint";
64+
public static final String CONTROLLER_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestControllerEndpoint";
6565

66-
public static final String ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.Endpoint";
66+
public static final String ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestEndpoint";
6767

68-
public static final String JMX_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.JmxEndpoint";
68+
public static final String JMX_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestJmxEndpoint";
6969

70-
public static final String REST_CONTROLLER_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.RestControllerEndpoint";
70+
public static final String REST_CONTROLLER_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestRestControllerEndpoint";
7171

72-
public static final String SERVLET_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.ServletEndpoint";
72+
public static final String SERVLET_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestServletEndpoint";
7373

74-
public static final String WEB_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.WebEndpoint";
74+
public static final String WEB_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestWebEndpoint";
7575

76-
public static final String READ_OPERATION_ANNOTATION = "org.springframework.boot.configurationsample.ReadOperation";
76+
public static final String READ_OPERATION_ANNOTATION = "org.springframework.boot.configurationsample.TestReadOperation";
7777

78-
public static final String NAME_ANNOTATION = "org.springframework.boot.configurationsample.Name";
78+
public static final String NAME_ANNOTATION = "org.springframework.boot.configurationsample.TestName";
7979

80-
public static final String ENDPOINT_ACCESS_ENUM = "org.springframework.boot.configurationsample.Access";
80+
public static final String ENDPOINT_ACCESS_ENUM = "org.springframework.boot.configurationsample.TestAccess";
8181

8282
public TestConfigurationMetadataAnnotationProcessor() {
8383
}
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
package org.springframework.boot.configurationsample;
1818

1919
/**
20-
* Permitted level of access to an endpoint.
20+
* Alternative to Spring Boot's {@code @Access} for testing (removes the need for a
21+
* dependency on the real annotation).
2122
*
2223
* @author Andy Wilkinson
2324
*/
24-
public enum Access {
25+
public enum TestAccess {
2526

2627
NONE,
2728

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
@Target({ ElementType.TYPE, ElementType.CONSTRUCTOR })
3232
@Retention(RetentionPolicy.RUNTIME)
3333
@Documented
34-
public @interface Autowired {
34+
public @interface TestAutowired {
3535

3636
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@Target({ ElementType.TYPE, ElementType.METHOD })
3333
@Retention(RetentionPolicy.RUNTIME)
3434
@Documented
35-
public @interface ConfigurationProperties {
35+
public @interface TestConfigurationProperties {
3636

3737
String value() default "";
3838

0 commit comments

Comments
 (0)