From 7edbc931b1ca6af4c0055e696cecf5c4594cdd14 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 19 Nov 2010 12:44:10 -0500 Subject: [PATCH] INT-1614 replaced 'directoryExists' with 'exists' --- .../sftp/inbound/SftpInboundFileSynchronizer.java | 2 +- .../sftp/session/CachingSftpSessionFactory.java | 8 ++------ .../integration/sftp/session/DefaultSftpSession.java | 2 +- .../integration/sftp/session/SftpSession.java | 4 +--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java index cf040a7769..f6c2c7e067 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/SftpInboundFileSynchronizer.java @@ -79,7 +79,7 @@ public class SftpInboundFileSynchronizer extends AbstractInboundFileSynchronizer logger.trace("Pooled SftpSession " + session + " from the pool"); } session.connect(); - Assert.isTrue(session.directoryExists(remotePath), "remote path '" + remotePath + "' does not exist"); + Assert.isTrue(session.exists(remotePath), "remote path '" + remotePath + "' does not exist"); Collection beforeFilter = session.ls(remotePath); ChannelSftp.LsEntry[] entries = (beforeFilter == null) ? new ChannelSftp.LsEntry[0] : beforeFilter.toArray(new ChannelSftp.LsEntry[beforeFilter.size()]); diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/CachingSftpSessionFactory.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/CachingSftpSessionFactory.java index b60a96d3dc..dd282463f6 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/CachingSftpSessionFactory.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/CachingSftpSessionFactory.java @@ -120,12 +120,8 @@ public class CachingSftpSessionFactory implements SftpSessionFactory, Disposable } } - public boolean directoryExists(String path) { - return this.targetSession.directoryExists(path); - } - - public boolean mkdir(String path) { - return this.targetSession.mkdir(path); + public boolean exists(String path) { + return this.targetSession.exists(path); } public boolean rm(String path) { diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSession.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSession.java index 07563d9969..770c500795 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSession.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSession.java @@ -135,7 +135,7 @@ public class DefaultSftpSession implements SftpSession { } } - public boolean directoryExists(String path) { + public boolean exists(String path) { try { SftpATTRS attrs = channel.stat(path); return (attrs != null) && attrs.isDir(); diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java index b943000e29..fecbb8edfb 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/SftpSession.java @@ -37,9 +37,7 @@ public interface SftpSession { void disconnect(); - boolean directoryExists(String path); - - boolean mkdir(String path); + boolean exists(String path); boolean rm(String path);