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

INT-1614 FtpSendingMessageHandler now takes the SessionFactory in its sole constructor

Browse Source
This commit is contained in:
Mark Fisher
2010-11-21 18:14:19 -05:00
parent f448ec93b2
commit fd083e9772
5 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java
View File

@@ -50,12 +50,13 @@ public class FtpSendingMessageHandler extends AbstractMessageHandler {
private static final String TEMPORARY_FILE_SUFFIX = ".writing";
private final SessionFactory sessionFactory;
private volatile ExpressionEvaluatingMessageProcessor<String> directoryExpressionProcesor;
private volatile Expression remoteDirectoryExpression;
private volatile SessionFactory sessionFactory;
private volatile FileNameGenerator fileNameGenerator = new DefaultFileNameGenerator();
private volatile File temporaryBufferFolderFile;
@@ -66,18 +67,12 @@ public class FtpSendingMessageHandler extends AbstractMessageHandler {
private volatile String charset = Charset.defaultCharset().name();
public FtpSendingMessageHandler() {
}
public FtpSendingMessageHandler(SessionFactory sessionFactory) {
Assert.notNull(sessionFactory, "sessionFactory must not be null");
this.sessionFactory = sessionFactory;
}
public void setSessionFactory(SessionFactory sessionFactory) {
this.sessionFactory = sessionFactory;
}
public void setRemoteDirectoryExpression(Expression remoteDirectoryExpression) {
this.remoteDirectoryExpression = remoteDirectoryExpression;
}
@@ -95,9 +90,7 @@ public class FtpSendingMessageHandler extends AbstractMessageHandler {
}
protected void onInit() throws Exception {
Assert.notNull(this.sessionFactory, "sessionFactory must not be null");
Assert.notNull(this.temporaryBufferFolder,
"'temporaryBufferFolder' must not be null");
Assert.notNull(this.temporaryBufferFolder, "'temporaryBufferFolder' must not be null");
this.temporaryBufferFolderFile = this.temporaryBufferFolder.getFile();
if (this.remoteDirectoryExpression != null) {
this.directoryExpressionProcesor =