Deprecated BinderFactoryConfiguration

added deprecation message
removed unused reference
updated javadoc in BinderTypeRegistry

Resolves #1430
Resolves #1434
This commit is contained in:
Oleg Zhurakousky
2018-08-14 13:43:03 +02:00
parent c85660fba2
commit 15f9da86d4
2 changed files with 5 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2015 the original author or authors.
* Copyright 2015-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,8 +21,7 @@ import java.util.Map;
/**
* A registry of {@link BinderType}s, indexed by name. A {@link BinderTypeRegistry} bean
* is created automatically based on information found in the
* {@literal META-INF/spring.binders} files provided by binder implementors. This can be
* overridden by registering a {@link BinderTypeRegistry} bean in the context.
* {@literal META-INF/spring.binders} files provided by binder implementors.
*
* @author Marius Bogoevici
*/

View File

@@ -30,14 +30,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.stream.binder.BinderType;
import org.springframework.cloud.stream.binder.BinderTypeRegistry;
import org.springframework.cloud.stream.binder.DefaultBinderFactory;
import org.springframework.cloud.stream.binder.DefaultBinderTypeRegistry;
import org.springframework.cloud.stream.binding.CompositeMessageChannelConfigurer;
import org.springframework.cloud.stream.binding.MessageChannelConfigurer;
@@ -65,11 +63,14 @@ import org.springframework.util.StringUtils;
* @author Ilayaperumal Gopinathan
* @author Oleg Zhurakousky
* @author Soby Chacko
*
* @deprecated since it really represents 'auto-configuration' it will be renamed/restructured in the next release.
*/
@Configuration
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@EnableConfigurationProperties({ BindingServiceProperties.class })
@Import({ContentTypeConfiguration.class})
@Deprecated
public class BinderFactoryConfiguration {
protected final Log logger = LogFactory.getLog(getClass());
@@ -82,9 +83,6 @@ public class BinderFactoryConfiguration {
@Value("${" + SELF_CONTAINED_APP_PROPERTY_NAME + ":}")
private String selfContained;
@Autowired(required = false)
private Collection<DefaultBinderFactory.Listener> binderFactoryListeners;
static Collection<BinderType> parseBinderConfigurations(ClassLoader classLoader, Resource resource)
throws IOException, ClassNotFoundException {
Properties properties = PropertiesLoaderUtils.loadProperties(resource);