Revert "Merge pull request #33643 from libetl"

This reverts commit 25e8f2d, reversing
changes made to e5bc9a2.

Unfortunately, upon additional review we realised that these changes
should not have been accepted. They're a partial implementation of
support for programmatically configuring Logback, implemented in a way
that only works during AOT processing and also potentially makes it
harder for us to implement full support in the future.

Closes gh-34361

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java

@@ -20,8 +20,6 @@
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.ConsoleHandler;
@@ -84,8 +82,6 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF
 
 	private static final LogLevels<Level> LEVELS = new LogLevels<>();
 
-	private Collection<JoranConfigurator> configurators = Collections.emptyList();
-
 	static {
 		LEVELS.map(LogLevel.TRACE, Level.TRACE);
 		LEVELS.map(LogLevel.TRACE, Level.ALL);
@@ -187,7 +183,7 @@ public void initialize(LoggingInitializationContext initializationContext, Strin
 		if (isAlreadyInitialized(loggerContext)) {
 			return;
 		}
-		if (!initializeFromAotGeneratedArtifactsIfPossible(initializationContext, this.configurators, logFile)) {
+		if (!initializeFromAotGeneratedArtifactsIfPossible(initializationContext, logFile)) {
 			super.initialize(initializationContext, configLocation, logFile);
 		}
 		loggerContext.getTurboFilterList().remove(FILTER);
@@ -199,7 +195,7 @@ public void initialize(LoggingInitializationContext initializationContext, Strin
 	}
 
 	private boolean initializeFromAotGeneratedArtifactsIfPossible(LoggingInitializationContext initializationContext,
-			Collection<JoranConfigurator> configurators, LogFile logFile) {
+			LogFile logFile) {
 		if (!AotDetector.useGeneratedArtifacts()) {
 			return false;
 		}
@@ -208,8 +204,7 @@ private boolean initializeFromAotGeneratedArtifactsIfPossible(LoggingInitializat
 		}
 		LoggerContext loggerContext = getLoggerContext();
 		stopAndReset(loggerContext);
-		SpringBootJoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext,
-				configurators);
+		SpringBootJoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext);
 		configurator.setContext(loggerContext);
 		boolean configuredUsingAotGeneratedArtifacts = configurator.configureUsingAotGeneratedArtifacts();
 		if (configuredUsingAotGeneratedArtifacts) {
@@ -272,7 +267,7 @@ private void reportConfigurationErrorsIfNecessary(LoggerContext loggerContext) {
 	private void configureByResourceUrl(LoggingInitializationContext initializationContext, LoggerContext loggerContext,
 			URL url) throws JoranException {
 		if (url.toString().endsWith(".xml")) {
-			JoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext, this.configurators);
+			JoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext);
 			configurator.setContext(loggerContext);
 			configurator.doConfigure(url);
 		}
@@ -427,8 +422,6 @@ public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableL
 		BeanFactoryInitializationAotContribution contribution = (BeanFactoryInitializationAotContribution) context
 			.getObject(key);
 		context.removeObject(key);
-		this.configurators = beanFactory.getBeansOfType(JoranConfigurator.class).values();
-		this.configurators.forEach((configurator) -> configurator.setContext(context));
 		return contribution;
 	}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java

@@ -26,7 +26,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -79,16 +78,8 @@ class SpringBootJoranConfigurator extends JoranConfigurator {
 
 	private final LoggingInitializationContext initializationContext;
 
-	private final Collection<JoranConfigurator> configurators;
-
 	SpringBootJoranConfigurator(LoggingInitializationContext initializationContext) {
-		this(initializationContext, Collections.emptyList());
-	}
-
-	SpringBootJoranConfigurator(LoggingInitializationContext initializationContext,
-			Collection<JoranConfigurator> configurators) {
 		this.initializationContext = initializationContext;
-		this.configurators = configurators;
 	}
 
 	@Override
@@ -114,7 +105,6 @@ public void addElementSelectorAndActionAssociations(RuleStore ruleStore) {
 		ruleStore.addRule(new ElementSelector("configuration/springProperty"), SpringPropertyAction::new);
 		ruleStore.addRule(new ElementSelector("*/springProfile"), SpringProfileAction::new);
 		ruleStore.addTransparentPathPart("springProfile");
-		this.configurators.forEach((configurator) -> configurator.addElementSelectorAndActionAssociations(ruleStore));
 	}
 
 	boolean configureUsingAotGeneratedArtifacts() {
@@ -134,7 +124,6 @@ public void processModel(Model model) {
 			getContext().putObject(BeanFactoryInitializationAotContribution.class.getName(),
 					new LogbackConfigurationAotContribution(model, getModelInterpretationContext(), getContext()));
 		}
-		this.configurators.forEach((configurator) -> configurator.processModel(model));
 	}
 
 	private boolean isAotProcessingInProgress() {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java

@@ -33,15 +33,9 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.classic.spi.LoggerContextListener;
 import ch.qos.logback.core.ConsoleAppender;
 import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
-import ch.qos.logback.core.joran.action.Action;
-import ch.qos.logback.core.joran.spi.ActionException;
-import ch.qos.logback.core.joran.spi.ElementSelector;
-import ch.qos.logback.core.joran.spi.RuleStore;
-import ch.qos.logback.core.joran.spi.SaxEventInterpretationContext;
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy;
 import ch.qos.logback.core.util.StatusPrinter;
@@ -52,10 +46,8 @@
 import org.slf4j.ILoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
-import org.xml.sax.Attributes;
 
 import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.convert.ApplicationConversionService;
 import org.springframework.boot.logging.AbstractLoggingSystemTests;
 import org.springframework.boot.logging.LogFile;
@@ -662,8 +654,7 @@ void customCharset() {
 
 	@Test
 	void whenContextHasNoAotContributionThenProcessAheadOfTimeReturnsNull() {
-		BeanFactoryInitializationAotContribution contribution = this.loggingSystem
-			.processAheadOfTime(new DefaultListableBeanFactory());
+		BeanFactoryInitializationAotContribution contribution = this.loggingSystem.processAheadOfTime(null);
 		assertThat(contribution).isNull();
 	}
 
@@ -672,34 +663,11 @@ void whenContextHasAotContributionThenProcessAheadOfTimeClearsAndReturnsIt() {
 		LoggerContext context = ((LoggerContext) LoggerFactory.getILoggerFactory());
 		context.putObject(BeanFactoryInitializationAotContribution.class.getName(),
 				mock(BeanFactoryInitializationAotContribution.class));
-		BeanFactoryInitializationAotContribution contribution = this.loggingSystem
-			.processAheadOfTime(new DefaultListableBeanFactory());
+		BeanFactoryInitializationAotContribution contribution = this.loggingSystem.processAheadOfTime(null);
 		assertThat(context.getObject(BeanFactoryInitializationAotContribution.class.getName())).isNull();
 		assertThat(contribution).isNotNull();
 	}
 
-	@Test
-	void whenContextHasConfiguratorsThenInitializeExecutesThem(CapturedOutput output) {
-		LoggerContext context = ((LoggerContext) LoggerFactory.getILoggerFactory());
-		context.putObject(BeanFactoryInitializationAotContribution.class.getName(),
-				mock(BeanFactoryInitializationAotContribution.class));
-		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
-		beanFactory.registerSingleton("joranConfigurator1", new JoranConfigurator() {
-
-			@Override
-			public void addElementSelectorAndActionAssociations(RuleStore ruleStore) {
-				ruleStore.addRule(new ElementSelector("*/rule1"), () -> new EmptyAction());
-				ruleStore.addRule(new ElementSelector("*/rule2"), () -> new EmptyAction());
-			}
-
-		});
-		this.loggingSystem.processAheadOfTime(beanFactory);
-		this.loggingSystem.beforeInitialize();
-		initialize(this.initializationContext, "classpath:logback-custom-rules.xml", null);
-		assertThat(output).doesNotContain("Ignoring unknown property [rule1] in [ch.qos.logback.classic.LoggerContext]")
-			.doesNotContain("Ignoring unknown property [rule2] in [ch.qos.logback.classic.LoggerContext]");
-	}
-
 	@Test // gh-33610
 	void springProfileIfNestedWithinSecondPhaseElementSanityChecker(CapturedOutput output) {
 		this.loggingSystem.beforeInitialize();
@@ -742,17 +710,4 @@ private String getLineWithText(CharSequence output, CharSequence outputSearch) {
 			.orElse(null);
 	}
 
-	private static class EmptyAction extends Action {
-
-		@Override
-		public void begin(SaxEventInterpretationContext intercon, String name, Attributes attributes)
-				throws ActionException {
-		}
-
-		@Override
-		public void end(SaxEventInterpretationContext intercon, String name) throws ActionException {
-		}
-
-	}
-
 }