XSD refactoring to pull common attributes

Also introduce `remote-file-separator` since this option is available via Java Config
This commit is contained in:
Artem Bilan
2016-08-31 23:10:47 -04:00
parent da77e4b89e
commit a3923c93e7
5 changed files with 148 additions and 268 deletions

View File

@@ -38,6 +38,7 @@
preserve-timestamp="true"
filename-pattern="*.txt"
local-directory="."
remote-file-separator="\"
local-filename-generator-expression="#this.toUpperCase() + '.a' + @fooString"
comparator="comparator"
temporary-file-suffix=".foo"

View File

@@ -87,8 +87,7 @@ public class S3InboundChannelAdapterParserTests {
assertThat(TestUtils.getPropertyValue(fisync, "preserveTimestamp", Boolean.class)).isTrue();
assertThat(TestUtils.getPropertyValue(fisync, "temporaryFileSuffix", String.class)).isEqualTo(".foo");
String remoteFileSeparator = (String) TestUtils.getPropertyValue(fisync, "remoteFileSeparator");
assertThat(remoteFileSeparator).isNotNull();
assertThat(remoteFileSeparator).isEmpty();
assertThat(remoteFileSeparator).isEqualTo("\\");
S3SimplePatternFileListFilter filter = TestUtils.getPropertyValue(fisync, "filter",
S3SimplePatternFileListFilter.class);
assertThat(filter).isNotNull();

View File

@@ -36,6 +36,7 @@
auto-startup="false"
comparator="comparator"
filter="acceptOnceFilter"
remote-file-separator="\"
remote-directory-expression="foo/bar">
<int:poller fixed-rate="1000"/>
</int-aws:s3-inbound-streaming-channel-adapter>

View File

@@ -78,7 +78,7 @@ public class S3InboundStreamingChannelAdapterParserTests {
assertThat(TestUtils.getPropertyValue(source, "comparator")).isSameAs(this.comparator);
String remoteFileSeparator = (String) TestUtils.getPropertyValue(source, "remoteFileSeparator");
assertThat(remoteFileSeparator).isNotNull();
assertThat(remoteFileSeparator).isEqualTo("/");
assertThat(remoteFileSeparator).isEqualTo("\\");
S3PersistentAcceptOnceFileListFilter filter = TestUtils.getPropertyValue(source, "filter",
S3PersistentAcceptOnceFileListFilter.class);