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

Avoid throws Exception where possible - Phase III

Browse Source
This commit is contained in:
Gary Russell
2019-03-07 16:53:48 -05:00
committed by Artem Bilan
parent b138ab80f8
commit 78199dca9b
42 changed files with 297 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java
View File

@@ -352,12 +352,13 @@ public abstract class AbstractInboundFileSynchronizer<F>
}
private int copyIfNotNull(File localDirectory, Session<F> session, boolean filteringOneByOne, List<F> filteredFiles,
int copied, F file) throws IOException {
int copied, @Nullable F file) throws IOException {
boolean renamedFailed = false;
try {
if (file != null && !copyFileToLocalDirectory(this.evaluatedRemoteDirectory, file,
localDirectory, session)) {
copied--;
renamedFailed = false;
}
}
catch (RuntimeException | IOException e1) {
@@ -369,7 +370,7 @@ public abstract class AbstractInboundFileSynchronizer<F>
}
throw e1;
}
return copied;
return renamedFailed ? copied - 1 : copied;
}
private List<F> applyFilter(F[] files, boolean haveFilter, boolean filteringOneByOne, int maxFetchSize) {
@@ -483,14 +484,12 @@ public abstract class AbstractInboundFileSynchronizer<F>
try (OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(tempFile))) {
session.read(remoteFilePath, outputStream);
}
catch (RuntimeException e) { // NOSONAR catch and throw
throw e;
}
catch (Exception e) {
if (e instanceof RuntimeException) {
throw (RuntimeException) e;
}
else {
throw new MessagingException("Failure occurred while copying '" + remoteFilePath
+ "' from the remote to the local directory", e);
}
throw new MessagingException("Failure occurred while copying '" + remoteFilePath
+ "' from the remote to the local directory", e);
}
renamed = tempFile.renameTo(localFile);