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

Revert "GH-1450 Fixed lifecycle issue with BindingServiceConfiguration"

Browse Source 
This reverts commit d92c748517.
This commit is contained in:
Oleg Zhurakousky
2018-08-25 15:55:16 +02:00
parent d92c748517
commit 2caf460265
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/SchemaRegistryServerApplication.java
View File

@@ -18,12 +18,11 @@ 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(exclude=BindingServiceConfiguration.class)
@SpringBootApplication
@EnableSchemaRegistryServer
public class SchemaRegistryServerApplication {
public static void main(String[] args) {

3
spring-cloud-stream-schema-server/src/test/java/org/springframework/cloud/stream/schema/server/entityScanning/EntityScanningTests.java
View File

@@ -20,7 +20,6 @@ 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;
@@ -36,7 +35,7 @@ public class EntityScanningTests {
context.close();
}
@EnableAutoConfiguration(exclude=BindingServiceConfiguration.class)
@EnableAutoConfiguration
@EnableSchemaRegistryServer
public static class CustomApplicationEmbeddingSchemaServer {
}

3
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BindingServiceConfiguration.java
View File

@@ -25,6 +25,7 @@ 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;
@@ -80,7 +81,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 =