From d92c7485172412a36f810b9b67ee67d632d86b80 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 21 Aug 2018 21:46:24 +0200 Subject: [PATCH] GH-1450 Fixed lifecycle issue with BindingServiceConfiguration Resolves #1450 --- .../stream/schema/server/SchemaRegistryServerApplication.java | 3 ++- .../schema/server/entityScanning/EntityScanningTests.java | 3 ++- .../cloud/stream/config/BindingServiceConfiguration.java | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/SchemaRegistryServerApplication.java b/spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/SchemaRegistryServerApplication.java index 76b084281..b4de3d349 100644 --- a/spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/SchemaRegistryServerApplication.java +++ b/spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/SchemaRegistryServerApplication.java @@ -18,11 +18,12 @@ package org.springframework.cloud.stream.schema.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.stream.config.BindingServiceConfiguration; /** * @author Vinicius Carvalho */ -@SpringBootApplication +@SpringBootApplication(exclude=BindingServiceConfiguration.class) @EnableSchemaRegistryServer public class SchemaRegistryServerApplication { public static void main(String[] args) { diff --git a/spring-cloud-stream-schema-server/src/test/java/org/springframework/cloud/stream/schema/server/entityScanning/EntityScanningTests.java b/spring-cloud-stream-schema-server/src/test/java/org/springframework/cloud/stream/schema/server/entityScanning/EntityScanningTests.java index 350d49a4b..0e16029d4 100644 --- a/spring-cloud-stream-schema-server/src/test/java/org/springframework/cloud/stream/schema/server/entityScanning/EntityScanningTests.java +++ b/spring-cloud-stream-schema-server/src/test/java/org/springframework/cloud/stream/schema/server/entityScanning/EntityScanningTests.java @@ -20,6 +20,7 @@ import org.junit.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.cloud.stream.config.BindingServiceConfiguration; import org.springframework.cloud.stream.schema.server.EnableSchemaRegistryServer; import org.springframework.context.ConfigurableApplicationContext; @@ -35,7 +36,7 @@ public class EntityScanningTests { context.close(); } - @EnableAutoConfiguration + @EnableAutoConfiguration(exclude=BindingServiceConfiguration.class) @EnableSchemaRegistryServer public static class CustomApplicationEmbeddingSchemaServer { } diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java index 643d3763a..acc7513ef 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java @@ -25,7 +25,6 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.SearchStrategy; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -81,7 +80,7 @@ import org.springframework.util.Assert; @EnableConfigurationProperties({ BindingServiceProperties.class, SpringIntegrationProperties.class, FunctionProperties.class }) @Import({ DestinationPublishingMetricsAutoConfiguration.class, SpelExpressionConverterConfiguration.class, FunctionConfiguration.class }) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) -@ConditionalOnBean(value = BinderTypeRegistry.class, search = SearchStrategy.CURRENT) +//@ConditionalOnBean(value = BinderTypeRegistry.class, search = SearchStrategy.CURRENT) public class BindingServiceConfiguration { public static final String STREAM_LISTENER_ANNOTATION_BEAN_POST_PROCESSOR_NAME =