Skip to content

Commit 8e895b3

Browse files
committed
Update AOT tests to fail if deprecated code is not suppressed
Closes gh-48566
1 parent 15eaa46 commit 8e895b3

File tree

7 files changed

+47
-31
lines changed

7 files changed

+47
-31
lines changed

core/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderAotTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ void loadContextForAotProcessingAndAotRuntime() {
6060
Class<?> testClass = ExampleTest.class;
6161
generator.processAheadOfTime(Stream.of(testClass));
6262
TestCompiler.forSystem()
63+
.withCompilerOptions("-Xlint:deprecation", "-Werror")
6364
.with(CompilerFiles.from(generatedFiles))
6465
.compile(ThrowingConsumer.of((compiled) -> assertCompiledTest(testClass)));
6566
}

core/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrationAotProcessorTests.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,16 @@ private void compile(GenericApplicationContext context, Consumer<GenericApplicat
160160
TestGenerationContext generationContext = new TestGenerationContext(TestTarget.class);
161161
ClassName className = new ApplicationContextAotGenerator().processAheadOfTime(context, generationContext);
162162
generationContext.writeGeneratedContent();
163-
TestCompiler.forSystem().with(generationContext).compile((compiled) -> {
164-
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
165-
ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
166-
.getInstance(ApplicationContextInitializer.class, className.toString());
167-
initializer.initialize(freshApplicationContext);
168-
freshContext.accept(freshApplicationContext);
169-
});
163+
TestCompiler.forSystem()
164+
.withCompilerOptions("-Xlint:deprecation", "-Werror")
165+
.with(generationContext)
166+
.compile((compiled) -> {
167+
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
168+
ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
169+
.getInstance(ApplicationContextInitializer.class, className.toString());
170+
initializer.initialize(freshApplicationContext);
171+
freshContext.accept(freshApplicationContext);
172+
});
170173
}
171174

172175
@Configuration(proxyBeanMethods = false)

core/spring-boot/src/test/java/org/springframework/boot/support/EnvironmentPostProcessorApplicationListenerTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,10 @@ private void compile(GenericApplicationContext context, Consumer<Compiled> compi
307307
TestGenerationContext generationContext = new TestGenerationContext(TEST_APP);
308308
new ApplicationContextAotGenerator().processAheadOfTime(context, generationContext);
309309
generationContext.writeGeneratedContent();
310-
TestCompiler.forSystem().with(generationContext).compile(compiled);
310+
TestCompiler.forSystem()
311+
.withCompilerOptions("-Xlint:deprecation", "-Werror")
312+
.with(generationContext)
313+
.compile(compiled);
311314
}
312315

313316
private ClassLoader createClassLoaderWithAdditionalSpringFactories(Path tempDir, Properties properties) {

module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/ResourceProviderCustomizerBeanRegistrationAotProcessorTests.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,16 @@ private void compile(GenericApplicationContext context, Consumer<GenericApplicat
8787
TestGenerationContext generationContext = new TestGenerationContext(TestTarget.class);
8888
ClassName className = new ApplicationContextAotGenerator().processAheadOfTime(context, generationContext);
8989
generationContext.writeGeneratedContent();
90-
TestCompiler.forSystem().with(generationContext).compile((compiled) -> {
91-
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
92-
ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
93-
.getInstance(ApplicationContextInitializer.class, className.toString());
94-
initializer.initialize(freshApplicationContext);
95-
freshContext.accept(freshApplicationContext);
96-
});
90+
TestCompiler.forSystem()
91+
.withCompilerOptions("-Xlint:deprecation", "-Werror")
92+
.with(generationContext)
93+
.compile((compiled) -> {
94+
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
95+
ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
96+
.getInstance(ApplicationContextInitializer.class, className.toString());
97+
initializer.initialize(freshApplicationContext);
98+
freshContext.accept(freshApplicationContext);
99+
});
97100
}
98101

99102
static class TestTarget {

module/spring-boot-jackson/src/test/java/org/springframework/boot/jackson/JacksonMixinModuleEntriesBeanRegistrationAotProcessorTests.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,17 @@ private ClassName processAheadOfTime() {
106106
@SuppressWarnings("unchecked")
107107
private void compile(BiConsumer<GenericApplicationContext, Compiled> result) {
108108
ClassName className = processAheadOfTime();
109-
TestCompiler.forSystem().with(this.generationContext).compile((compiled) -> {
110-
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
111-
ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
112-
.getInstance(ApplicationContextInitializer.class, className.toString());
113-
initializer.initialize(freshApplicationContext);
114-
freshApplicationContext.refresh();
115-
result.accept(freshApplicationContext, compiled);
116-
});
109+
TestCompiler.forSystem()
110+
.withCompilerOptions("-Xlint:deprecation", "-Werror")
111+
.with(this.generationContext)
112+
.compile((compiled) -> {
113+
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
114+
ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
115+
.getInstance(ApplicationContextInitializer.class, className.toString());
116+
initializer.initialize(freshApplicationContext);
117+
freshApplicationContext.refresh();
118+
result.accept(freshApplicationContext, compiled);
119+
});
117120
}
118121

119122
private void registerEntries(Class<?>... basePackageClasses) {

module/spring-boot-jackson2/src/test/java/org/springframework/boot/jackson2/JsonMixinModuleEntriesBeanRegistrationAotProcessorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private ClassName processAheadOfTime() {
110110
private void compile(BiConsumer<GenericApplicationContext, Compiled> result) {
111111
ClassName className = processAheadOfTime();
112112
TestCompiler.forSystem()
113-
.withCompilerOptions("-Xlint:all", "-Werror")
113+
.withCompilerOptions("-Xlint:deprecation", "-Werror")
114114
.with(this.generationContext)
115115
.compile((compiled) -> {
116116
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();

module/spring-boot-web-server/src/test/java/org/springframework/boot/web/server/servlet/context/ServletComponentScanRegistrarTests.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,16 @@ private void compile(GenericApplicationContext context, Consumer<GenericApplicat
176176
ClassName.get(getClass().getPackageName(), "TestTarget"));
177177
ClassName className = new ApplicationContextAotGenerator().processAheadOfTime(context, generationContext);
178178
generationContext.writeGeneratedContent();
179-
TestCompiler.forSystem().with(generationContext).compile((compiled) -> {
180-
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
181-
ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
182-
.getInstance(ApplicationContextInitializer.class, className.toString());
183-
initializer.initialize(freshApplicationContext);
184-
freshContext.accept(freshApplicationContext);
185-
});
179+
TestCompiler.forSystem()
180+
.withCompilerOptions("-Xlint:deprecation", "-Werror")
181+
.with(generationContext)
182+
.compile((compiled) -> {
183+
GenericApplicationContext freshApplicationContext = new GenericApplicationContext();
184+
ApplicationContextInitializer<GenericApplicationContext> initializer = compiled
185+
.getInstance(ApplicationContextInitializer.class, className.toString());
186+
initializer.initialize(freshApplicationContext);
187+
freshContext.accept(freshApplicationContext);
188+
});
186189
}
187190

188191
@Configuration(proxyBeanMethods = false)

0 commit comments

Comments
 (0)