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 d4de715810f0e959feb2d1f5de1fa73d5af5f6f0 Author: Gary Gregory <[email protected]> AuthorDate: Fri Jan 30 09:45:07 2026 -0500 Merge if statements that have identical blocks Sort imports --- .../java/org/apache/commons/net/SocketClient.java | 16 +----- .../java/org/apache/commons/net/ftp/FTPClient.java | 16 ++---- .../org/apache/commons/net/ftp/FTPHTTPClient.java | 12 +---- .../org/apache/commons/net/ftp/FTPSClient.java | 18 ++----- .../net/ftp/parser/OS400FTPEntryParser.java | 5 +- .../org/apache/commons/net/imap/IMAPClient.java | 6 +-- .../org/apache/commons/net/pop3/POP3Client.java | 58 ++++------------------ .../org/apache/commons/net/smtp/SMTPClient.java | 5 +- .../apache/commons/net/echo/EchoTCPClientTest.java | 2 +- .../net/ftp/parser/AbstractFTPParseTest.java | 5 +- .../commons/net/smtp/SimpleSMTPHeaderTestCase.java | 2 +- 11 files changed, 26 insertions(+), 119 deletions(-) diff --git a/src/main/java/org/apache/commons/net/SocketClient.java b/src/main/java/org/apache/commons/net/SocketClient.java index 8cba0038..fa8c983f 100644 --- a/src/main/java/org/apache/commons/net/SocketClient.java +++ b/src/main/java/org/apache/commons/net/SocketClient.java @@ -562,25 +562,13 @@ public abstract class SocketClient { public boolean isAvailable() { if (isConnected()) { try { - if (_socket_.getInetAddress() == null) { - return false; - } - if (_socket_.getPort() == 0) { - return false; - } - if (_socket_.getRemoteSocketAddress() == null) { - return false; - } - if (_socket_.isClosed()) { + if (_socket_.getInetAddress() == null || _socket_.getPort() == 0 || _socket_.getRemoteSocketAddress() == null || _socket_.isClosed()) { return false; } /* * these aren't exact checks (a Socket can be half-open), but since we usually require two-way data transfer, we check these here too: */ - if (_socket_.isInputShutdown()) { - return false; - } - if (_socket_.isOutputShutdown()) { + if (_socket_.isInputShutdown() || _socket_.isOutputShutdown()) { return false; } /* ignore the result, catch exceptions: */ 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 cb8d8cd3..5d001201 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java @@ -732,10 +732,7 @@ public class FTPClient extends FTP implements Configurable { } else if (!FTPReply.isPositiveCompletion(port(getReportHostAddress(), server.getLocalPort()))) { return null; } - if (restartOffset > 0 && !restart(restartOffset)) { - return null; - } - if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) { + if (restartOffset > 0 && !restart(restartOffset) || !FTPReply.isPositivePreliminary(sendCommand(command, arg))) { return null; } // For now, let's just use the data timeout value for waiting for @@ -770,11 +767,8 @@ public class FTPClient extends FTP implements Configurable { if (attemptEPSV && epsv() == FTPReply.ENTERING_EPSV_MODE) { _parseExtendedPassiveModeReply(_replyLines.get(0)); } else { - if (isInet6Address) { - return null; // Must use EPSV for IPV6 - } // If EPSV failed on IPV4, revert to PASV - if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) { + if (isInet6Address || pasv() != FTPReply.ENTERING_PASSIVE_MODE) { return null; } _parsePassiveModeReply(_replyLines.get(0)); @@ -797,11 +791,7 @@ public class FTPClient extends FTP implements Configurable { socket.setSoTimeout(soTimeoutMillis); } socket.connect(new InetSocketAddress(passiveHost, passivePort), connectTimeout); - if (restartOffset > 0 && !restart(restartOffset)) { - socket.close(); - return null; - } - if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) { + if (restartOffset > 0 && !restart(restartOffset) || !FTPReply.isPositivePreliminary(sendCommand(command, arg))) { socket.close(); return null; } diff --git a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java index 0e53d4ae..d4558c5e 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java @@ -133,11 +133,8 @@ public class FTPHTTPClient extends FTPClient { _parseExtendedPassiveModeReply(_replyLines.get(0)); passiveHost = tunnelHost; } else { - if (isInet6Address) { - return null; // Must use EPSV for IPV6 - } // If EPSV failed on IPV4, revert to PASV - if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) { + if (isInet6Address || pasv() != FTPReply.ENTERING_PASSIVE_MODE) { return null; } _parsePassiveModeReply(_replyLines.get(0)); @@ -148,12 +145,7 @@ public class FTPHTTPClient extends FTPClient { final InputStream is = socket.getInputStream(); final OutputStream os = socket.getOutputStream(); tunnelHandshake(passiveHost, getPassivePort(), is, os); - if (getRestartOffset() > 0 && !restart(getRestartOffset())) { - socket.close(); - return null; - } - - if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) { + if (getRestartOffset() > 0 && !restart(getRestartOffset()) || !FTPReply.isPositivePreliminary(sendCommand(command, arg))) { socket.close(); return null; } diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java index d7b56e36..bd49af4e 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java @@ -816,11 +816,7 @@ public class FTPSClient extends FTPClient { return null; } - if (getRestartOffset() > 0 && !restart(getRestartOffset())) { - return null; - } - - if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) { + if (getRestartOffset() > 0 && !restart(getRestartOffset()) || !FTPReply.isPositivePreliminary(sendCommand(command, arg))) { return null; } @@ -857,11 +853,8 @@ public class FTPSClient extends FTPClient { if (attemptEPSV && epsv() == FTPReply.ENTERING_EPSV_MODE) { _parseExtendedPassiveModeReply(_replyLines.get(0)); } else { - if (isInet6Address) { - return null; // Must use EPSV for IPV6 - } // If EPSV failed on IPV4, revert to PASV - if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) { + if (isInet6Address || pasv() != FTPReply.ENTERING_PASSIVE_MODE) { return null; } _parsePassiveModeReply(_replyLines.get(0)); @@ -897,12 +890,7 @@ public class FTPSClient extends FTPClient { sslSocket = context.getSocketFactory().createSocket(socket, getPassiveHost(), getPassivePort(), true); } - if (getRestartOffset() > 0 && !restart(getRestartOffset())) { - closeSockets(socket, sslSocket); - return null; - } - - if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) { + if (getRestartOffset() > 0 && !restart(getRestartOffset()) || !FTPReply.isPositivePreliminary(sendCommand(command, arg))) { closeSockets(socket, sslSocket); return null; } diff --git a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java index 42e6d20b..3b875e6f 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java @@ -334,10 +334,7 @@ public class OS400FTPEntryParser extends ConfigurableFTPFileEntryParserImpl { mustScanForPathSeparator = false; type = FTPFile.FILE_TYPE; - if (isNullOrEmpty(name)) { - return null; - } - if (!(isNullOrEmpty(fileSize) && isNullOrEmpty(datestr))) { + if (isNullOrEmpty(name) || !(isNullOrEmpty(fileSize) && isNullOrEmpty(datestr))) { return null; } diff --git a/src/main/java/org/apache/commons/net/imap/IMAPClient.java b/src/main/java/org/apache/commons/net/imap/IMAPClient.java index ab99daa5..f05868fc 100644 --- a/src/main/java/org/apache/commons/net/imap/IMAPClient.java +++ b/src/main/java/org/apache/commons/net/imap/IMAPClient.java @@ -450,11 +450,7 @@ public class IMAPClient extends IMAP { * @throws IOException If a network I/O error occurs in the process of logging in. */ public boolean login(final String user, final String password) throws IOException { - if (getState() != IMAP.IMAPState.NOT_AUTH_STATE) { - return false; - } - - if (!doCommand(IMAPCommand.LOGIN, user + " " + password)) { + if (getState() != IMAP.IMAPState.NOT_AUTH_STATE || !doCommand(IMAPCommand.LOGIN, user + " " + password)) { return false; } diff --git a/src/main/java/org/apache/commons/net/pop3/POP3Client.java b/src/main/java/org/apache/commons/net/pop3/POP3Client.java index 3e11d621..fe636bbe 100644 --- a/src/main/java/org/apache/commons/net/pop3/POP3Client.java +++ b/src/main/java/org/apache/commons/net/pop3/POP3Client.java @@ -150,10 +150,7 @@ public class POP3Client extends POP3 { * @throws IOException If a network I/O error occurs in the process of sending the list command. */ public POP3MessageInfo listMessage(final int messageId) throws IOException { - if (getState() != TRANSACTION_STATE) { - return null; - } - if (sendCommand(POP3Command.LIST, Integer.toString(messageId)) != POP3Reply.OK) { + if (getState() != TRANSACTION_STATE || sendCommand(POP3Command.LIST, Integer.toString(messageId)) != POP3Reply.OK) { return null; } return parseStatus(lastReplyLine.substring(3)); @@ -169,10 +166,7 @@ public class POP3Client extends POP3 { * @throws IOException If a network I/O error occurs in the process of sending the list command. */ public POP3MessageInfo[] listMessages() throws IOException { - if (getState() != TRANSACTION_STATE) { - return null; - } - if (sendCommand(POP3Command.LIST) != POP3Reply.OK) { + if (getState() != TRANSACTION_STATE || sendCommand(POP3Command.LIST) != POP3Reply.OK) { return null; } getAdditionalReply(); @@ -199,10 +193,7 @@ public class POP3Client extends POP3 { * @throws IOException If a network I/O error occurs in the process of sending the list unique identifier command. */ public POP3MessageInfo listUniqueIdentifier(final int messageId) throws IOException { - if (getState() != TRANSACTION_STATE) { - return null; - } - if (sendCommand(POP3Command.UIDL, Integer.toString(messageId)) != POP3Reply.OK) { + if (getState() != TRANSACTION_STATE || sendCommand(POP3Command.UIDL, Integer.toString(messageId)) != POP3Reply.OK) { return null; } return parseUID(lastReplyLine.substring(3)); @@ -218,10 +209,7 @@ public class POP3Client extends POP3 { * @throws IOException If a network I/O error occurs in the process of sending the list unique identifier command. */ public POP3MessageInfo[] listUniqueIdentifiers() throws IOException { - if (getState() != TRANSACTION_STATE) { - return null; - } - if (sendCommand(POP3Command.UIDL) != POP3Reply.OK) { + if (getState() != TRANSACTION_STATE || sendCommand(POP3Command.UIDL) != POP3Reply.OK) { return null; } getAdditionalReply(); @@ -248,20 +236,11 @@ public class POP3Client extends POP3 { * @throws IOException If a network I/O error occurs in the process of logging in. */ public boolean login(final String user, final String password) throws IOException { - if (getState() != AUTHORIZATION_STATE) { - return false; - } - - if (sendCommand(POP3Command.USER, user) != POP3Reply.OK) { + if (getState() != AUTHORIZATION_STATE || sendCommand(POP3Command.USER, user) != POP3Reply.OK + || sendCommand(POP3Command.PASS, password) != POP3Reply.OK) { return false; } - - if (sendCommand(POP3Command.PASS, password) != POP3Reply.OK) { - return false; - } - setState(TRANSACTION_STATE); - return true; } @@ -291,16 +270,13 @@ public class POP3Client extends POP3 { final StringBuilder buffer; final StringBuilder digestBuffer; final MessageDigest md5; - if (getState() != AUTHORIZATION_STATE) { return false; } - md5 = MessageDigest.getInstance("MD5"); timestamp += secret; digest = md5.digest(timestamp.getBytes(getCharset())); digestBuffer = new StringBuilder(128); - for (i = 0; i < digest.length; i++) { final int digit = digest[i] & 0xff; if (digit <= 15) { // Add leading zero if necessary (NET-351) @@ -308,18 +284,14 @@ public class POP3Client extends POP3 { } digestBuffer.append(Integer.toHexString(digit)); } - buffer = new StringBuilder(256); buffer.append(user); buffer.append(' '); buffer.append(digestBuffer.toString()); - if (sendCommand(POP3Command.APOP, buffer.toString()) != POP3Reply.OK) { return false; } - setState(TRANSACTION_STATE); - return true; } @@ -384,13 +356,9 @@ public class POP3Client extends POP3 { * @throws IOException If a network I/O error occurs in the process of sending the retrieve message command. */ public Reader retrieveMessage(final int messageId) throws IOException { - if (getState() != TRANSACTION_STATE) { + if (getState() != TRANSACTION_STATE || sendCommand(POP3Command.RETR, Integer.toString(messageId)) != POP3Reply.OK) { return null; } - if (sendCommand(POP3Command.RETR, Integer.toString(messageId)) != POP3Reply.OK) { - return null; - } - return new DotTerminatedMessageReader(reader); } @@ -412,13 +380,10 @@ public class POP3Client extends POP3 { * @throws IOException If a network I/O error occurs in the process of sending the top command. */ public Reader retrieveMessageTop(final int messageId, final int numLines) throws IOException { - if (numLines < 0 || getState() != TRANSACTION_STATE) { - return null; - } - if (sendCommand(POP3Command.TOP, Integer.toString(messageId) + " " + Integer.toString(numLines)) != POP3Reply.OK) { + if (numLines < 0 || getState() != TRANSACTION_STATE + || sendCommand(POP3Command.TOP, Integer.toString(messageId) + " " + Integer.toString(numLines)) != POP3Reply.OK) { return null; } - return new DotTerminatedMessageReader(reader); } @@ -432,10 +397,7 @@ public class POP3Client extends POP3 { * @throws IOException If a network I/O error occurs in the process of sending the status command. */ public POP3MessageInfo status() throws IOException { - if (getState() != TRANSACTION_STATE) { - return null; - } - if (sendCommand(POP3Command.STAT) != POP3Reply.OK) { + if (getState() != TRANSACTION_STATE || sendCommand(POP3Command.STAT) != POP3Reply.OK) { return null; } return parseStatus(lastReplyLine.substring(3)); diff --git a/src/main/java/org/apache/commons/net/smtp/SMTPClient.java b/src/main/java/org/apache/commons/net/smtp/SMTPClient.java index b2116615..7ac76aa5 100644 --- a/src/main/java/org/apache/commons/net/smtp/SMTPClient.java +++ b/src/main/java/org/apache/commons/net/smtp/SMTPClient.java @@ -346,10 +346,7 @@ public class SMTPClient extends SMTP { * @throws IOException If an I/O error occurs while either sending a command to the server or receiving a reply from the server. */ public boolean sendSimpleMessage(final String sender, final String recipient, final String message) throws IOException { - if (!setSender(sender)) { - return false; - } - if (!addRecipient(recipient)) { + if (!setSender(sender) || !addRecipient(recipient)) { return false; } return sendShortMessageData(message); diff --git a/src/test/java/org/apache/commons/net/echo/EchoTCPClientTest.java b/src/test/java/org/apache/commons/net/echo/EchoTCPClientTest.java index fd104897..6f06d346 100644 --- a/src/test/java/org/apache/commons/net/echo/EchoTCPClientTest.java +++ b/src/test/java/org/apache/commons/net/echo/EchoTCPClientTest.java @@ -17,8 +17,8 @@ package org.apache.commons.net.echo; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/java/org/apache/commons/net/ftp/parser/AbstractFTPParseTest.java b/src/test/java/org/apache/commons/net/ftp/parser/AbstractFTPParseTest.java index 3ffb1f70..7c2b1710 100644 --- a/src/test/java/org/apache/commons/net/ftp/parser/AbstractFTPParseTest.java +++ b/src/test/java/org/apache/commons/net/ftp/parser/AbstractFTPParseTest.java @@ -98,10 +98,7 @@ public abstract class AbstractFTPParseTest { * @return null if f is null or the date is null */ protected FTPFile nullFileOrNullDate(final FTPFile f) { - if (f == null) { - return null; - } - if (f.getTimestamp() == null) { + if (f == null || f.getTimestamp() == null) { return null; } return f; diff --git a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java index c7f25759..de1163d7 100644 --- a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java +++ b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java @@ -18,8 +18,8 @@ package org.apache.commons.net.smtp; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; import java.text.ParseException; import java.text.SimpleDateFormat;
