INT-1011 Added 'overwrite' attribute for individual header sub-elements and renamed the top-level attribute to 'default-overwrite' (top level is a fallback if the sub-element does not provide a value).
This commit is contained in:
Mark Fisher
@@ -0,0 +1,106 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans:beans xmlns="http://www.springframework.org/schema/integration"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:beans="http://www.springframework.org/schema/beans"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans.xsd
|
||||
http://www.springframework.org/schema/integration
|
||||
http://www.springframework.org/schema/integration/spring-integration.xsd">
|
||||
|
||||
<transformer input-channel="fail" expression="payload.thisWillCauseAnException"/>
|
||||
|
||||
<transformer input-channel="echo" expression="payload.toUpperCase()"/>
|
||||
|
||||
<header-enricher input-channel="replyChannelExplicitOverwriteTrueInput" output-channel="echo">
|
||||
<reply-channel ref="replyChannelExplicitOverwriteTrueOutput" overwrite="true"/>
|
||||
</header-enricher>
|
||||
|
||||
<channel id="replyChannelExplicitOverwriteTrueOutput">
|
||||
<queue/>
|
||||
</channel>
|
||||
|
||||
<header-enricher input-channel="replyChannelExplicitOverwriteFalseInput" output-channel="echo">
|
||||
<reply-channel ref="fail" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="replyChannelDefaultOverwriteTrueButExplicitOverwriteFalseInput" output-channel="echo" default-overwrite="true">
|
||||
<reply-channel ref="fail" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="replyChannelExplicitOverwriteFalseButNoExistingHeaderInput" output-channel="echo">
|
||||
<reply-channel ref="replyChannelExplicitOverwriteFalseButNoExistingHeaderOutput" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<channel id="replyChannelExplicitOverwriteFalseButNoExistingHeaderOutput">
|
||||
<queue/>
|
||||
</channel>
|
||||
|
||||
<header-enricher input-channel="replyChannelDefaultOverwriteTrueInput" output-channel="echo" default-overwrite="true">
|
||||
<reply-channel ref="replyChannelDefaultOverwriteTrueOutput"/>
|
||||
</header-enricher>
|
||||
|
||||
<channel id="replyChannelDefaultOverwriteTrueOutput">
|
||||
<queue/>
|
||||
</channel>
|
||||
|
||||
<header-enricher input-channel="replyChannelDefaultOverwriteFalseInput" output-channel="echo" default-overwrite="false">
|
||||
<reply-channel ref="fail"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="replyChannelDefaultOverwriteFalseButNoExistingHeaderInput" output-channel="echo" default-overwrite="false">
|
||||
<reply-channel ref="replyChannelDefaultOverwriteFalseButNoExistingHeaderOutput"/>
|
||||
</header-enricher>
|
||||
|
||||
<channel id="replyChannelDefaultOverwriteFalseButNoExistingHeaderOutput">
|
||||
<queue/>
|
||||
</channel>
|
||||
|
||||
<header-enricher input-channel="priorityExplicitOverwriteTrueInput" output-channel="echo">
|
||||
<priority value="HIGH" overwrite="true"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="priorityExplicitOverwriteFalseInput" output-channel="echo">
|
||||
<priority value="LOW" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="customExplicitOverwriteTrueInput" output-channel="echo">
|
||||
<header name="foo" value="zzz" overwrite="true"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="customExplicitOverwriteFalseInput" output-channel="echo">
|
||||
<header name="foo" value="zzz" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="customExplicitOverwriteFalseButNoExistingHeaderInput" output-channel="echo">
|
||||
<header name="foo" value="zzz" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="expressionExplicitOverwriteTrueInput" output-channel="echo">
|
||||
<header name="foo" expression="'123'" overwrite="true"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="expressionExplicitOverwriteFalseInput" output-channel="echo">
|
||||
<header name="foo" expression="'123'" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="expressionExplicitOverwriteFalseButNoExistingHeaderInput" output-channel="echo">
|
||||
<header name="foo" expression="'123'" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="beanExplicitOverwriteTrueInput" output-channel="echo">
|
||||
<header name="foo" ref="testBean" method="text" overwrite="true"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="beanExplicitOverwriteFalseInput" output-channel="echo">
|
||||
<header name="foo" ref="testBean" method="text" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<header-enricher input-channel="beanExplicitOverwriteFalseButNoExistingHeaderInput" output-channel="echo">
|
||||
<header name="foo" ref="testBean" method="text" overwrite="false"/>
|
||||
</header-enricher>
|
||||
|
||||
<beans:bean id="testBean" class="org.springframework.integration.config.xml.HeaderEnricherOverwriteTests$TestBean">
|
||||
<beans:constructor-arg value="ABC"/>
|
||||
</beans:bean>
|
||||
|
||||
</beans:beans>
|
||||
@@ -0,0 +1,311 @@
|
||||
/*
|
||||
* Copyright 2002-2010 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.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.config.xml;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNull;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.integration.channel.PollableChannel;
|
||||
import org.springframework.integration.channel.QueueChannel;
|
||||
import org.springframework.integration.core.Message;
|
||||
import org.springframework.integration.core.MessageChannel;
|
||||
import org.springframework.integration.core.MessagePriority;
|
||||
import org.springframework.integration.gateway.SimpleMessagingGateway;
|
||||
import org.springframework.integration.message.MessageBuilder;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
|
||||
/**
|
||||
* @author Mark Fisher
|
||||
* @since 2.0
|
||||
*/
|
||||
@ContextConfiguration
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
public class HeaderEnricherOverwriteTests {
|
||||
|
||||
@Autowired
|
||||
private ApplicationContext context;
|
||||
|
||||
|
||||
@Test
|
||||
public void replyChannelExplicitOverwriteTrue() {
|
||||
MessageChannel inputChannel = context.getBean("replyChannelExplicitOverwriteTrueInput", MessageChannel.class);
|
||||
PollableChannel replyChannel = context.getBean("replyChannelExplicitOverwriteTrueOutput", PollableChannel.class);
|
||||
QueueChannel replyChannelToOverwrite = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test").setReplyChannel(replyChannelToOverwrite).build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals(replyChannel, result.getHeaders().getReplyChannel());
|
||||
assertNull(replyChannelToOverwrite.receive(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replyChannelExplicitOverwriteFalse() {
|
||||
MessageChannel inputChannel = context.getBean("replyChannelExplicitOverwriteFalseInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test").setReplyChannel(replyChannel).build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals(replyChannel, result.getHeaders().getReplyChannel());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replyChannelExplicitOverwriteFalseButNoExistingHeader() {
|
||||
MessageChannel inputChannel = context.getBean(
|
||||
"replyChannelExplicitOverwriteFalseButNoExistingHeaderInput", MessageChannel.class);
|
||||
PollableChannel replyChannel = context.getBean(
|
||||
"replyChannelExplicitOverwriteFalseButNoExistingHeaderOutput", PollableChannel.class);
|
||||
Message<?> message = MessageBuilder.withPayload("test").build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals(replyChannel, result.getHeaders().getReplyChannel());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replyChannelDefaultOverwriteTrue() {
|
||||
MessageChannel inputChannel = context.getBean("replyChannelDefaultOverwriteTrueInput", MessageChannel.class);
|
||||
PollableChannel replyChannel = context.getBean("replyChannelDefaultOverwriteTrueOutput", PollableChannel.class);
|
||||
QueueChannel replyChannelToOverwrite = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test").setReplyChannel(replyChannelToOverwrite).build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals(replyChannel, result.getHeaders().getReplyChannel());
|
||||
assertNull(replyChannelToOverwrite.receive(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replyChannelDefaultOverwriteFalse() {
|
||||
MessageChannel inputChannel = context.getBean("replyChannelDefaultOverwriteFalseInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test").setReplyChannel(replyChannel).build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals(replyChannel, result.getHeaders().getReplyChannel());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replyChannelDefaultOverwriteTrueButExplicitOverwriteFalse() {
|
||||
MessageChannel inputChannel = context.getBean("replyChannelDefaultOverwriteTrueButExplicitOverwriteFalseInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test").setReplyChannel(replyChannel).build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals(replyChannel, result.getHeaders().getReplyChannel());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replyChannelDefaultOverwriteFalseButNoExistingHeader() {
|
||||
MessageChannel inputChannel = context.getBean(
|
||||
"replyChannelDefaultOverwriteFalseButNoExistingHeaderInput", MessageChannel.class);
|
||||
PollableChannel replyChannel = context.getBean(
|
||||
"replyChannelDefaultOverwriteFalseButNoExistingHeaderOutput", PollableChannel.class);
|
||||
Message<?> message = MessageBuilder.withPayload("test").build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals(replyChannel, result.getHeaders().getReplyChannel());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void priorityExplicitOverwriteTrue() {
|
||||
SimpleMessagingGateway gateway = new SimpleMessagingGateway();
|
||||
gateway.setRequestChannel(context.getBean("priorityExplicitOverwriteTrueInput", MessageChannel.class));
|
||||
Message<?> result = gateway.sendAndReceiveMessage("test");
|
||||
assertNotNull(result);
|
||||
assertEquals(MessagePriority.HIGH, result.getHeaders().getPriority());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void priorityExplicitOverwriteFalse() {
|
||||
MessageChannel input = context.getBean("priorityExplicitOverwriteFalseInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.setPriority(MessagePriority.HIGHEST)
|
||||
.build();
|
||||
input.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals(MessagePriority.HIGHEST, result.getHeaders().getPriority());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void customExplicitOverwriteTrue() {
|
||||
MessageChannel inputChannel = context.getBean("customExplicitOverwriteTrueInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.setHeader("foo", "bar")
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("zzz", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void customExplicitOverwriteFalse() {
|
||||
MessageChannel inputChannel = context.getBean("customExplicitOverwriteFalseInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.setHeader("foo", "bar")
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("bar", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void customExplicitOverwriteFalseButNoExistingHeader() {
|
||||
MessageChannel inputChannel = context.getBean("customExplicitOverwriteFalseButNoExistingHeaderInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("zzz", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void expressionExplicitOverwriteTrue() {
|
||||
MessageChannel inputChannel = context.getBean("expressionExplicitOverwriteTrueInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.setHeader("foo", "bar")
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("123", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void expressionExplicitOverwriteFalse() {
|
||||
MessageChannel inputChannel = context.getBean("expressionExplicitOverwriteFalseInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.setHeader("foo", "bar")
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("bar", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void expressionExplicitOverwriteFalseButNoExistingHeader() {
|
||||
MessageChannel inputChannel = context.getBean("expressionExplicitOverwriteFalseButNoExistingHeaderInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("123", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void beanExplicitOverwriteTrue() {
|
||||
MessageChannel inputChannel = context.getBean("beanExplicitOverwriteTrueInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.setHeader("foo", "bar")
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("ABC", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void beanExplicitOverwriteFalse() {
|
||||
MessageChannel inputChannel = context.getBean("beanExplicitOverwriteFalseInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.setHeader("foo", "bar")
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("bar", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void beanExplicitOverwriteFalseButNoExistingHeader() {
|
||||
MessageChannel inputChannel = context.getBean("beanExplicitOverwriteFalseButNoExistingHeaderInput", MessageChannel.class);
|
||||
QueueChannel replyChannel = new QueueChannel();
|
||||
Message<?> message = MessageBuilder.withPayload("test")
|
||||
.setReplyChannel(replyChannel)
|
||||
.build();
|
||||
inputChannel.send(message);
|
||||
Message<?> result = replyChannel.receive(0);
|
||||
assertNotNull(result);
|
||||
assertEquals("TEST", result.getPayload());
|
||||
assertEquals("ABC", result.getHeaders().get("foo"));
|
||||
}
|
||||
|
||||
|
||||
public static class TestBean {
|
||||
|
||||
private final String text;
|
||||
|
||||
public TestBean(String text) {
|
||||
this.text = text;
|
||||
}
|
||||
|
||||
public String text() {
|
||||
return this.text;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user