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

Remove Java 7 restriction in FileWritingMH

Browse Source 
Since SI-5.0 is based on Java 8 no reason to have condition for the `java.nio.Files` class in the `FileWritingMessageHandler`
Also add package protected ctors to the inner private classes in the `FileWritingMessageHandler` to avoid generated synthetic classes in case of default ctor

Address PR comments

Remove redundant log for `IOException` on `Files.move()`
This commit is contained in:
Artem Bilan
2016-10-26 10:03:55 -04:00
committed by Gary Russell
parent c865d38576
commit c6026ce8fe
1 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,6 @@ 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;
@@ -104,9 +103,6 @@ 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;
@@ -497,16 +493,13 @@ 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 (rename(sourceFile, resultFile)) {
return resultFile;
}
if (this.logger.isInfoEnabled()) {
this.logger.info(String.format("Failed to move file '%s'. Using copy and delete fallback.",
sourceFile.getAbsolutePath()));
}
rename(sourceFile, resultFile);
return resultFile;
}
else {
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(sourceFile));
return handleInputStreamMessage(bis, sourceFile, tempFile, resultFile);
}
final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(sourceFile));
return handleInputStreamMessage(bis, sourceFile, tempFile, resultFile);
}
private File handleInputStreamMessage(final InputStream sourceFileInputStream, File originalFile, File tempFile,
@@ -725,10 +718,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
if (resultFile.exists()) {
if (resultFile.setWritable(true, false) && resultFile.delete()) {
if (!rename(tempFile, resultFile)) {
throw new IOException("Failed to rename file '" + tempFile.getAbsolutePath() +
"' to '" + resultFile.getAbsolutePath() + "'");
}
rename(tempFile, resultFile);
}
else {
throw new IOException("Failed to rename file '" + tempFile.getAbsolutePath() +
@@ -737,10 +727,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
}
}
else {
if (!rename(tempFile, resultFile)) {
throw new IOException("Failed to rename file '" + tempFile.getAbsolutePath() +
"' to '" + resultFile.getAbsolutePath() + "'");
}
rename(tempFile, resultFile);
}
}
@@ -839,7 +826,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
* @since 4.3
*/
public synchronized void flushIfNeeded(FlushPredicate flushPredicate) {
Iterator<Entry<String, FileState>> iterator = FileWritingMessageHandler.this.fileStates.entrySet().iterator();
Iterator<Entry<String, FileState>> iterator = this.fileStates.entrySet().iterator();
while (iterator.hasNext()) {
Entry<String, FileState> entry = iterator.next();
FileState state = entry.getValue();
@@ -860,7 +847,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
* @since 4.3
*/
public synchronized void flushIfNeeded(MessageFlushPredicate flushPredicate, Message<?> filterMessage) {
Iterator<Entry<String, FileState>> iterator = FileWritingMessageHandler.this.fileStates.entrySet().iterator();
Iterator<Entry<String, FileState>> iterator = this.fileStates.entrySet().iterator();
while (iterator.hasNext()) {
Entry<String, FileState> entry = iterator.next();
FileState state = entry.getValue();
@@ -877,13 +864,8 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
}
}
private static boolean rename(File source, File target) throws IOException {
return (nioFilesPresent && filesMove(source, target)) || source.renameTo(target);
}
private static boolean filesMove(File source, File target) throws IOException {
private static void rename(File source, File target) throws IOException {
Files.move(source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING);
return true;
}
private static final class FileState {
@@ -894,12 +876,12 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
private volatile long lastWrite;
private FileState(BufferedWriter writer) {
FileState(BufferedWriter writer) {
this.writer = writer;
this.stream = null;
}
private FileState(BufferedOutputStream stream) {
FileState(BufferedOutputStream stream) {
this.writer = null;
this.stream = stream;
}
@@ -921,12 +903,17 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
private final class Flusher implements Runnable {
Flusher() {
super();
}
@Override
public void run() {
synchronized (FileWritingMessageHandler.this) {
long expired = FileWritingMessageHandler.this.flushTask == null ? Long.MAX_VALUE
: (System.currentTimeMillis() - FileWritingMessageHandler.this.flushInterval);
Iterator<Entry<String, FileState>> iterator = FileWritingMessageHandler.this.fileStates.entrySet().iterator();
Iterator<Entry<String, FileState>> iterator =
FileWritingMessageHandler.this.fileStates.entrySet().iterator();
while (iterator.hasNext()) {
Entry<String, FileState> entry = iterator.next();
FileState state = entry.getValue();
@@ -987,6 +974,10 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
*/
private static final class DefaultFlushPredicate implements MessageFlushPredicate {
DefaultFlushPredicate() {
super();
}
@Override
public boolean shouldFlush(String fileAbsolutePath, long lastWrite, Message<?> triggerMessage) {
Pattern pattern;