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

INT-3949: FileWritingMH: use Files.move()

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3949
This commit is contained in:
Artem Bilan
2016-02-04 19:09:32 -05:00
committed by Gary Russell
parent 91387147c9
commit 51f319bd4f
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java
View File

@@ -27,6 +27,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -51,11 +53,13 @@ import org.springframework.integration.support.locks.DefaultLockRegistry;
import org.springframework.integration.support.locks.LockRegistry;
import org.springframework.integration.support.locks.PassThruLockRegistry;
import org.springframework.integration.util.WhileLockedProcessor;
import org.springframework.lang.UsesJava7;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StreamUtils;
import org.springframework.util.StringUtils;
@@ -101,6 +105,9 @@ import org.springframework.util.StringUtils;
public class FileWritingMessageHandler extends AbstractReplyProducingMessageHandler
implements Lifecycle, MessageTriggerAction {
private static final boolean nioFilesPresent = ClassUtils.isPresent("java.nio.file.Files",
FileWritingMessageHandler.class.getClassLoader());
private static final String LINE_SEPARATOR = System.getProperty("line.separator");
private static final int DEFAULT_BUFFER_SIZE = 8192;
@@ -463,7 +470,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
private File handleFileMessage(final File sourceFile, File tempFile, final File resultFile) throws IOException {
if (!FileExistsMode.APPEND.equals(this.fileExistsMode) && this.deleteSourceFiles) {
if (sourceFile.renameTo(resultFile)) {
if (rename(sourceFile, resultFile)) {
return resultFile;
}
if (logger.isInfoEnabled()) {
@@ -680,7 +687,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
if (resultFile.exists()) {
if (resultFile.setWritable(true, false) && resultFile.delete()) {
if (!tempFile.renameTo(resultFile)) {
if (!rename(tempFile, resultFile)) {
throw new IOException("Failed to rename file '" + tempFile.getAbsolutePath() +
"' to '" + resultFile.getAbsolutePath() + "'");
}
@@ -692,7 +699,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
}
}
else {
if (!tempFile.renameTo(resultFile)) {
if (!rename(tempFile, resultFile)) {
throw new IOException("Failed to rename file '" + tempFile.getAbsolutePath() +
"' to '" + resultFile.getAbsolutePath() + "'");
}
@@ -832,6 +839,15 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
}
}
private static boolean rename(File source, File target) throws IOException {
return (nioFilesPresent && filesMove(source, target)) || source.renameTo(target);
}
@UsesJava7
private static boolean filesMove(File source, File target) throws IOException {
Files.move(source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING);
return true;
}
private static final class FileState {