Spring/spring-integration-extensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing after rebase

Browse Source
This commit is contained in:
Artem Bilan
2014-08-26 18:35:19 +03:00
parent f0bfe4656d
commit 238c1f06b9
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
View File

@@ -96,8 +96,10 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
}
B addComponents(Collection<Object> components) {
for (Object component : components) {
this.integrationComponents.add(component);
if (components != null) {
for (Object component : components) {
this.integrationComponents.add(component);
}
}
return _this();
}

4
spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/core/IntegrationFlowBeanPostProcessor.java
View File

@@ -71,7 +71,7 @@ public class IntegrationFlowBeanPostProcessor implements BeanPostProcessor, Bean
return processStandardIntegrationFlow((IntegrationFlowBuilder.StandardIntegrationFlow) bean, beanName);
}
else if (bean instanceof IntegrationFlow) {
return processLambdaIntegrationFlow((IntegrationFlow) bean, beanName);
return processIntegrationFlowImpl((IntegrationFlow) bean, beanName);
}
return bean;
}
@@ -175,7 +175,7 @@ public class IntegrationFlowBeanPostProcessor implements BeanPostProcessor, Bean
return flow;
}
private Object processLambdaIntegrationFlow(IntegrationFlow flow, String beanName) {
private Object processIntegrationFlowImpl(IntegrationFlow flow, String beanName) {
IntegrationFlowBuilder flowBuilder = IntegrationFlows.from(beanName + ".input");
flow.define(flowBuilder);
return processStandardIntegrationFlow(flowBuilder.get(), beanName);

2
spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileTransferringMessageHandlerSpec.java
View File

@@ -141,7 +141,7 @@ public abstract class FileTransferringMessageHandlerSpec<F, S extends FileTransf
if (this.defaultFileNameGenerator != null) {
return Collections.<Object>singletonList(this.defaultFileNameGenerator);
}
return Collections.<Object>emptyList();
return null;
}
@Override

2
spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileWritingMessageHandlerSpec.java
View File

@@ -96,7 +96,7 @@ public class FileWritingMessageHandlerSpec
if (this.defaultFileNameGenerator != null) {
return Collections.<Object>singletonList(this.defaultFileNameGenerator);
}
return Collections.<Object>emptyList();
return null;
}
@Override

4
spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/mail/ImapIdleChannelAdapterSpec.java
View File

@@ -27,7 +27,7 @@ import javax.mail.Session;
import org.aopalliance.aop.Advice;
import org.springframework.integration.dsl.core.ComponentsRegistration;
import org.springframework.integration.dsl.core.MessagingProducerSpec;
import org.springframework.integration.dsl.core.MessageProducerSpec;
import org.springframework.integration.dsl.support.PropertiesBuilder;
import org.springframework.integration.dsl.support.PropertiesConfigurer;
import org.springframework.integration.mail.ImapIdleChannelAdapter;
@@ -39,7 +39,7 @@ import org.springframework.integration.transaction.TransactionSynchronizationFac
* @author Gary Russell
*/
public class ImapIdleChannelAdapterSpec
extends MessagingProducerSpec<ImapIdleChannelAdapterSpec, ImapIdleChannelAdapter>
extends MessageProducerSpec<ImapIdleChannelAdapterSpec, ImapIdleChannelAdapter>
implements ComponentsRegistration {
private final ImapMailReceiver receiver;