You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/02/24 17:22:49 UTC
(commons-net) 03/04: Sort member
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit 417601b34b5d261f892855f0e4c32c6033607b5b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 24 12:21:58 2024 -0500
Sort member
---
.../java/org/apache/commons/net/ftp/FTPClient.java | 16 +--
.../org/apache/commons/net/ftp/ModeZSocket.java | 158 ++++++++++-----------
2 files changed, 87 insertions(+), 87 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClient.java b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
index 5babcb6f..d9b67c4f 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -794,14 +794,6 @@ public class FTPClient extends FTP implements Configurable {
return socket;
}
- private Socket wrapSocketIfModeZisEnabled(final Socket plainSocket) {
- if (fileTransferMode == COMPRESSED_MODE_Z_TRANSFER_MODE) {
- return ModeZSocket.wrap(plainSocket);
- } else {
- return plainSocket;
- }
- }
-
protected void _parseExtendedPassiveModeReply(String reply) throws MalformedServerReplyException {
reply = reply.substring(reply.indexOf('(') + 1, reply.indexOf(')')).trim();
@@ -3426,4 +3418,12 @@ public class FTPClient extends FTP implements Configurable {
public boolean structureMount(final String pathname) throws IOException {
return FTPReply.isPositiveCompletion(smnt(pathname));
}
+
+ private Socket wrapSocketIfModeZisEnabled(final Socket plainSocket) {
+ if (fileTransferMode == COMPRESSED_MODE_Z_TRANSFER_MODE) {
+ return ModeZSocket.wrap(plainSocket);
+ } else {
+ return plainSocket;
+ }
+ }
}
diff --git a/src/main/java/org/apache/commons/net/ftp/ModeZSocket.java b/src/main/java/org/apache/commons/net/ftp/ModeZSocket.java
index b97bab73..fad29b70 100644
--- a/src/main/java/org/apache/commons/net/ftp/ModeZSocket.java
+++ b/src/main/java/org/apache/commons/net/ftp/ModeZSocket.java
@@ -35,14 +35,24 @@ import java.util.zip.InflaterInputStream;
*/
class ModeZSocket extends Socket {
+ static Socket wrap(final Socket plain) {
+ return new ModeZSocket(plain);
+ }
+
private final Socket delegate;
private ModeZSocket(final Socket delegate) {
this.delegate = delegate;
}
- static Socket wrap(final Socket plain) {
- return new ModeZSocket(plain);
+ @Override
+ public void bind(final SocketAddress bindpoint) throws IOException {
+ delegate.bind(bindpoint);
+ }
+
+ @Override
+ public synchronized void close() throws IOException {
+ delegate.close();
}
@Override
@@ -56,8 +66,8 @@ class ModeZSocket extends Socket {
}
@Override
- public void bind(final SocketAddress bindpoint) throws IOException {
- delegate.bind(bindpoint);
+ public SocketChannel getChannel() {
+ return delegate.getChannel();
}
@Override
@@ -66,23 +76,23 @@ class ModeZSocket extends Socket {
}
@Override
- public InetAddress getLocalAddress() {
- return delegate.getLocalAddress();
+ public InputStream getInputStream() throws IOException {
+ return new InflaterInputStream(delegate.getInputStream());
}
@Override
- public int getPort() {
- return delegate.getPort();
+ public boolean getKeepAlive() throws SocketException {
+ return delegate.getKeepAlive();
}
@Override
- public int getLocalPort() {
- return delegate.getLocalPort();
+ public InetAddress getLocalAddress() {
+ return delegate.getLocalAddress();
}
@Override
- public SocketAddress getRemoteSocketAddress() {
- return delegate.getRemoteSocketAddress();
+ public int getLocalPort() {
+ return delegate.getLocalPort();
}
@Override
@@ -91,33 +101,38 @@ class ModeZSocket extends Socket {
}
@Override
- public SocketChannel getChannel() {
- return delegate.getChannel();
+ public boolean getOOBInline() throws SocketException {
+ return delegate.getOOBInline();
}
@Override
- public InputStream getInputStream() throws IOException {
- return new InflaterInputStream(delegate.getInputStream());
+ public OutputStream getOutputStream() throws IOException {
+ return new DeflaterOutputStream(delegate.getOutputStream());
}
@Override
- public OutputStream getOutputStream() throws IOException {
- return new DeflaterOutputStream(delegate.getOutputStream());
+ public int getPort() {
+ return delegate.getPort();
}
@Override
- public void setTcpNoDelay(final boolean on) throws SocketException {
- delegate.setTcpNoDelay(on);
+ public synchronized int getReceiveBufferSize() throws SocketException {
+ return delegate.getReceiveBufferSize();
}
@Override
- public boolean getTcpNoDelay() throws SocketException {
- return delegate.getTcpNoDelay();
+ public SocketAddress getRemoteSocketAddress() {
+ return delegate.getRemoteSocketAddress();
}
@Override
- public void setSoLinger(final boolean on, final int linger) throws SocketException {
- delegate.setSoLinger(on, linger);
+ public boolean getReuseAddress() throws SocketException {
+ return delegate.getReuseAddress();
+ }
+
+ @Override
+ public synchronized int getSendBufferSize() throws SocketException {
+ return delegate.getSendBufferSize();
}
@Override
@@ -126,48 +141,48 @@ class ModeZSocket extends Socket {
}
@Override
- public void sendUrgentData(final int data) throws IOException {
- delegate.sendUrgentData(data);
+ public synchronized int getSoTimeout() throws SocketException {
+ return delegate.getSoTimeout();
}
@Override
- public void setOOBInline(final boolean on) throws SocketException {
- delegate.setOOBInline(on);
+ public boolean getTcpNoDelay() throws SocketException {
+ return delegate.getTcpNoDelay();
}
@Override
- public boolean getOOBInline() throws SocketException {
- return delegate.getOOBInline();
+ public int getTrafficClass() throws SocketException {
+ return delegate.getTrafficClass();
}
@Override
- public synchronized void setSoTimeout(final int timeout) throws SocketException {
- delegate.setSoTimeout(timeout);
+ public boolean isBound() {
+ return delegate.isBound();
}
@Override
- public synchronized int getSoTimeout() throws SocketException {
- return delegate.getSoTimeout();
+ public boolean isClosed() {
+ return delegate.isClosed();
}
@Override
- public synchronized void setSendBufferSize(final int size) throws SocketException {
- delegate.setSendBufferSize(size);
+ public boolean isConnected() {
+ return delegate.isConnected();
}
@Override
- public synchronized int getSendBufferSize() throws SocketException {
- return delegate.getSendBufferSize();
+ public boolean isInputShutdown() {
+ return delegate.isInputShutdown();
}
@Override
- public synchronized void setReceiveBufferSize(final int size) throws SocketException {
- delegate.setReceiveBufferSize(size);
+ public boolean isOutputShutdown() {
+ return delegate.isOutputShutdown();
}
@Override
- public synchronized int getReceiveBufferSize() throws SocketException {
- return delegate.getReceiveBufferSize();
+ public void sendUrgentData(final int data) throws IOException {
+ delegate.sendUrgentData(data);
}
@Override
@@ -176,18 +191,18 @@ class ModeZSocket extends Socket {
}
@Override
- public boolean getKeepAlive() throws SocketException {
- return delegate.getKeepAlive();
+ public void setOOBInline(final boolean on) throws SocketException {
+ delegate.setOOBInline(on);
}
@Override
- public void setTrafficClass(final int tc) throws SocketException {
- delegate.setTrafficClass(tc);
+ public void setPerformancePreferences(final int connectionTime, final int latency, final int bandwidth) {
+ delegate.setPerformancePreferences(connectionTime, latency, bandwidth);
}
@Override
- public int getTrafficClass() throws SocketException {
- return delegate.getTrafficClass();
+ public synchronized void setReceiveBufferSize(final int size) throws SocketException {
+ delegate.setReceiveBufferSize(size);
}
@Override
@@ -196,57 +211,42 @@ class ModeZSocket extends Socket {
}
@Override
- public boolean getReuseAddress() throws SocketException {
- return delegate.getReuseAddress();
- }
-
- @Override
- public synchronized void close() throws IOException {
- delegate.close();
- }
-
- @Override
- public void shutdownInput() throws IOException {
- delegate.shutdownInput();
- }
-
- @Override
- public void shutdownOutput() throws IOException {
- delegate.shutdownOutput();
+ public synchronized void setSendBufferSize(final int size) throws SocketException {
+ delegate.setSendBufferSize(size);
}
@Override
- public String toString() {
- return delegate.toString();
+ public void setSoLinger(final boolean on, final int linger) throws SocketException {
+ delegate.setSoLinger(on, linger);
}
@Override
- public boolean isConnected() {
- return delegate.isConnected();
+ public synchronized void setSoTimeout(final int timeout) throws SocketException {
+ delegate.setSoTimeout(timeout);
}
@Override
- public boolean isBound() {
- return delegate.isBound();
+ public void setTcpNoDelay(final boolean on) throws SocketException {
+ delegate.setTcpNoDelay(on);
}
@Override
- public boolean isClosed() {
- return delegate.isClosed();
+ public void setTrafficClass(final int tc) throws SocketException {
+ delegate.setTrafficClass(tc);
}
@Override
- public boolean isInputShutdown() {
- return delegate.isInputShutdown();
+ public void shutdownInput() throws IOException {
+ delegate.shutdownInput();
}
@Override
- public boolean isOutputShutdown() {
- return delegate.isOutputShutdown();
+ public void shutdownOutput() throws IOException {
+ delegate.shutdownOutput();
}
@Override
- public void setPerformancePreferences(final int connectionTime, final int latency, final int bandwidth) {
- delegate.setPerformancePreferences(connectionTime, latency, bandwidth);
+ public String toString() {
+ return delegate.toString();
}
}