From 42e81e987b621959b46113868c4306c64b04976c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 27 Mar 2018 18:57:41 +0200 Subject: [PATCH] Fix @EnableIntegrationManagement Restore proper use of `defaultCountsEnabled` that was inadvertently changed to `countsEnabled` Closes gh-12594 --- .../IntegrationAutoConfiguration.java | 2 +- .../IntegrationAutoConfigurationTests.java | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java index a0361c8627..39b00e49ad 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java @@ -120,7 +120,7 @@ public class IntegrationAutoConfiguration { protected static class IntegrationManagementConfiguration { @Configuration - @EnableIntegrationManagement(countsEnabled = "true") + @EnableIntegrationManagement(defaultCountsEnabled = "true") protected static class EnableIntegrationManagementConfiguration { } 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 7d11328e9a..9bc0518bbe 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 @@ -22,6 +22,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.beans.DirectFieldAccessor; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration.IntegrationComponentScanAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; @@ -35,7 +36,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.core.MessageSource; +import org.springframework.integration.endpoint.MessageProcessorMessageSource; import org.springframework.integration.gateway.RequestReplyExchanger; +import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.support.channel.HeaderChannelRegistry; import org.springframework.integration.support.management.IntegrationManagementConfigurer; import org.springframework.jdbc.BadSqlGrammarException; @@ -196,6 +200,16 @@ public class IntegrationAutoConfigurationTests { }); } + @Test + public void integrationEnablesDefaultCounts() { + this.contextRunner.withUserConfiguration(MessageSourceConfiguration.class) + .run((context) -> { + assertThat(context).hasBean("myMessageSource"); + assertThat(new DirectFieldAccessor(context.getBean("myMessageSource")) + .getPropertyValue("countsEnabled")).isEqualTo(true); + }); + } + @Configuration static class CustomMBeanExporter { @@ -218,4 +232,14 @@ public class IntegrationAutoConfigurationTests { } + @Configuration + static class MessageSourceConfiguration { + + @Bean + public MessageSource myMessageSource() { + return new MessageProcessorMessageSource(mock(MessageProcessor.class)); + } + + } + }