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

Fix new Sonar smells

Browse Source
This commit is contained in:
Artem Bilan
2021-02-03 10:54:30 -05:00
parent e847570b85
commit 88d2bebb9c
3 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java
View File

@@ -975,13 +975,8 @@ public abstract class AbstractRemoteFileOutboundGateway<F> extends AbstractReply
boolean recursion, F file) throws IOException {
String fileName = getFilename(file);
String fileSeparator = this.remoteFileTemplate.getRemoteFileSeparator();
final boolean isDirectory = isDirectory(file);
boolean isDots =
".".equals(fileName)
|| "..".equals(fileName)
|| fileName.endsWith(fileSeparator + ".")
|| fileName.endsWith(fileSeparator + "..");
boolean isDots = hasDots(fileName);
if ((this.options.contains(Option.SUBDIRS) || !isDirectory)
&& (!isDots || this.options.contains(Option.ALL))) {
@@ -993,10 +988,19 @@ public abstract class AbstractRemoteFileOutboundGateway<F> extends AbstractReply
}
if (recursion && isDirectory && !isDots) {
lsFiles.addAll(listFilesInRemoteDir(session, directory, subDirectory + fileName + fileSeparator));
lsFiles.addAll(listFilesInRemoteDir(session, directory, subDirectory + fileName +
this.remoteFileTemplate.getRemoteFileSeparator()));
}
}
private boolean hasDots(String fileName) {
String fileSeparator = this.remoteFileTemplate.getRemoteFileSeparator();
return ".".equals(fileName)
|| "..".equals(fileName)
|| fileName.endsWith(fileSeparator + ".")
|| fileName.endsWith(fileSeparator + "..");
}
protected final List<File> filterMputFiles(File[] files) {
if (files == null) {
return Collections.emptyList();