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

Make bindable channel validation more consistent.

Browse Source
This commit is contained in:
Marius Bogoevici
2016-04-06 14:08:56 -04:00
parent a0cdbdc148
commit cd81f24451
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java
View File

@@ -21,11 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
@@ -41,6 +36,11 @@ import org.springframework.messaging.SubscribableChannel;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* {@link FactoryBean} for instantiating the interfaces specified via
* {@link EnableBinding}
@@ -108,8 +108,7 @@ public class BindableProxyFactory implements MethodInterceptor, FactoryBean<Obje
Input input = AnnotationUtils.findAnnotation(method, Input.class);
if (input != null) {
String name = BindingBeanDefinitionRegistryUtils.getChannelName(input, method);
Assert.isTrue(MessageChannel.class.isAssignableFrom(method.getReturnType()),
"Input channel should be of type 'MessageChannel'");
validateChannelType(method.getReturnType());
MessageChannel sharedChannel = locateSharedChannel(name);
if (sharedChannel == null) {
inputHolders.put(name, new ChannelHolder(channelFactory.createSubscribableChannel(name), true));
@@ -126,14 +125,7 @@ public class BindableProxyFactory implements MethodInterceptor, FactoryBean<Obje
Output output = AnnotationUtils.findAnnotation(method, Output.class);
if (output != null) {
String name = BindingBeanDefinitionRegistryUtils.getChannelName(output, method);
if (method.getReturnType().equals(MessageChannel.class)) {
log.debug("Output channel is a MessageChannel. Creating a Subscribable Channel for binding.");
}
// Make sure any type other than `MessageChannel` should be of type `SubscribableChannel`
else {
Assert.isTrue(SubscribableChannel.class.isAssignableFrom(method.getReturnType()),
"Output channel should be of type 'SubscribableChannel'");
}
validateChannelType(method.getReturnType());
MessageChannel sharedChannel = locateSharedChannel(name);
if (sharedChannel == null) {
outputHolders.put(name, new ChannelHolder(channelFactory.createSubscribableChannel(name), true));
@@ -147,6 +139,12 @@ public class BindableProxyFactory implements MethodInterceptor, FactoryBean<Obje
});
}
private void validateChannelType(Class<?> channelType) {
Assert.isTrue(SubscribableChannel.class.equals(channelType) || MessageChannel.class.equals(channelType),
"A bound channel should be either a '" + MessageChannel.class.getName() + "', " +
" or a '" + SubscribableChannel.class.getName() + "'");
}
private MessageChannel locateSharedChannel(String name) {
return this.sharedChannelRegistry != null ?
this.sharedChannelRegistry.get(getNamespacePrefixedChannelName(name)) : null;