GH-1450 Fixed lifecycle issue with BindingServiceConfiguration

Resolves #1450
This commit is contained in:
Oleg Zhurakousky
2018-08-21 21:46:24 +02:00
parent 25a3591bfd
commit d92c748517
3 changed files with 5 additions and 4 deletions

View File

@@ -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) {

View File

@@ -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 {
}

View File

@@ -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 =