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

INT-4114: Add missed <poller> to XSDs

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4114
This commit is contained in:
Artem Bilan
2018-10-26 12:28:07 -04:00
committed by Gary Russell
parent fef0a4db03
commit 674d5adfc0
21 changed files with 216 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd
View File

@@ -651,6 +651,11 @@ Only files matching this regular expression will be picked up by this adapter.
</xsd:element>
<xsd:complexType name="transformerType">
<xsd:choice minOccurs="0" maxOccurs="2">
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1" />
</xsd:choice>
<xsd:attribute name="id" type="xsd:string">
<xsd:annotation>
<xsd:documentation>

8
spring-integration-file/src/test/java/org/springframework/integration/file/config/FileToStringTransformerParserTests-context.xml
View File

@@ -13,14 +13,18 @@
http://www.springframework.org/schema/integration/file
http://www.springframework.org/schema/integration/file/spring-integration-file.xsd">
<si:channel id="input"/>
<si:channel id="input">
<si:queue/>
</si:channel>
<si:channel id="output"/>
<file:file-to-string-transformer id="transformer"
input-channel="input"
delete-files="${files.delete}"
output-channel="output"/>
output-channel="output">
<si:poller fixed-delay="100"/>
</file:file-to-string-transformer>
<context:property-placeholder location="org/springframework/integration/file/config/fileToStringTransformerParserTests.properties"/>

9
spring-integration-file/src/test/java/org/springframework/integration/file/config/FileToStringTransformerParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-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.
@@ -24,23 +24,26 @@ import org.junit.runner.RunWith;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.file.transformer.FileToStringTransformer;
import org.springframework.integration.transformer.MessageTransformingHandler;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Mark Fisher
* @author Gary Russell
* @author Artem Bilan
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
public class FileToStringTransformerParserTests {
@Autowired
@Qualifier("transformer")
EventDrivenConsumer endpoint;
PollingConsumer endpoint;
@Test
public void checkDeleteFilesValue() {