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

INT-1756 added support for auto-creating remote directories

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-03-09 09:54:27 -05:00
parent d16ba3061d
commit d12eadf33c
9 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-integration-file/src/main/java/org/springframework/integration/file/config/RemoteFileOutboundChannelAdapterParser.java
View File

@@ -47,6 +47,7 @@ public class RemoteFileOutboundChannelAdapterParser extends AbstractOutboundChan
"org.springframework.integration.file.remote.handler.FileTransferringMessageHandler");
handlerBuilder.addConstructorArgValue(sessionFactoryBuilder.getBeanDefinition());
IntegrationNamespaceUtils.setValueIfAttributeDefined(handlerBuilder, element, "temporary-file-suffix");
IntegrationNamespaceUtils.setValueIfAttributeDefined(handlerBuilder, element, "auto-create-directory");
// configure remote directory expression
String remoteDirectory = element.getAttribute("remote-directory");

29
spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java
View File

@@ -48,6 +48,8 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler {
public volatile String temporaryFileSuffix =".writing";
private final SessionFactory sessionFactory;
private volatile boolean autoCreateDirectory = false;
private volatile ExpressionEvaluatingMessageProcessor<String> directoryExpressionProcessor;
@@ -65,7 +67,10 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler {
this.sessionFactory = sessionFactory;
}
public void setAutoCreateDirectory(boolean autoCreateDirectory) {
this.autoCreateDirectory = autoCreateDirectory;
}
public void setRemoteFileSeparator(String remoteFileSeparator) {
Assert.hasText(remoteFileSeparator, "'remoteFileSeparator' must not be empty");
this.remoteFileSeparator = remoteFileSeparator;
@@ -185,10 +190,32 @@ public class FileTransferringMessageHandler extends AbstractMessageHandler {
String remoteFilePath = remoteDirectory + fileName;
// write remote file first with .writing extension
String tempFilePath = remoteFilePath + this.temporaryFileSuffix;
if (this.autoCreateDirectory){
this.ensureDirectoryExists(session, remoteDirectory, remoteDirectory);
}
session.write(fileInputStream, tempFilePath);
fileInputStream.close();
// then rename it to its final name
session.rename(tempFilePath, remoteFilePath);
}
private void ensureDirectoryExists(Session session, String remoteDirectory, String originalRemoteDirectory){
try {
session.list(remoteDirectory);
String missingDirectoryPath = originalRemoteDirectory.substring(remoteDirectory.length());
String[] directories = StringUtils.tokenizeToStringArray(missingDirectoryPath, this.remoteFileSeparator);
String directory = remoteDirectory + this.remoteFileSeparator;
for (String directorySegment : directories) {
directory += directorySegment+this.remoteFileSeparator;
logger.debug("Creating '" + directory + "'");
session.mkdir(directory);
}
} catch (IOException e) {
logger.debug("Directory '" + remoteDirectory + "' does not exist");
remoteDirectory = remoteDirectory.substring(0, remoteDirectory.lastIndexOf(this.remoteFileSeparator));
this.ensureDirectoryExists(session, remoteDirectory, originalRemoteDirectory);
}
}
}

4
spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/CachingSessionFactory.java
View File

@@ -148,6 +148,10 @@ public class CachingSessionFactory implements SessionFactory, DisposableBean {
public void rename(String pathFrom, String pathTo) throws IOException {
this.targetSession.rename(pathFrom, pathTo);
}
public void mkdir(String directory) throws IOException {
this.targetSession.mkdir(directory);
}
}
}

2
spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/Session.java
View File

@@ -39,6 +39,8 @@ public interface Session {
void write(InputStream inputStream, String destination) throws IOException;
void mkdir(String directory) throws IOException;
void rename(String pathFrom, String pathTo) throws IOException;
void close();