From b7979cf443a68c00e2ca45267b0a7a80518d0ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 18 Oct 2024 08:07:45 +0200 Subject: [PATCH] Use AbstractAotProcessor.AOT_PROCESSING instead of duplicate constant Closes gh-42461 --- .../compose/lifecycle/DockerComposeLifecycleManager.java | 3 ++- .../lifecycle/DockerComposeLifecycleManagerTests.java | 3 ++- .../lifecycle/TestcontainersLifecycleBeanPostProcessor.java | 3 ++- .../ServiceConnectionContextCustomizerFactory.java | 5 +++-- ...ontainersLifecycleApplicationContextInitializerTests.java | 3 ++- .../boot/logging/logback/SpringBootJoranConfigurator.java | 3 ++- .../logback/LogbackConfigurationAotContributionTests.java | 3 ++- .../logging/logback/SpringBootJoranConfiguratorTests.java | 3 ++- src/checkstyle/import-control.xml | 1 + 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java index 92259ad60db0..9611022fcbda 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java +++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java @@ -36,6 +36,7 @@ import org.springframework.boot.docker.compose.lifecycle.DockerComposeProperties.Stop; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; +import org.springframework.context.aot.AbstractAotProcessor; import org.springframework.context.event.SimpleApplicationEventMulticaster; import org.springframework.core.log.LogMessage; import org.springframework.util.Assert; @@ -95,7 +96,7 @@ class DockerComposeLifecycleManager { } void start() { - if (Boolean.getBoolean("spring.aot.processing") || AotDetector.useGeneratedArtifacts()) { + if (Boolean.getBoolean(AbstractAotProcessor.AOT_PROCESSING) || AotDetector.useGeneratedArtifacts()) { logger.trace("Docker Compose support disabled with AOT and native images"); return; } diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManagerTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManagerTests.java index 331b9dee36b2..74e5d851fd8c 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManagerTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManagerTests.java @@ -44,6 +44,7 @@ import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationListener; +import org.springframework.context.aot.AbstractAotProcessor; import org.springframework.context.support.GenericApplicationContext; import org.springframework.util.FileCopyUtils; @@ -126,7 +127,7 @@ void startWhenEnabledFalseDoesNotStart() { @Test void startWhenAotProcessingDoesNotStart() { - withSystemProperty("spring.aot.processing", "true", () -> { + withSystemProperty(AbstractAotProcessor.AOT_PROCESSING, "true", () -> { EventCapturingListener listener = new EventCapturingListener(); this.eventListeners.add(listener); setUpRunningServices(); diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanPostProcessor.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanPostProcessor.java index ee3e52434ff8..f1754048e98a 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanPostProcessor.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanPostProcessor.java @@ -40,6 +40,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor; import org.springframework.context.ApplicationListener; +import org.springframework.context.aot.AbstractAotProcessor; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.core.log.LogMessage; @@ -103,7 +104,7 @@ else if (this.startables.get() == Startables.STARTED) { } private boolean isAotProcessingInProgress() { - return Boolean.getBoolean("spring.aot.processing"); + return Boolean.getBoolean(AbstractAotProcessor.AOT_PROCESSING); } private void initializeStartables(Startable startableBean, String startableBeanName) { diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java index 1f18f06c1a0d..be70abf4527c 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ import org.testcontainers.containers.Container; import org.springframework.boot.origin.Origin; +import org.springframework.context.aot.AbstractAotProcessor; import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotations; import org.springframework.test.context.ContextConfigurationAttributes; @@ -96,7 +97,7 @@ private Object getFieldValue(Field field) { } private boolean isAotProcessingInProgress() { - return Boolean.getBoolean("spring.aot.processing"); + return Boolean.getBoolean(AbstractAotProcessor.AOT_PROCESSING); } } diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java index 9d9da72efc6f..9aea10896e14 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java @@ -30,6 +30,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.aot.AbstractAotProcessor; import org.springframework.core.env.MapPropertySource; import static org.assertj.core.api.Assertions.assertThat; @@ -149,7 +150,7 @@ void doesNotStartContainersWhenAotProcessingIsInProgress() { GenericContainer container = mock(GenericContainer.class); AnnotationConfigApplicationContext applicationContext = createApplicationContext(container); then(container).shouldHaveNoInteractions(); - withSystemProperty("spring.aot.processing", "true", + withSystemProperty(AbstractAotProcessor.AOT_PROCESSING, "true", () -> applicationContext.refreshForAotProcessing(new RuntimeHints())); then(container).shouldHaveNoInteractions(); applicationContext.close(); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java index d205ebd820b3..2945e2bc7edc 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java @@ -60,6 +60,7 @@ import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution; import org.springframework.beans.factory.aot.BeanFactoryInitializationCode; import org.springframework.boot.logging.LoggingInitializationContext; +import org.springframework.context.aot.AbstractAotProcessor; import org.springframework.core.CollectionFactory; import org.springframework.core.NativeDetector; import org.springframework.core.io.ByteArrayResource; @@ -140,7 +141,7 @@ public void processModel(Model model) { } private boolean isAotProcessingInProgress() { - return Boolean.getBoolean("spring.aot.processing"); + return Boolean.getBoolean(AbstractAotProcessor.AOT_PROCESSING); } static final class LogbackConfigurationAotContribution implements BeanFactoryInitializationAotContribution { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java index a2cd1ded8f98..7d2e4944cfc2 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackConfigurationAotContributionTests.java @@ -59,6 +59,7 @@ import org.springframework.aot.test.generate.TestGenerationContext; import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution; import org.springframework.boot.logging.logback.SpringBootJoranConfigurator.LogbackConfigurationAotContribution; +import org.springframework.context.aot.AbstractAotProcessor; import org.springframework.core.io.InputStreamSource; import static org.assertj.core.api.Assertions.assertThat; @@ -287,7 +288,7 @@ private void applyContribution(Model model, Consumer contextCusto contextCustomizer.accept(context); SpringBootJoranConfigurator configurator = new SpringBootJoranConfigurator(null); configurator.setContext(context); - withSystemProperty("spring.aot.processing", "true", () -> configurator.processModel(model)); + withSystemProperty(AbstractAotProcessor.AOT_PROCESSING, "true", () -> configurator.processModel(model)); LogbackConfigurationAotContribution contribution = (LogbackConfigurationAotContribution) context .getObject(BeanFactoryInitializationAotContribution.class.getName()); contribution.applyTo(generationContext, null); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java index 4bcc73127c2b..22a6584b343f 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/SpringBootJoranConfiguratorTests.java @@ -32,6 +32,7 @@ import org.springframework.boot.logging.LoggingInitializationContext; import org.springframework.boot.testsupport.system.CapturedOutput; import org.springframework.boot.testsupport.system.OutputCaptureExtension; +import org.springframework.context.aot.AbstractAotProcessor; import org.springframework.mock.env.MockEnvironment; import org.springframework.test.context.support.TestPropertySourceUtils; @@ -221,7 +222,7 @@ void springPropertyInInclude() throws Exception { @Test void addsAotContributionToContextDuringAotProcessing() throws Exception { - withSystemProperty("spring.aot.processing", "true", () -> { + withSystemProperty(AbstractAotProcessor.AOT_PROCESSING, "true", () -> { initialize("property.xml"); Object contribution = this.context.getObject(BeanFactoryInitializationAotContribution.class.getName()); assertThat(contribution).isNotNull(); diff --git a/src/checkstyle/import-control.xml b/src/checkstyle/import-control.xml index b3c993a4543f..b35047ae8037 100644 --- a/src/checkstyle/import-control.xml +++ b/src/checkstyle/import-control.xml @@ -77,6 +77,7 @@ +