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

Removed FTPClientPool for now since the QueuedFTPClientPool was expecting an interface.

Browse Source
This commit is contained in:
Mark Fisher
2008-08-14 19:53:36 +00:00
parent 8c8f5dbd49
commit 4ae5e7d0ff
2 changed files with 19 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/FTPClientPool.java
View File

@@ -1,98 +0,0 @@
package org.springframework.integration.adapter.ftp;
import java.io.IOException;
import java.net.SocketException;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Queue;
import java.util.Set;
import java.util.Stack;
import java.util.concurrent.ArrayBlockingQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig;
public class FTPClientPool {
private static final int DEFAULT_POOL_SIZE = 5;
private final Queue<FTPClient> pool;
private FTPClientConfig config;
private String host;
private int port = FTP.DEFAULT_PORT;
private String user;
private String pass;
private FTPClientFactory factory = new DefaultFactory();
private final Log log = LogFactory.getLog(this.getClass());
public FTPClientPool() {
this(DEFAULT_POOL_SIZE);
}
public FTPClientPool(int maxPoolSize) {
pool = new ArrayBlockingQueue<FTPClient>(maxPoolSize);
}
public synchronized FTPClient getClient() throws SocketException, IOException {
return pool.isEmpty() ? factory.getClient() : pool.element();
}
public synchronized void releaseClient(FTPClient client) {
if (client != null) {
if (!pool.offer(client)) {
try {
client.disconnect();
}
catch (IOException e) {
log.warn("Error disconnecting ftpclient", e);
}
}
}
}
private class DefaultFactory implements FTPClientFactory {
public FTPClient getClient() throws SocketException, IOException {
FTPClient client = new FTPClient();
client.configure(config);
client.connect(host, port);
client.login(user, pass);
return client;
}
}
public void setConfig(FTPClientConfig config) {
this.config = config;
}
public void setHost(String host) {
this.host = host;
}
public void setPort(int port) {
this.port = port;
}
public void setUser(String user) {
this.user = user;
}
public void setPass(String pass) {
this.pass = pass;
}
public void setFactory(FTPClientFactory factory) {
this.factory = factory;
}
}

33
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/ftp/QueuedFTPClientPool.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.integration.adapter.ftp; package org.springframework.integration.adapter.ftp;
import java.io.IOException; import java.io.IOException;
@@ -25,6 +26,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig; import org.apache.commons.net.ftp.FTPClientConfig;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
@@ -32,9 +34,8 @@ import org.springframework.util.Assert;
* default pool size of 5, but this is configurable with a constructor argument. * default pool size of 5, but this is configurable with a constructor argument.
* *
* @author Iwein Fuld * @author Iwein Fuld
*
*/ */
public class QueuedFTPClientPool implements FTPClientPool { public class QueuedFTPClientPool {
private static final int DEFAULT_POOL_SIZE = 5; private static final int DEFAULT_POOL_SIZE = 5;
@@ -54,10 +55,12 @@ public class QueuedFTPClientPool implements FTPClientPool {
private final Log log = LogFactory.getLog(this.getClass()); private final Log log = LogFactory.getLog(this.getClass());
public QueuedFTPClientPool() { public QueuedFTPClientPool() {
this(DEFAULT_POOL_SIZE); this(DEFAULT_POOL_SIZE);
} }
/** /**
* @param maxPoolSize the maximum size of the pool * @param maxPoolSize the maximum size of the pool
*/ */
@@ -82,17 +85,6 @@ public class QueuedFTPClientPool implements FTPClientPool {
} }
} }
private class DefaultFactory implements FTPClientFactory {
public FTPClient getClient() throws SocketException, IOException {
FTPClient client = new FTPClient();
client.configure(config);
client.connect(host, port);
client.login(user, pass);
return client;
}
}
public void setConfig(FTPClientConfig config) { public void setConfig(FTPClientConfig config) {
Assert.notNull(config); Assert.notNull(config);
this.config = config; this.config = config;
@@ -104,7 +96,7 @@ public class QueuedFTPClientPool implements FTPClientPool {
} }
public void setPort(int port) { public void setPort(int port) {
Assert.isTrue(port != 0, "Port number should be > 0"); Assert.isTrue(port > 0, "Port number should be > 0");
this.port = port; this.port = port;
} }
@@ -122,4 +114,17 @@ public class QueuedFTPClientPool implements FTPClientPool {
Assert.notNull(factory); Assert.notNull(factory);
this.factory = factory; this.factory = factory;
} }
private class DefaultFactory implements FTPClientFactory {
public FTPClient getClient() throws SocketException, IOException {
FTPClient client = new FTPClient();
client.configure(config);
client.connect(host, port);
client.login(user, pass);
return client;
}
}
} }