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 2020/09/20 22:24:01 UTC
[commons-net] 01/03: No need to nest in else block.
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 5e8951d0852b5f4cbf1de3d170f96d46fc171d3b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Sep 20 18:07:07 2020 -0400
No need to nest in else block.
---
.../java/org/apache/commons/net/SocketClient.java | 3 +-
.../java/org/apache/commons/net/examples/Main.java | 3 +-
src/main/java/org/apache/commons/net/ftp/FTP.java | 5 +--
.../java/org/apache/commons/net/ftp/FTPClient.java | 28 ++++--------
.../org/apache/commons/net/ftp/FTPSClient.java | 26 +++--------
.../parser/DefaultFTPFileEntryParserFactory.java | 34 +++++++--------
.../commons/net/ftp/parser/MLSxEntryParser.java | 3 +-
.../java/org/apache/commons/net/ntp/TimeStamp.java | 5 +--
.../java/org/apache/commons/net/telnet/Telnet.java | 21 ++++-----
.../commons/net/telnet/TelnetInputStream.java | 28 ++++++------
.../apache/commons/net/telnet/TelnetOption.java | 5 +--
.../java/org/apache/commons/net/util/Base64.java | 21 +++++----
.../org/apache/commons/net/util/SubnetUtils.java | 3 +-
.../commons/net/smtp/SimpleSMTPHeaderTestCase.java | 6 +--
.../net/telnet/TelnetClientFunctionalTest.java | 5 +--
.../commons/net/telnet/TelnetClientTest.java | 13 +++---
.../commons/net/telnet/TelnetTestSimpleServer.java | 10 +----
.../net/telnet/TerminalTypeOptionHandlerTest.java | 13 +++---
.../org/apache/commons/net/tftp/TFTPServer.java | 50 ++++++++++------------
.../apache/commons/net/tftp/TFTPServerMain.java | 3 +-
20 files changed, 107 insertions(+), 178 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/SocketClient.java b/src/main/java/org/apache/commons/net/SocketClient.java
index 4c854e5..bd5c949 100644
--- a/src/main/java/org/apache/commons/net/SocketClient.java
+++ b/src/main/java/org/apache/commons/net/SocketClient.java
@@ -405,9 +405,8 @@ public abstract class SocketClient
return false;
}
return true;
- } else {
- return false;
}
+ return false;
}
/**
diff --git a/src/main/java/org/apache/commons/net/examples/Main.java b/src/main/java/org/apache/commons/net/examples/Main.java
index 6c07163..1b35cc0 100644
--- a/src/main/java/org/apache/commons/net/examples/Main.java
+++ b/src/main/java/org/apache/commons/net/examples/Main.java
@@ -95,9 +95,8 @@ public class Main {
final Throwable cause = ite.getCause();
if (cause != null) {
throw cause;
- } else {
- throw ite;
}
+ throw ite;
}
} catch (final ClassNotFoundException e) {
System.out.println(e);
diff --git a/src/main/java/org/apache/commons/net/ftp/FTP.java b/src/main/java/org/apache/commons/net/ftp/FTP.java
index 21c2ee7..df6a75a 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTP.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTP.java
@@ -549,10 +549,7 @@ public class FTP extends SocketClient
{
throw new FTPConnectionClosedException("Connection unexpectedly closed.");
}
- else
- {
- throw e;
- }
+ throw e;
}
}
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 0d2cc99..c0ab811 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -1419,11 +1419,8 @@ implements Configurable
// Get a random port between the min and max port range
return __random.nextInt(__activeMaxPort - __activeMinPort + 1) + __activeMinPort;
}
- else
- {
- // default port
- return 0;
- }
+ // default port
+ return 0;
}
/**
@@ -1438,11 +1435,8 @@ implements Configurable
{
return __activeExternalHost;
}
- else
- {
- // default local address
- return getLocalAddress();
- }
+ // default local address
+ return getLocalAddress();
}
/**
@@ -1456,9 +1450,8 @@ implements Configurable
private InetAddress getReportHostAddress() {
if (__reportActiveExternalHost != null) {
return __reportActiveExternalHost ;
- } else {
- return getHostAddress();
}
+ return getHostAddress();
}
/**
@@ -2530,9 +2523,8 @@ implements Configurable
final boolean success = FTPReply.isPositiveCompletion(sendCommand(command, params));
if (success){
return getReplyStrings();
- } else {
- return null;
}
+ return null;
}
/**
@@ -2560,9 +2552,8 @@ implements Configurable
// some FTP server reply contains more than one space before fact(s)
final String entry = reply.replaceAll("^\\s+", ""); // skip leading space for parser
return MLSxEntryParser.parseEntry(entry);
- } else {
- return null;
}
+ return null;
}
/**
@@ -3524,10 +3515,7 @@ implements Configurable
sb.append(pathname);
return sb.toString();
}
- else
- {
- return "-a";
- }
+ return "-a";
}
return pathname;
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 b50689e..c2f0983 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
@@ -776,10 +776,7 @@ public class FTPSClient extends FTPClient {
{
return sendCommand(CMD_ADAT, Base64.encodeBase64StringUnChunked(data));
}
- else
- {
- return sendCommand(CMD_ADAT);
- }
+ return sendCommand(CMD_ADAT);
}
/**
@@ -822,10 +819,7 @@ public class FTPSClient extends FTPClient {
{
return sendCommand(CMD_MIC, Base64.encodeBase64StringUnChunked(data));
}
- else
- {
- return sendCommand(CMD_MIC, ""); // perhaps "=" or just sendCommand(String)?
- }
+ return sendCommand(CMD_MIC, ""); // perhaps "=" or just sendCommand(String)?
}
/**
@@ -842,10 +836,7 @@ public class FTPSClient extends FTPClient {
{
return sendCommand(CMD_CONF, Base64.encodeBase64StringUnChunked(data));
}
- else
- {
- return sendCommand(CMD_CONF, ""); // perhaps "=" or just sendCommand(String)?
- }
+ return sendCommand(CMD_CONF, ""); // perhaps "=" or just sendCommand(String)?
}
/**
@@ -862,10 +853,7 @@ public class FTPSClient extends FTPClient {
{
return sendCommand(CMD_ENC, Base64.encodeBase64StringUnChunked(data));
}
- else
- {
- return sendCommand(CMD_ENC, ""); // perhaps "=" or just sendCommand(String)?
- }
+ return sendCommand(CMD_ENC, ""); // perhaps "=" or just sendCommand(String)?
}
/**
@@ -878,9 +866,8 @@ public class FTPSClient extends FTPClient {
{
if (reply == null) {
return null;
- } else {
- return Base64.decodeBase64(extractPrefixedData("ADAT=", reply));
}
+ return Base64.decodeBase64(extractPrefixedData("ADAT=", reply));
}
/**
@@ -909,9 +896,8 @@ public class FTPSClient extends FTPClient {
if (socket != null) {
final SSLSocketFactory f = context.getSocketFactory();
return f.createSocket(socket, socket.getInetAddress().getHostAddress(), socket.getPort(), false);
- } else {
- return null;
}
+ return null;
}
// DEPRECATED - for API compatibility only - DO NOT USE
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java b/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
index 196ff16..bd9ddbc 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
@@ -239,16 +239,15 @@ public class DefaultFTPFileEntryParserFactory
config.getServerSystemKey()))
{
return new NTFTPEntryParser(config);
- } else {
- // clone the config as it may be changed by the parsers (NET-602)
- final FTPClientConfig config2 = (config != null) ? new FTPClientConfig(config) : null;
- return new CompositeFileEntryParser(new FTPFileEntryParser[]
- {
- new NTFTPEntryParser(config),
- new UnixFTPEntryParser(config2,
- config2 != null && FTPClientConfig.SYST_UNIX_TRIM_LEADING.equals(config2.getServerSystemKey()))
- });
}
+ // clone the config as it may be changed by the parsers (NET-602)
+ final FTPClientConfig config2 = (config != null) ? new FTPClientConfig(config) : null;
+ return new CompositeFileEntryParser(new FTPFileEntryParser[]
+ {
+ new NTFTPEntryParser(config),
+ new UnixFTPEntryParser(config2,
+ config2 != null && FTPClientConfig.SYST_UNIX_TRIM_LEADING.equals(config2.getServerSystemKey()))
+ });
}
public FTPFileEntryParser createOS2FTPEntryParser()
@@ -274,16 +273,15 @@ public class DefaultFTPFileEntryParserFactory
FTPClientConfig.SYST_OS400.equals(config.getServerSystemKey()))
{
return new OS400FTPEntryParser(config);
- } else {
- // clone the config as it may be changed by the parsers (NET-602)
- final FTPClientConfig config2 = (config != null) ? new FTPClientConfig(config) : null;
- return new CompositeFileEntryParser(new FTPFileEntryParser[]
- {
- new OS400FTPEntryParser(config),
- new UnixFTPEntryParser(config2,
- config2 != null && FTPClientConfig.SYST_UNIX_TRIM_LEADING.equals(config2.getServerSystemKey()))
- });
}
+ // clone the config as it may be changed by the parsers (NET-602)
+ final FTPClientConfig config2 = (config != null) ? new FTPClientConfig(config) : null;
+ return new CompositeFileEntryParser(new FTPFileEntryParser[]
+ {
+ new OS400FTPEntryParser(config),
+ new UnixFTPEntryParser(config2,
+ config2 != null && FTPClientConfig.SYST_UNIX_TRIM_LEADING.equals(config2.getServerSystemKey()))
+ });
}
public FTPFileEntryParser createMVSEntryParser()
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
index b304f24..d0493aa 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
@@ -101,9 +101,8 @@ public class MLSxEntryParser extends FTPFileEntryParserImpl
file.setRawListing(entry);
file.setName(entry.substring(1));
return file;
- } else {
- return null; // Invalid - no pathname
}
+ return null; // Invalid - no pathname
}
final String parts[] = entry.split(" ",2); // Path may contain space
diff --git a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
index 497024b..b690a3f 100644
--- a/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
+++ b/src/main/java/org/apache/commons/net/ntp/TimeStamp.java
@@ -203,10 +203,9 @@ public class TimeStamp implements java.io.Serializable, Comparable<TimeStamp>
if (msb == 0) {
// use base: 7-Feb-2036 @ 06:28:16 UTC
return msb0baseTime + (seconds * 1000) + fraction;
- } else {
- // use base: 1-Jan-1900 @ 01:00:00 UTC
- return msb1baseTime + (seconds * 1000) + fraction;
}
+ // use base: 1-Jan-1900 @ 01:00:00 UTC
+ return msb1baseTime + (seconds * 1000) + fraction;
}
/***
diff --git a/src/main/java/org/apache/commons/net/telnet/Telnet.java b/src/main/java/org/apache/commons/net/telnet/Telnet.java
index 3804bc4..1f18eaf 100644
--- a/src/main/java/org/apache/commons/net/telnet/Telnet.java
+++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java
@@ -1141,20 +1141,17 @@ class Telnet extends SocketClient
throw (new InvalidTelnetOptionException(
"Unregistered option", optcode));
}
- else
- {
- final TelnetOptionHandler opthand = optionHandlers[optcode];
- optionHandlers[optcode] = null;
+ final TelnetOptionHandler opthand = optionHandlers[optcode];
+ optionHandlers[optcode] = null;
- if (opthand.getWill())
- {
- _requestWont(optcode);
- }
+ if (opthand.getWill())
+ {
+ _requestWont(optcode);
+ }
- if (opthand.getDo())
- {
- _requestDont(optcode);
- }
+ if (opthand.getDo())
+ {
+ _requestDont(optcode);
}
}
else
diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
index 476f84e..c15a7ed 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetInputStream.java
@@ -451,25 +451,22 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable
}
continue;
}
- else
- {
- int ch;
+ int ch;
- ch = __queue[__queueHead];
+ ch = __queue[__queueHead];
- if (++__queueHead >= __queue.length) {
- __queueHead = 0;
- }
+ if (++__queueHead >= __queue.length) {
+ __queueHead = 0;
+ }
- --__bytesAvailable;
+ --__bytesAvailable;
- // Need to explicitly notify() so available() works properly
- if(__bytesAvailable == 0 && __threaded) {
- __queue.notify();
- }
+ // Need to explicitly notify() so available() works properly
+ if(__bytesAvailable == 0 && __threaded) {
+ __queue.notify();
+ }
- return ch;
- }
+ return ch;
}
}
}
@@ -556,9 +553,8 @@ final class TelnetInputStream extends BufferedInputStream implements Runnable
{
if (__threaded) { // Must not call super.available when running threaded: NET-466
return __bytesAvailable;
- } else {
- return __bytesAvailable + super.available();
}
+ return __bytesAvailable + super.available();
}
}
diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetOption.java b/src/main/java/org/apache/commons/net/telnet/TelnetOption.java
index f00cfd1..fc08944 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetOption.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetOption.java
@@ -168,10 +168,7 @@ public class TelnetOption
{
return "UNASSIGNED";
}
- else
- {
- return __optionString[code];
- }
+ return __optionString[code];
}
diff --git a/src/main/java/org/apache/commons/net/util/Base64.java b/src/main/java/org/apache/commons/net/util/Base64.java
index 67d6426..f280380 100644
--- a/src/main/java/org/apache/commons/net/util/Base64.java
+++ b/src/main/java/org/apache/commons/net/util/Base64.java
@@ -546,17 +546,16 @@ public class Base64 {
// We're done.
eof = true;
break;
- } else {
- if (b >= 0 && b < DECODE_TABLE.length) {
- final int result = DECODE_TABLE[b];
- if (result >= 0) {
- modulus = (++modulus) % 4;
- x = (x << 6) + result;
- if (modulus == 0) {
- buffer[pos++] = (byte) ((x >> 16) & MASK_8BITS);
- buffer[pos++] = (byte) ((x >> 8) & MASK_8BITS);
- buffer[pos++] = (byte) (x & MASK_8BITS);
- }
+ }
+ if (b >= 0 && b < DECODE_TABLE.length) {
+ final int result = DECODE_TABLE[b];
+ if (result >= 0) {
+ modulus = (++modulus) % 4;
+ x = (x << 6) + result;
+ if (modulus == 0) {
+ buffer[pos++] = (byte) ((x >> 16) & MASK_8BITS);
+ buffer[pos++] = (byte) ((x >> 8) & MASK_8BITS);
+ buffer[pos++] = (byte) (x & MASK_8BITS);
}
}
}
diff --git a/src/main/java/org/apache/commons/net/util/SubnetUtils.java b/src/main/java/org/apache/commons/net/util/SubnetUtils.java
index 967461a..1cfc70d 100644
--- a/src/main/java/org/apache/commons/net/util/SubnetUtils.java
+++ b/src/main/java/org/apache/commons/net/util/SubnetUtils.java
@@ -329,9 +329,8 @@ public class SubnetUtils {
final Matcher matcher = addressPattern.matcher(address);
if (matcher.matches()) {
return matchAddress(matcher);
- } else {
- throw new IllegalArgumentException(String.format(PARSE_FAIL, address));
}
+ throw new IllegalArgumentException(String.format(PARSE_FAIL, address));
}
/*
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 1d1fe35..17e3c3a 100644
--- a/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
+++ b/src/test/java/org/apache/commons/net/smtp/SimpleSMTPHeaderTestCase.java
@@ -115,12 +115,10 @@ public class SimpleSMTPHeaderTestCase {
final int end = m.end(1);
if (start == 0) {
return msg.substring(end+1);
- } else {
- return msg.substring(0, start)+msg.substring(end+1);
}
- } else {
- fail("Expecting Date header in "+msg);
+ return msg.substring(0, start)+msg.substring(end+1);
}
+ fail("Expecting Date header in "+msg);
return null;
}
}
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
index 3f529a1..fd56b53 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
@@ -111,9 +111,6 @@ public class TelnetClientFunctionalTest extends TestCase
{
return (true);
}
- else
- {
- return (false);
- }
+ return (false);
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
index ddfa518..d6a0eff 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
@@ -928,18 +928,15 @@ extends TestCase implements TelnetNotificationHandler
{
return(false);
}
- else
+ boolean result = true;
+ for(int ii=0; ii<a1.length; ii++)
{
- boolean result = true;
- for(int ii=0; ii<a1.length; ii++)
- {
- if (a1[ii]!= a2[ii]) {
- result = false;
- }
+ if (a1[ii]!= a2[ii]) {
+ result = false;
}
- return(result);
}
+ return(result);
}
/*
diff --git a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
index e1bf623..8fa3b0a 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetTestSimpleServer.java
@@ -130,10 +130,7 @@ public class TelnetTestSimpleServer implements Runnable
{
return(clientSocket.getInputStream());
}
- else
- {
- return(null);
- }
+ return(null);
}
public OutputStream getOutputStream() throws IOException
@@ -142,9 +139,6 @@ public class TelnetTestSimpleServer implements Runnable
{
return(clientSocket.getOutputStream());
}
- else
- {
- return(null);
- }
+ return(null);
}
}
diff --git a/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java b/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
index a6ca5d6..8d2425b 100644
--- a/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
@@ -88,16 +88,13 @@ public class TerminalTypeOptionHandlerTest extends TelnetOptionHandlerTestAbstra
{
return(false);
}
- else
+ boolean result = true;
+ for(int ii=0; ii<a1.length; ii++)
{
- boolean result = true;
- for(int ii=0; ii<a1.length; ii++)
- {
- if(a1[ii]!= a2[ii]) {
- result = false;
- }
+ if(a1[ii]!= a2[ii]) {
+ result = false;
}
- return(result);
}
+ return(result);
}
}
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
index 8861faf..aa0c17d 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
@@ -627,34 +627,31 @@ public class TFTPServer implements Runnable
}
break;
}
+ // once we get here, we know we have an answer packet
+ // from the correct host.
+ final TFTPAckPacket ack = (TFTPAckPacket) answer;
+ if (ack.getBlockNumber() != block)
+ {
+ /*
+ * The origional tftp spec would have called on us to resend the
+ * previous data here, however, that causes the SAS Syndrome.
+ * http://www.faqs.org/rfcs/rfc1123.html section 4.2.3.1 The modified
+ * spec says that we ignore a duplicate ack. If the packet was really
+ * lost, we will time out on receive, and resend the previous data at
+ * that point.
+ */
+ sendNext = false;
+ }
else
{
- // once we get here, we know we have an answer packet
- // from the correct host.
- final TFTPAckPacket ack = (TFTPAckPacket) answer;
- if (ack.getBlockNumber() != block)
+ // send the next block
+ block++;
+ if (block > 65535)
{
- /*
- * The origional tftp spec would have called on us to resend the
- * previous data here, however, that causes the SAS Syndrome.
- * http://www.faqs.org/rfcs/rfc1123.html section 4.2.3.1 The modified
- * spec says that we ignore a duplicate ack. If the packet was really
- * lost, we will time out on receive, and resend the previous data at
- * that point.
- */
- sendNext = false;
- }
- else
- {
- // send the next block
- block++;
- if (block > 65535)
- {
- // wrap the block number
- block = 0;
- }
- sendNext = true;
+ // wrap the block number
+ block = 0;
}
+ sendNext = true;
}
}
}
@@ -922,10 +919,7 @@ public class TFTPServer implements Runnable
{
return true;
}
- else
- {
- return isSubdirectoryOf(parent, childsParent);
- }
+ return isSubdirectoryOf(parent, childsParent);
}
}
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java b/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
index e6d0973..6947e33 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
@@ -129,9 +129,8 @@ public class TFTPServerMain {
System.out.println(direction + " " + packet.toString());
}
};
- } else {
- return new TFTP();
}
+ return new TFTP();
}
};