GH-9869: Introduce AbstractRecentFileListFilter strategy
Fixes: https://github.com/spring-projects/spring-integration/issues/9869 Currently, FileListFilters on the last modified attribute of a file are limited to the use case of discarding files that are too young. It would be great to have a filter implementation which would accept files which are not old enough. * Implement `AbstractRecentFileListFilter` for all the supported file protocols
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Copyright 2025 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
|
||||
*
|
||||
* https://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.sftp.filters;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
|
||||
import org.apache.sshd.sftp.client.SftpClient;
|
||||
|
||||
import org.springframework.integration.file.filters.AbstractRecentFileListFilter;
|
||||
|
||||
/**
|
||||
* The {@link AbstractRecentFileListFilter} implementation for SFTP protocol.
|
||||
*
|
||||
* @author Artem Bilan
|
||||
*
|
||||
* @since 6.5
|
||||
*/
|
||||
public class SftpRecentFileListFilter extends AbstractRecentFileListFilter<SftpClient.DirEntry> {
|
||||
|
||||
public SftpRecentFileListFilter() {
|
||||
super();
|
||||
}
|
||||
|
||||
public SftpRecentFileListFilter(Duration age) {
|
||||
super(age);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Instant getLastModified(SftpClient.DirEntry remoteFile) {
|
||||
return remoteFile.getAttributes().getModifyTime().toInstant();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright 2025 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
|
||||
*
|
||||
* https://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.sftp.filters;
|
||||
|
||||
import java.nio.file.attribute.FileTime;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
|
||||
import org.apache.sshd.sftp.client.SftpClient;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* @author Artem Bilan
|
||||
*
|
||||
* @since 6.5
|
||||
*/
|
||||
public class SftpRecentFileListFilterTests {
|
||||
|
||||
@Test
|
||||
public void testAge() {
|
||||
SftpRecentFileListFilter filter = new SftpRecentFileListFilter(Duration.ofHours(20));
|
||||
SftpClient.Attributes attributes1 = new SftpClient.Attributes();
|
||||
attributes1.setModifyTime(FileTime.from(Instant.now()));
|
||||
SftpClient.Attributes attributes2 = new SftpClient.Attributes();
|
||||
attributes2.setModifyTime(FileTime.from(Instant.now()));
|
||||
|
||||
SftpClient.DirEntry sftpFile1 = new SftpClient.DirEntry("foo", "foo", attributes1);
|
||||
SftpClient.DirEntry sftpFile2 = new SftpClient.DirEntry("bar", "bar", attributes2);
|
||||
|
||||
SftpClient.DirEntry[] files = new SftpClient.DirEntry[] {sftpFile1, sftpFile2};
|
||||
|
||||
assertThat(filter.filterFiles(files)).hasSize(2);
|
||||
assertThat(filter.accept(sftpFile1)).isTrue();
|
||||
assertThat(filter.accept(sftpFile2)).isTrue();
|
||||
|
||||
FileTime fileTime = FileTime.from(Instant.now().minus(Duration.ofDays(1)));
|
||||
sftpFile2.getAttributes().setModifyTime(fileTime);
|
||||
assertThat(filter.filterFiles(files)).hasSize(1);
|
||||
assertThat(filter.accept(sftpFile1)).isTrue();
|
||||
assertThat(filter.accept(sftpFile2)).isFalse();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user