SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test changes in BinderChildContextInitializer

Browse Source 
- In child test contexts, we are not able to set the logging levels
   and this affects certain AOT integration tests. This does not seem
   to be an issue in real applications. Adjust the logging levels
   becasue of this in BinderChildContextInitializer and related classes.

 - Re-enable BinderChildContextInitializerTests
This commit is contained in:
Soby Chacko
2023-10-27 15:42:49 -04:00
parent 0603500cfc
commit a2d4bddf08
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/BinderChildContextInitializer.java
View File

@@ -77,7 +77,7 @@ public class BinderChildContextInitializer implements ApplicationContextAware, B
Assert.notNull(binderFactory, () -> "binderFactory must be non-null");
this.binderFactory = binderFactory;
if (!this.childContextInitializers.isEmpty()) {
this.logger.debug(() -> "Setting binder child context initializers on binder factory");
this.logger.info(() -> "Setting binder child context initializers on binder factory");
this.binderFactory.setBinderChildContextInitializers(this.childContextInitializers);
}
}
@@ -90,7 +90,7 @@ public class BinderChildContextInitializer implements ApplicationContextAware, B
@Override
public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
if (registeredBean.getBeanClass().equals(getClass())) { //&& registeredBean.getBeanFactory().equals(this.context)) {
this.logger.debug(() -> "Beginning AOT processing for binder child contexts");
this.logger.info(() -> "Beginning AOT processing for binder child contexts");
ensureBinderFactoryIsSet();
// Load the binding service properties from the environment and update the binder factory with them
// in order to pick up any user-declared binders. Without this step only the default binder defined
@@ -144,7 +144,7 @@ public class BinderChildContextInitializer implements ApplicationContextAware, B
@SuppressWarnings({"unchecked"})
public BinderChildContextInitializer withChildContextInitializers(
Map<String, ApplicationContextInitializer<? extends ConfigurableApplicationContext>> childContextInitializers) {
this.logger.debug(() -> "Replacing instance w/ one that uses child context initializers");
this.logger.info(() -> "Replacing instance w/ one that uses child context initializers");
Map<String, ApplicationContextInitializer<ConfigurableApplicationContext>> downcastedInitializers =
childContextInitializers.entrySet().stream()
.map(e -> Map.entry(e.getKey(), (ApplicationContextInitializer<ConfigurableApplicationContext>) e.getValue()))
@@ -182,7 +182,7 @@ public class BinderChildContextInitializer implements ApplicationContextAware, B
method.addStatement("$T<String, $T<? extends $T>> initializers = new $T<>()", Map.class,
ApplicationContextInitializer.class, ConfigurableApplicationContext.class, HashMap.class);
this.childContexts.forEach((name, context) -> {
this.logger.debug(() -> "Generating AOT child context initializer for " + name);
this.logger.info(() -> "Generating AOT child context initializer for " + name);
GenerationContext childGenerationContext = generationContext.withName(name + "Binder");
ClassName initializerClassName = aotGenerator.processAheadOfTime(context, childGenerationContext);
method.addStatement("$T<? extends $T> " + name + "Initializer = new $L()", ApplicationContextInitializer.class,

2
core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/DefaultBinderFactory.java
View File

@@ -190,7 +190,7 @@ public class DefaultBinderFactory implements BinderFactory, DisposableBean, Appl
return this.getBinderInstance(kafkaStreamsBinderSimpleName);
}
String configurationName = this.binderChildContextInitializers.keySet().iterator().next();
this.logger.debug("No specific name or default given - using single available child initializer '" + configurationName + "'");
this.logger.info("No specific name or default given - using single available child initializer '" + configurationName + "'");
return this.getBinderInstance(configurationName);
}
throw new IllegalStateException("No specific name or default given - can't determine which binder to use");

13
core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderChildContextInitializerTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.stream.binder;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Supplier;
@@ -42,6 +43,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.aot.ApplicationContextAotGenerator;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.convert.support.GenericConversionService;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.log.LogAccessor;
import org.springframework.core.test.tools.CompileWithForkedClassLoader;
import org.springframework.core.test.tools.TestCompiler;
@@ -58,7 +61,6 @@ import static org.mockito.Mockito.mock;
* @author Chris Bono
*/
@ExtendWith(OutputCaptureExtension.class)
@Disabled
class BinderChildContextInitializerTests {
private static final LogAccessor LOG = new LogAccessor(BinderChildContextInitializerTests.class);
@@ -73,10 +75,14 @@ class BinderChildContextInitializerTests {
// The AOT processor will then generate the ACI for the default binder (no user declared binders).
// We then initialize a fresh app context using the generated ACI and verify the expected output.
// For some reasons, the logging level in the child context is not adjustable from the test.
// Therefore, we are relying on the fact that the logging levels are the default INFO level.
// It only happens for tests and this doesn't seem to be the case in real applications,
// i.e. we can control the logging level in real applications.
ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(BinderFactoryAutoConfiguration.class,
BindingServiceConfiguration.class, FunctionConfiguration.class))
.withPropertyValues("logging.level.org.springframework", "DEBUG")
.withInitializer(new ConfigDataApplicationContextInitializer())
.withConfiguration(UserConfigurations.of(TestFooBinderAppConfiguration.class));
contextRunner.prepare(context -> {
@@ -96,7 +102,6 @@ class BinderChildContextInitializerTests {
assertThat(output).contains("Beginning AOT processing for binder child contexts");
assertThat(output).contains("Pre-creating binder child context (AOT) for mock");
assertThat(output).contains("Generating AOT child context initializer for mock");
assertThat(output).contains("Refreshing mock_context");
// Refresh the initialized context and verify the binder child contexts are used
TestPropertyValues.of(AotDetector.AOT_ENABLED + "=true")
@@ -159,9 +164,7 @@ class BinderChildContextInitializerTests {
assertThat(output).contains("Pre-creating binder child context (AOT) for mockBinder2");
assertThat(output).contains("Pre-creating binder child context (AOT) for mockBinder1");
assertThat(output).contains("Generating AOT child context initializer for mockBinder2");
assertThat(output).contains("Refreshing mockBinder2_context");
assertThat(output).contains("Generating AOT child context initializer for mockBinder1");
assertThat(output).contains("Refreshing mockBinder1_context");
// Refresh the initialized context and verify the binder child contexts are used
TestPropertyValues.of(AotDetector.AOT_ENABLED + "=true")