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

Upgrade to SF-5.0 and Reactor-3.0

Browse Source
This commit is contained in:
Artem Bilan
2016-07-28 15:14:10 -04:00
parent 8a577de83f
commit 11151efc8c
21 changed files with 354 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
View File

@@ -49,7 +49,6 @@ import org.springframework.integration.core.MessageSource;
import org.springframework.integration.file.filters.AcceptOnceFileListFilter;
import org.springframework.integration.file.filters.FileListFilter;
import org.springframework.integration.file.filters.ResettableFileListFilter;
import org.springframework.lang.UsesJava7;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessagingException;
import org.springframework.util.Assert;
@@ -406,7 +405,6 @@ public class FileReadingMessageSource extends IntegrationObjectSupport implement
}
}
@UsesJava7
public enum WatchEventType {
CREATE(StandardWatchEventKinds.ENTRY_CREATE),
@@ -423,7 +421,6 @@ public class FileReadingMessageSource extends IntegrationObjectSupport implement
}
@UsesJava7
private class WatchServiceDirectoryScanner extends DefaultDirectoryScanner implements Lifecycle {
private final ConcurrentMap<Path, WatchKey> pathKeys = new ConcurrentHashMap<Path, WatchKey>();

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

@@ -53,7 +53,6 @@ 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;
@@ -871,7 +870,6 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand
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;

2
spring-integration-file/src/main/java/org/springframework/integration/file/WatchServiceDirectoryScanner.java
View File

@@ -37,7 +37,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.SmartLifecycle;
import org.springframework.lang.UsesJava7;
import org.springframework.util.Assert;
/**
@@ -65,7 +64,6 @@ import org.springframework.util.Assert;
*
*/
@Deprecated
@UsesJava7
@SuppressWarnings("deprecation")
public class WatchServiceDirectoryScanner extends DefaultDirectoryScanner implements SmartLifecycle {