Skip to content
This repository was archived by the owner on Feb 23, 2023. It is now read-only.

Commit f8ca8e0

Browse files
committed
Prevent printing "AOT mode disabled" during test code generation
Closes gh-1332
1 parent 417dd02 commit f8ca8e0

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

spring-aot/src/main/java/org/springframework/aot/factories/ModifiedSpringApplicationContributor.java

+2
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ public void visitInsn(int opcode) {
277277
mv.visitMethodInsn(INVOKEVIRTUAL, "org/springframework/boot/SpringApplication", "setInitializers", "(Ljava/util/Collection;)V", false);
278278
mv.visitJumpInsn(GOTO, end);
279279
mv.visitLabel(elseClause);
280+
mv.visitMethodInsn(INVOKESTATIC, "org/springframework/nativex/AotModeDetector", "isGeneratingAotTests", "()Z", false);
281+
mv.visitJumpInsn(IFNE, end);
280282
mv.visitFieldInsn(GETSTATIC, "org/springframework/boot/SpringApplication", "logger",
281283
"Lorg/apache/commons/logging/Log;");
282284
mv.visitLdcInsn("AOT mode disabled");

spring-native/src/main/java/org/springframework/nativex/AotModeDetector.java

+5
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,13 @@ public static boolean isAotModeEnabled() {
5252
}
5353
return false;
5454
}
55+
5556
public static boolean isRunningAotTests() {
5657
return generatedTestClassPresent && !aotTestClassPresent;
5758
}
5859

60+
public static boolean isGeneratingAotTests() {
61+
return aotTestClassPresent;
62+
}
63+
5964
}

spring-native/src/main/java/org/springframework/nativex/substitutions/boot/Target_SpringApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ else if (AotModeDetector.isAotModeEnabled()) {
126126
initializers.addAll((Collection)getSpringFactoriesInstances(ApplicationContextInitializer.class));
127127
setInitializers(initializers);
128128
}
129-
else {
129+
else if (!AotModeDetector.isGeneratingAotTests()) {
130130
logger.info("AOT mode disabled");
131131
setInitializers((Collection) getSpringFactoriesInstances(ApplicationContextInitializer.class));
132132
}

0 commit comments

Comments
 (0)