From 0d7cc1052b424c089f36c09c251091460fcbe54d Mon Sep 17 00:00:00 2001 From: Gunnar Hillert Date: Tue, 22 Nov 2011 16:18:48 -0500 Subject: [PATCH] INT-2258 In enricher: add setRequiresReply to XSD for the ContentEnricher. This attribute defaults to 'true'. For reference see: https://jira.springsource.org/browse/INT-2258 --- .../config/xml/EnricherParser.java | 2 +- .../config/xml/spring-integration-2.1.xsd | 23 ++++++++ .../config/xml/EnricherParserTests.java | 16 ++++-- .../xml/EnricherParserTests2-context.xml | 26 +++++++++ .../config/xml/EnricherParserTests2.java | 53 +++++++++++++++++++ 5 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml create mode 100644 spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/EnricherParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/EnricherParser.java index 3e3cc70e66..6bec54fa9f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/EnricherParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/EnricherParser.java @@ -46,7 +46,7 @@ public class EnricherParser extends AbstractConsumerEndpointParser { IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "reply-channel"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "request-timeout"); IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "reply-timeout"); - + IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "requires-reply"); List propertyElements = DomUtils.getChildElementsByTagName(element, "property"); if (!CollectionUtils.isEmpty(propertyElements)) { diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd index 5ebc415514..eef12d7d03 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.1.xsd @@ -1132,6 +1132,29 @@ endpoint itself is a Polling Consumer for a channel with a queue. ]]> + + + + + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java index 7582329786..05ac990474 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java @@ -17,8 +17,9 @@ package org.springframework.integration.config.xml; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.Map; @@ -95,6 +96,17 @@ public class EnricherParserTests { } + @Test + public void configurationCheckRequiresReply() { + + Object endpoint = context.getBean("enricher"); + + boolean requiresReply = TestUtils.getPropertyValue(endpoint, "handler.requiresReply", Boolean.class); + + assertTrue("Was expecting requiresReply to be 'false'", requiresReply); + + } + @Test public void integrationTest() { SubscribableChannel requests = context.getBean("requests", SubscribableChannel.class); @@ -114,7 +126,6 @@ public class EnricherParserTests { assertNotSame(original, enriched); } - private static class Source { private final String sourceName; @@ -129,7 +140,6 @@ public class EnricherParserTests { } } - public static class Target implements Cloneable { private volatile String name; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml new file mode 100644 index 0000000000..de870ff78c --- /dev/null +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2-context.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java new file mode 100644 index 0000000000..6e70ff9a16 --- /dev/null +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java @@ -0,0 +1,53 @@ +/* + * Copyright 2002-2011 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.assertFalse; + +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.test.util.TestUtils; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Mark Fisher + * @author Gunnar Hillert + * + * @since 2.1 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration +public class EnricherParserTests2 { + + @Autowired + private ApplicationContext context; + + @Test + public void configurationCheckRequiresReply() { + + Object endpoint = context.getBean("enricher"); + + boolean requiresReply = TestUtils.getPropertyValue(endpoint, "handler.requiresReply", Boolean.class); + + assertFalse("Was expecting requiresReply to be 'false'", requiresReply); + + } + +}