From 657eb86dad5dcab00f5306580516a5a12e2e837e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 19 Oct 2021 10:28:57 +0100 Subject: [PATCH] Polish "Add a config prop to enable/disable SI's default logging" See gh-28355 --- .../autoconfigure/integration/IntegrationProperties.java | 7 +++++-- .../integration/IntegrationAutoConfigurationTests.java | 8 +++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java index 0330e104eed..54111bf46fe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java @@ -395,9 +395,12 @@ public class IntegrationProperties { public static class Management { /** - * Logging management in the integration components. + * Whether Spring Integration components should perform logging in the main + * message flow. When disabled, such logging will be skipped without checking the + * logging level. When enabled, such logging is controlled as normal by the + * logging system's log level configuration. */ - boolean defaultLoggingEnabled = true; + private boolean defaultLoggingEnabled = true; public boolean isDefaultLoggingEnabled() { return this.defaultLoggingEnabled; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index e54767bddac..4f66bd16454 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -486,7 +486,13 @@ class IntegrationAutoConfigurationTests { } @Test - void integrationManagementLoggingDisabled() { + void integrationManagementLoggingIsEnabledByDefault() { + this.contextRunner.withBean(DirectChannel.class, DirectChannel::new).run((context) -> assertThat(context) + .getBean(DirectChannel.class).extracting(DirectChannel::isLoggingEnabled).isEqualTo(true)); + } + + @Test + void integrationManagementLoggingCanBeDisabled() { this.contextRunner.withPropertyValues("spring.integration.management.defaultLoggingEnabled=false") .withBean(DirectChannel.class, DirectChannel::new).run((context) -> assertThat(context) .getBean(DirectChannel.class).extracting(DirectChannel::isLoggingEnabled).isEqualTo(false));