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 e70463ef9494b4c170a27e61b847dca44979be5e Author: Gary Gregory <[email protected]> AuthorDate: Sun Sep 20 22:39:59 2020 -0400 Rename most private names to remove __prefix, _prefix and postfix_ underscores. Protected names are untouched. Make some package private variables private. --- .../apache/commons/net/DatagramSocketClient.java | 6 +- .../java/org/apache/commons/net/SocketClient.java | 12 +-- .../commons/net/chargen/CharGenUDPClient.java | 24 +++--- .../commons/net/discard/DiscardUDPClient.java | 2 +- .../commons/net/examples/nntp/ExtendedNNTPOps.java | 2 +- .../net/examples/telnet/TelnetClientExample.java | 2 +- .../apache/commons/net/finger/FingerClient.java | 4 +- .../java/org/apache/commons/net/ftp/FTPClient.java | 68 +++++++-------- .../java/org/apache/commons/net/ftp/FTPFile.java | 98 +++++++++++----------- .../org/apache/commons/net/ftp/FTPSCommand.java | 4 +- .../commons/net/imap/AuthenticatingIMAPClient.java | 4 +- .../java/org/apache/commons/net/imap/IMAP.java | 46 +++++----- .../apache/commons/net/nntp/ArticleIterator.java | 2 +- .../java/org/apache/commons/net/nntp/NNTP.java | 40 ++++----- .../org/apache/commons/net/nntp/NNTPClient.java | 40 ++++----- .../org/apache/commons/net/nntp/NNTPCommand.java | 4 +- .../org/apache/commons/net/nntp/NewsgroupInfo.java | 10 +-- .../apache/commons/net/nntp/NewsgroupIterator.java | 2 +- .../commons/net/smtp/AuthenticatingSMTPClient.java | 4 +- .../org/apache/commons/net/smtp/RelayPath.java | 4 +- .../java/org/apache/commons/net/telnet/Telnet.java | 2 +- .../apache/commons/net/telnet/TelnetCommand.java | 10 +-- .../net/telnet/WindowSizeOptionHandler.java | 22 ++--- .../org/apache/commons/net/tftp/TFTPAckPacket.java | 26 +++--- .../org/apache/commons/net/tftp/TFTPClient.java | 18 ++-- .../apache/commons/net/tftp/TFTPDataPacket.java | 12 +-- .../apache/commons/net/tftp/TFTPErrorPacket.java | 10 +-- .../org/apache/commons/net/tftp/TFTPPacket.java | 18 ++-- .../apache/commons/net/tftp/TFTPRequestPacket.java | 6 +- .../apache/commons/net/tftp/TFTPServerMain.java | 4 +- 30 files changed, 253 insertions(+), 253 deletions(-) diff --git a/src/main/java/org/apache/commons/net/DatagramSocketClient.java b/src/main/java/org/apache/commons/net/DatagramSocketClient.java index a39a80b..819c74c 100644 --- a/src/main/java/org/apache/commons/net/DatagramSocketClient.java +++ b/src/main/java/org/apache/commons/net/DatagramSocketClient.java @@ -53,7 +53,7 @@ public abstract class DatagramSocketClient * The default DatagramSocketFactory shared by all DatagramSocketClient * instances. ***/ - private static final DatagramSocketFactory __DEFAULT_SOCKET_FACTORY = + private static final DatagramSocketFactory DEFAULT_SOCKET_FACTORY = new DefaultDatagramSocketFactory(); /** @@ -84,7 +84,7 @@ public abstract class DatagramSocketClient _socket_ = null; _timeout_ = 0; _isOpen_ = false; - _socketFactory_ = __DEFAULT_SOCKET_FACTORY; + _socketFactory_ = DEFAULT_SOCKET_FACTORY; } @@ -275,7 +275,7 @@ public abstract class DatagramSocketClient public void setDatagramSocketFactory(final DatagramSocketFactory factory) { if (factory == null) { - _socketFactory_ = __DEFAULT_SOCKET_FACTORY; + _socketFactory_ = DEFAULT_SOCKET_FACTORY; } else { _socketFactory_ = factory; } diff --git a/src/main/java/org/apache/commons/net/SocketClient.java b/src/main/java/org/apache/commons/net/SocketClient.java index 90ff247..2be0134 100644 --- a/src/main/java/org/apache/commons/net/SocketClient.java +++ b/src/main/java/org/apache/commons/net/SocketClient.java @@ -61,11 +61,11 @@ public abstract class SocketClient public static final String NETASCII_EOL = "\r\n"; /** The default SocketFactory shared by all SocketClient instances. */ - private static final SocketFactory __DEFAULT_SOCKET_FACTORY = + private static final SocketFactory DEFAULT_SOCKET_FACTORY = SocketFactory.getDefault(); /** The default {@link ServerSocketFactory} */ - private static final ServerSocketFactory __DEFAULT_SERVER_SOCKET_FACTORY = + private static final ServerSocketFactory DEFAULT_SERVER_SOCKET_FACTORY = ServerSocketFactory.getDefault(); /** @@ -131,8 +131,8 @@ public abstract class SocketClient _output_ = null; _timeout_ = 0; _defaultPort_ = 0; - _socketFactory_ = __DEFAULT_SOCKET_FACTORY; - _serverSocketFactory_ = __DEFAULT_SERVER_SOCKET_FACTORY; + _socketFactory_ = DEFAULT_SOCKET_FACTORY; + _serverSocketFactory_ = DEFAULT_SERVER_SOCKET_FACTORY; } @@ -704,7 +704,7 @@ public abstract class SocketClient public void setSocketFactory(final SocketFactory factory) { if (factory == null) { - _socketFactory_ = __DEFAULT_SOCKET_FACTORY; + _socketFactory_ = DEFAULT_SOCKET_FACTORY; } else { _socketFactory_ = factory; } @@ -725,7 +725,7 @@ public abstract class SocketClient */ public void setServerSocketFactory(final ServerSocketFactory factory) { if (factory == null) { - _serverSocketFactory_ = __DEFAULT_SERVER_SOCKET_FACTORY; + _serverSocketFactory_ = DEFAULT_SERVER_SOCKET_FACTORY; } else { _serverSocketFactory_ = factory; } diff --git a/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java b/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java index a503eb7..ad9e632 100644 --- a/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java +++ b/src/main/java/org/apache/commons/net/chargen/CharGenUDPClient.java @@ -62,9 +62,9 @@ public final class CharGenUDPClient extends DatagramSocketClient /*** The default chargen port. It is set to 19 according to RFC 864. ***/ public static final int DEFAULT_PORT = 19; - private final byte[] __receiveData; - private final DatagramPacket __receivePacket; - private final DatagramPacket __sendPacket; + private final byte[] receiveData; + private final DatagramPacket receivePacket; + private final DatagramPacket sendPacket; /*** * The default CharGenUDPClient constructor. It initializes some internal @@ -74,9 +74,9 @@ public final class CharGenUDPClient extends DatagramSocketClient public CharGenUDPClient() { // CharGen return packets have a maximum length of 512 - __receiveData = new byte[512]; - __receivePacket = new DatagramPacket(__receiveData, __receiveData.length); - __sendPacket = new DatagramPacket(new byte[0], 0); + receiveData = new byte[512]; + receivePacket = new DatagramPacket(receiveData, receiveData.length); + sendPacket = new DatagramPacket(new byte[0], 0); } @@ -91,9 +91,9 @@ public final class CharGenUDPClient extends DatagramSocketClient ***/ public void send(final InetAddress host, final int port) throws IOException { - __sendPacket.setAddress(host); - __sendPacket.setPort(port); - _socket_.send(__sendPacket); + sendPacket.setAddress(host); + sendPacket.setPort(port); + _socket_.send(sendPacket); } /*** Same as <code>send(host, CharGenUDPClient.DEFAULT_PORT);</code> @@ -118,10 +118,10 @@ public final class CharGenUDPClient extends DatagramSocketClient int length; byte[] result; - _socket_.receive(__receivePacket); + _socket_.receive(receivePacket); - result = new byte[length = __receivePacket.getLength()]; - System.arraycopy(__receiveData, 0, result, 0, length); + result = new byte[length = receivePacket.getLength()]; + System.arraycopy(receiveData, 0, result, 0, length); return result; } diff --git a/src/main/java/org/apache/commons/net/discard/DiscardUDPClient.java b/src/main/java/org/apache/commons/net/discard/DiscardUDPClient.java index 2fff6da..69f15b8 100644 --- a/src/main/java/org/apache/commons/net/discard/DiscardUDPClient.java +++ b/src/main/java/org/apache/commons/net/discard/DiscardUDPClient.java @@ -41,7 +41,7 @@ public class DiscardUDPClient extends DatagramSocketClient /*** The default discard port. It is set to 9 according to RFC 863. ***/ public static final int DEFAULT_PORT = 9; - DatagramPacket sendPacket; + private DatagramPacket sendPacket; public DiscardUDPClient() { diff --git a/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java b/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java index d0aa919..c97a4cf 100644 --- a/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java +++ b/src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java @@ -32,7 +32,7 @@ import org.apache.commons.net.nntp.NewsgroupInfo; public class ExtendedNNTPOps { - NNTPClient client; + private NNTPClient client; public ExtendedNNTPOps() { client = new NNTPClient(); diff --git a/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java b/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java index 365e9a5..9f368bd 100644 --- a/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java +++ b/src/main/java/org/apache/commons/net/examples/telnet/TelnetClientExample.java @@ -47,7 +47,7 @@ import org.apache.commons.net.telnet.InvalidTelnetOptionException; ***/ public class TelnetClientExample implements Runnable, TelnetNotificationHandler { - static TelnetClient tc = null; + private static TelnetClient tc = null; /*** * Main for the TelnetClientExample. diff --git a/src/main/java/org/apache/commons/net/finger/FingerClient.java b/src/main/java/org/apache/commons/net/finger/FingerClient.java index 0d1aca1..b63dcc1 100644 --- a/src/main/java/org/apache/commons/net/finger/FingerClient.java +++ b/src/main/java/org/apache/commons/net/finger/FingerClient.java @@ -57,7 +57,7 @@ public class FingerClient extends SocketClient ***/ public static final int DEFAULT_PORT = 79; - private static final String __LONG_FLAG = "/W "; + private static final String LONG_FLAG = "/W "; private transient char[] buffer = new char[1024]; @@ -154,7 +154,7 @@ public class FingerClient extends SocketClient DataOutputStream output; final StringBuilder buffer = new StringBuilder(64); if (longOutput) { - buffer.append(__LONG_FLAG); + buffer.append(LONG_FLAG); } buffer.append(username); buffer.append(SocketClient.NETASCII_EOL); 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 3fe9e17..cb1def0 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java @@ -359,7 +359,7 @@ implements Configurable private int dataConnectionMode; private int dataTimeout; private int passivePort; - private String __passiveHost; + private String passiveHost; private final Random random; private int activeMinPort; private int activeMaxPort; @@ -368,7 +368,7 @@ implements Configurable /** The address to bind to on passive connections, if necessary. */ private InetAddress passiveLocalHost; - private int __fileType; + private int fileType; @SuppressWarnings("unused") // fields are written, but currently not read private int fileFormat; @SuppressWarnings("unused") // field is written, but currently not read @@ -377,7 +377,7 @@ implements Configurable private int fileTransferMode; private boolean remoteVerificationEnabled; private long restartOffset; - private FTPFileEntryParserFactory __parserFactory; + private FTPFileEntryParserFactory parserFactory; private int bufferSize; // buffersize for buffered data streams private int sendDataSocketBufferSize; private int receiveDataSocketBufferSize; @@ -417,10 +417,10 @@ implements Configurable private HostnameResolver passiveNatWorkaroundStrategy = new NatServerResolverImpl(this); /** Pattern for PASV mode responses. Groups: (n,n,n,n),(n),(n) */ - private static final java.util.regex.Pattern __PARMS_PAT; + private static final java.util.regex.Pattern PARMS_PAT; static { - __PARMS_PAT = java.util.regex.Pattern.compile( + PARMS_PAT = java.util.regex.Pattern.compile( "(\\d{1,3},\\d{1,3},\\d{1,3},\\d{1,3}),(\\d{1,3}),(\\d{1,3})"); } @@ -482,7 +482,7 @@ implements Configurable initDefaults(); dataTimeout = -1; remoteVerificationEnabled = true; - __parserFactory = new DefaultFTPFileEntryParserFactory(); + parserFactory = new DefaultFTPFileEntryParserFactory(); configuration = null; listHiddenFiles = false; useEPSVwithIPv4 = false; @@ -494,13 +494,13 @@ implements Configurable private void initDefaults() { dataConnectionMode = ACTIVE_LOCAL_DATA_CONNECTION_MODE; - __passiveHost = null; + passiveHost = null; passivePort = -1; activeExternalHost = null; reportActiveExternalHost = null; activeMinPort = 0; activeMaxPort = 0; - __fileType = FTP.ASCII_FILE_TYPE; + fileType = FTP.ASCII_FILE_TYPE; fileStructure = FTP.FILE_STRUCTURE; fileFormat = FTP.NON_PRINT_TEXT_FORMAT; fileTransferMode = FTP.STREAM_TRANSFER_MODE; @@ -568,13 +568,13 @@ implements Configurable protected void _parsePassiveModeReply(final String reply) throws MalformedServerReplyException { - final java.util.regex.Matcher m = __PARMS_PAT.matcher(reply); + final java.util.regex.Matcher m = PARMS_PAT.matcher(reply); if (!m.find()) { throw new MalformedServerReplyException( "Could not parse passive host information.\nServer Reply: " + reply); } - __passiveHost = "0,0,0,0".equals(m.group(1)) ? _socket_.getInetAddress().getHostAddress() : + this.passiveHost = "0,0,0,0".equals(m.group(1)) ? _socket_.getInetAddress().getHostAddress() : m.group(1).replace(',', '.'); // Fix up to look like IP address try @@ -591,11 +591,11 @@ implements Configurable if (passiveNatWorkaroundStrategy != null) { try { - final String passiveHost = passiveNatWorkaroundStrategy.resolve(__passiveHost); - if (!__passiveHost.equals(passiveHost)) { + final String newPassiveHost = passiveNatWorkaroundStrategy.resolve(this.passiveHost); + if (!this.passiveHost.equals(newPassiveHost)) { fireReplyReceived(0, - "[Replacing PASV mode reply address "+__passiveHost+" with "+passiveHost+"]\n"); - __passiveHost = passiveHost; + "[Replacing PASV mode reply address "+this.passiveHost+" with "+newPassiveHost+"]\n"); + this.passiveHost = newPassiveHost; } } catch (final UnknownHostException e) { // Should not happen as we are passing in an IP address throw new MalformedServerReplyException( @@ -635,8 +635,8 @@ implements Configurable // in EPSV mode, the passive host address is implicit - __passiveHost = getRemoteAddress().getHostAddress(); - passivePort = port; + this.passiveHost = getRemoteAddress().getHostAddress(); + this.passivePort = port; } private boolean storeFile(final FTPCmd command, final String remote, final InputStream local) @@ -665,7 +665,7 @@ implements Configurable final OutputStream output; - if (__fileType == ASCII_FILE_TYPE) { + if (fileType == ASCII_FILE_TYPE) { output = new ToNetASCIIOutputStream(getBufferedOutputStream(socket.getOutputStream())); } else { output = getBufferedOutputStream(socket.getOutputStream()); @@ -723,7 +723,7 @@ implements Configurable } final OutputStream output; - if (__fileType == ASCII_FILE_TYPE) { + if (fileType == ASCII_FILE_TYPE) { // We buffer ascii transfers because the buffering has to // be interposed between ToNetASCIIOutputSream and the underlying // socket output stream. We don't buffer binary transfers @@ -918,7 +918,7 @@ implements Configurable socket.setSoTimeout(dataTimeout); } - socket.connect(new InetSocketAddress(__passiveHost, passivePort), connectTimeout); + socket.connect(new InetSocketAddress(passiveHost, passivePort), connectTimeout); if ((restartOffset > 0) && !restart(restartOffset)) { socket.close(); @@ -1013,7 +1013,7 @@ implements Configurable * @see org.apache.commons.net.ftp.parser.DefaultFTPFileEntryParserFactory */ public void setParserFactory(final FTPFileEntryParserFactory parserFactory) { - __parserFactory = parserFactory; + this.parserFactory = parserFactory; } @@ -1252,7 +1252,7 @@ implements Configurable public void enterLocalActiveMode() { dataConnectionMode = ACTIVE_LOCAL_DATA_CONNECTION_MODE; - __passiveHost = null; + passiveHost = null; passivePort = -1; } @@ -1277,7 +1277,7 @@ implements Configurable dataConnectionMode = PASSIVE_LOCAL_DATA_CONNECTION_MODE; // These will be set when just before a data connection is opened // in _openDataConnection_() - __passiveHost = null; + passiveHost = null; passivePort = -1; } @@ -1312,7 +1312,7 @@ implements Configurable if (FTPReply.isPositiveCompletion(port(host, port))) { dataConnectionMode = ACTIVE_REMOTE_DATA_CONNECTION_MODE; - __passiveHost = null; + passiveHost = null; passivePort = -1; return true; } @@ -1367,7 +1367,7 @@ implements Configurable */ public String getPassiveHost() { - return __passiveHost; + return passiveHost; } /** @@ -1555,8 +1555,8 @@ implements Configurable { if (FTPReply.isPositiveCompletion(type(fileType))) { - __fileType = fileType; - fileFormat = FTP.NON_PRINT_TEXT_FORMAT; + this.fileType = fileType; + this.fileFormat = FTP.NON_PRINT_TEXT_FORMAT; return true; } return false; @@ -1604,8 +1604,8 @@ implements Configurable { if (FTPReply.isPositiveCompletion(type(fileType, formatOrByteSize))) { - __fileType = fileType; - fileFormat = formatOrByteSize; + this.fileType = fileType; + this.fileFormat = formatOrByteSize; return true; } return false; @@ -1900,7 +1900,7 @@ implements Configurable } final InputStream input; - if (__fileType == ASCII_FILE_TYPE) { + if (fileType == ASCII_FILE_TYPE) { input = new FromNetASCIIInputStream(getBufferedInputStream(socket.getInputStream())); } else { input = getBufferedInputStream(socket.getInputStream()); @@ -1980,7 +1980,7 @@ implements Configurable } final InputStream input; - if (__fileType == ASCII_FILE_TYPE) { + if (fileType == ASCII_FILE_TYPE) { // We buffer ascii transfers because the buffering has to // be interposed between FromNetASCIIOutputSream and the underlying // socket input stream. We don't buffer binary transfers @@ -3381,7 +3381,7 @@ implements Configurable // if a parser key was supplied in the parameters, // use that to create the parser entryParser = - __parserFactory.createFileEntryParser(parserKey); + parserFactory.createFileEntryParser(parserKey); entryParserKey = parserKey; } else { @@ -3389,7 +3389,7 @@ implements Configurable // in the params, and if it has a non-empty system type, use that. if (null != configuration && configuration.getServerSystemKey().length() > 0) { entryParser = - __parserFactory.createFileEntryParser(configuration); + parserFactory.createFileEntryParser(configuration); entryParserKey = configuration.getServerSystemKey(); } else { // if a parserKey hasn't been supplied, and a configuration @@ -3408,9 +3408,9 @@ implements Configurable } } if (null != configuration) { // system type must have been empty above - entryParser = __parserFactory.createFileEntryParser(new FTPClientConfig(systemType, configuration)); + entryParser = parserFactory.createFileEntryParser(new FTPClientConfig(systemType, configuration)); } else { - entryParser = __parserFactory.createFileEntryParser(systemType); + entryParser = parserFactory.createFileEntryParser(systemType); } entryParserKey = systemType; } diff --git a/src/main/java/org/apache/commons/net/ftp/FTPFile.java b/src/main/java/org/apache/commons/net/ftp/FTPFile.java index 90b8f2f..e7a2200 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPFile.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPFile.java @@ -60,26 +60,26 @@ public class FTPFile implements Serializable ***/ public static final int EXECUTE_PERMISSION = 2; - private int _type, _hardLinkCount; - private long _size; - private String _rawListing, _user, _group, _name, _link; - private Calendar _date; + private int type, hardLinkCount; + private long size; + private String rawListing, user, group, name, link; + private Calendar date; // If this is null, then list entry parsing failed - private final boolean[] _permissions[]; // e.g. _permissions[USER_ACCESS][READ_PERMISSION] + private final boolean[] permissions[]; // e.g. _permissions[USER_ACCESS][READ_PERMISSION] /*** Creates an empty FTPFile. ***/ public FTPFile() { - _permissions = new boolean[3][3]; - _type = UNKNOWN_TYPE; + permissions = new boolean[3][3]; + type = UNKNOWN_TYPE; // init these to values that do not occur in listings // so can distinguish which fields are unset - _hardLinkCount = 0; // 0 is invalid as a link count - _size = -1; // 0 is valid, so use -1 - _user = ""; - _group = ""; - _date = null; - _name = null; + hardLinkCount = 0; // 0 is invalid as a link count + size = -1; // 0 is valid, so use -1 + user = ""; + group = ""; + date = null; + name = null; } /** @@ -90,17 +90,17 @@ public class FTPFile implements Serializable */ FTPFile(final String rawListing) { - _permissions = null; // flag that entry is invalid - _rawListing = rawListing; - _type = UNKNOWN_TYPE; + this.permissions = null; // flag that entry is invalid + this.rawListing = rawListing; + this.type = UNKNOWN_TYPE; // init these to values that do not occur in listings // so can distinguish which fields are unset - _hardLinkCount = 0; // 0 is invalid as a link count - _size = -1; // 0 is valid, so use -1 - _user = ""; - _group = ""; - _date = null; - _name = null; + this.hardLinkCount = 0; // 0 is invalid as a link count + this.size = -1; // 0 is valid, so use -1 + this.user = ""; + this.group = ""; + this.date = null; + this.name = null; } @@ -112,7 +112,7 @@ public class FTPFile implements Serializable ***/ public void setRawListing(final String rawListing) { - _rawListing = rawListing; + this.rawListing = rawListing; } /*** @@ -123,7 +123,7 @@ public class FTPFile implements Serializable ***/ public String getRawListing() { - return _rawListing; + return rawListing; } @@ -135,7 +135,7 @@ public class FTPFile implements Serializable ***/ public boolean isDirectory() { - return _type == DIRECTORY_TYPE; + return type == DIRECTORY_TYPE; } /*** @@ -146,7 +146,7 @@ public class FTPFile implements Serializable ***/ public boolean isFile() { - return _type == FILE_TYPE; + return type == FILE_TYPE; } /*** @@ -157,7 +157,7 @@ public class FTPFile implements Serializable ***/ public boolean isSymbolicLink() { - return _type == SYMBOLIC_LINK_TYPE; + return type == SYMBOLIC_LINK_TYPE; } /*** @@ -168,7 +168,7 @@ public class FTPFile implements Serializable ***/ public boolean isUnknown() { - return _type == UNKNOWN_TYPE; + return type == UNKNOWN_TYPE; } /** @@ -182,7 +182,7 @@ public class FTPFile implements Serializable * @since 3.4 */ public boolean isValid() { - return _permissions != null; + return permissions != null; } /*** @@ -193,7 +193,7 @@ public class FTPFile implements Serializable ***/ public void setType(final int type) { - _type = type; + this.type = type; } @@ -205,7 +205,7 @@ public class FTPFile implements Serializable ***/ public int getType() { - return _type; + return type; } @@ -216,7 +216,7 @@ public class FTPFile implements Serializable ***/ public void setName(final String name) { - _name = name; + this.name = name; } /*** @@ -226,7 +226,7 @@ public class FTPFile implements Serializable ***/ public String getName() { - return _name; + return name; } @@ -236,7 +236,7 @@ public class FTPFile implements Serializable */ public void setSize(final long size) { - _size = size; + this.size = size; } @@ -247,7 +247,7 @@ public class FTPFile implements Serializable ***/ public long getSize() { - return _size; + return size; } @@ -259,7 +259,7 @@ public class FTPFile implements Serializable ***/ public void setHardLinkCount(final int links) { - _hardLinkCount = links; + this.hardLinkCount = links; } @@ -271,7 +271,7 @@ public class FTPFile implements Serializable ***/ public int getHardLinkCount() { - return _hardLinkCount; + return hardLinkCount; } @@ -283,7 +283,7 @@ public class FTPFile implements Serializable ***/ public void setGroup(final String group) { - _group = group; + this.group = group; } @@ -295,7 +295,7 @@ public class FTPFile implements Serializable ***/ public String getGroup() { - return _group; + return group; } @@ -307,7 +307,7 @@ public class FTPFile implements Serializable ***/ public void setUser(final String user) { - _user = user; + this.user = user; } /*** @@ -318,7 +318,7 @@ public class FTPFile implements Serializable ***/ public String getUser() { - return _user; + return user; } @@ -330,7 +330,7 @@ public class FTPFile implements Serializable ***/ public void setLink(final String link) { - _link = link; + this.link = link; } @@ -343,7 +343,7 @@ public class FTPFile implements Serializable ***/ public String getLink() { - return _link; + return link; } @@ -356,7 +356,7 @@ public class FTPFile implements Serializable ***/ public void setTimestamp(final Calendar date) { - _date = date; + this.date = date; } @@ -367,7 +367,7 @@ public class FTPFile implements Serializable ***/ public Calendar getTimestamp() { - return _date; + return date; } @@ -385,7 +385,7 @@ public class FTPFile implements Serializable ***/ public void setPermission(final int access, final int permission, final boolean value) { - _permissions[access][permission] = value; + permissions[access][permission] = value; } @@ -404,10 +404,10 @@ public class FTPFile implements Serializable ***/ public boolean hasPermission(final int access, final int permission) { - if (_permissions == null) { + if (permissions == null) { return false; } - return _permissions[access][permission]; + return permissions[access][permission]; } /*** @@ -502,7 +502,7 @@ public class FTPFile implements Serializable } private char formatType(){ - switch(_type) { + switch(type) { case FILE_TYPE: return '-'; case DIRECTORY_TYPE: diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSCommand.java b/src/main/java/org/apache/commons/net/ftp/FTPSCommand.java index cd0776e..b4b1f87 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTPSCommand.java +++ b/src/main/java/org/apache/commons/net/ftp/FTPSCommand.java @@ -36,7 +36,7 @@ public final class FTPSCommand { public static final int DATA_CHANNEL_PROTECTION_LEVEL = PROT; public static final int CLEAR_COMMAND_CHANNEL = CCC; - private static final String[] _commands = {"AUTH","ADAT","PBSZ","PROT","CCC"}; + private static final String[] commands = {"AUTH","ADAT","PBSZ","PROT","CCC"}; /** * Retrieve the FTPS command string corresponding to a specified @@ -47,6 +47,6 @@ public final class FTPSCommand { * command code. */ public static String getCommand(final int command) { - return _commands[command]; + return commands[command]; } } diff --git a/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java b/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java index c31c7b9..916432d 100644 --- a/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java +++ b/src/main/java/org/apache/commons/net/imap/AuthenticatingIMAPClient.java @@ -173,7 +173,7 @@ public class AuthenticatingIMAPClient extends IMAPSClient final Mac hmac_md5 = Mac.getInstance("HmacMD5"); hmac_md5.init(new SecretKeySpec(password.getBytes(getCharset()), "HmacMD5")); // compute the result: - final byte[] hmacResult = _convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharset()); + final byte[] hmacResult = convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharset()); // join the byte arrays to form the reply final byte[] usernameBytes = username.getBytes(getCharset()); final byte[] toEncode = new byte[usernameBytes.length + 1 /* the space */ + hmacResult.length]; @@ -224,7 +224,7 @@ public class AuthenticatingIMAPClient extends IMAPSClient * @param a The byte array to convert. * @return The resulting String of hex codes. */ - private String _convertToHexString(final byte[] a) + private String convertToHexString(final byte[] a) { final StringBuilder result = new StringBuilder(a.length*2); for (final byte element : a) diff --git a/src/main/java/org/apache/commons/net/imap/IMAP.java b/src/main/java/org/apache/commons/net/imap/IMAP.java index 89c9dfc..9a39a45 100644 --- a/src/main/java/org/apache/commons/net/imap/IMAP.java +++ b/src/main/java/org/apache/commons/net/imap/IMAP.java @@ -57,11 +57,11 @@ public class IMAP extends SocketClient */ protected static final String __DEFAULT_ENCODING = "ISO-8859-1"; - private IMAPState __state; + private IMAPState state; protected BufferedWriter __writer; protected BufferedReader _reader; - private int _replyCode; + private int replyCode; private final List<String> _replyLines; /** @@ -107,9 +107,9 @@ public class IMAP extends SocketClient } }; - private volatile IMAPChunkListener __chunkListener; + private volatile IMAPChunkListener chunkListener; - private final char[] _initialID = { 'A', 'A', 'A', 'A' }; + private final char[] initialID = { 'A', 'A', 'A', 'A' }; /** * The default IMAPClient constructor. Initializes the state @@ -118,7 +118,7 @@ public class IMAP extends SocketClient public IMAP() { setDefaultPort(DEFAULT_PORT); - __state = IMAPState.DISCONNECTED_STATE; + state = IMAPState.DISCONNECTED_STATE; _reader = null; __writer = null; _replyLines = new ArrayList<>(); @@ -130,9 +130,9 @@ public class IMAP extends SocketClient * * @throws IOException */ - private void __getReply() throws IOException + private void getReply() throws IOException { - __getReply(true); // tagged response + getReply(true); // tagged response } /** @@ -142,7 +142,7 @@ public class IMAP extends SocketClient * @param wantTag {@code true} if the command expects a tagged response. * @throws IOException */ - private void __getReply(final boolean wantTag) throws IOException + private void getReply(final boolean wantTag) throws IOException { _replyLines.clear(); String line = _reader.readLine(); @@ -166,7 +166,7 @@ public class IMAP extends SocketClient literalCount -= line.length() + 2; // Allow for CRLF } if (isMultiLine) { - final IMAPChunkListener il = __chunkListener; + final IMAPChunkListener il = chunkListener; if (il != null) { final boolean clear = il.chunkReceived(this); if (clear) { @@ -182,12 +182,12 @@ public class IMAP extends SocketClient _replyLines.add(line); } // check the response code on the last line - _replyCode = IMAPReply.getReplyCode(line); + replyCode = IMAPReply.getReplyCode(line); } else { - _replyCode = IMAPReply.getUntaggedReplyCode(line); + replyCode = IMAPReply.getUntaggedReplyCode(line); } - fireReplyReceived(_replyCode, getReplyString()); + fireReplyReceived(replyCode, getReplyString()); } /** @@ -224,7 +224,7 @@ public class IMAP extends SocketClient if (tmo <= 0) { // none set currently setSoTimeout(connectTimeout); // use connect timeout to ensure we don't block forever } - __getReply(false); // untagged response + getReply(false); // untagged response if (tmo <= 0) { setSoTimeout(tmo); // restore the original value } @@ -239,7 +239,7 @@ public class IMAP extends SocketClient */ protected void setState(final IMAP.IMAPState state) { - __state = state; + this.state = state; } @@ -250,7 +250,7 @@ public class IMAP extends SocketClient */ public IMAP.IMAPState getState() { - return __state; + return state; } /** @@ -303,8 +303,8 @@ public class IMAP extends SocketClient fireCommandSent(command, message); - __getReply(); - return _replyCode; + getReply(); + return replyCode; } /** @@ -441,7 +441,7 @@ public class IMAP extends SocketClient * @since 3.4 */ public void setChunkListener(final IMAPChunkListener listener) { - __chunkListener = listener; + chunkListener = listener; } /** @@ -450,18 +450,18 @@ public class IMAP extends SocketClient */ protected String generateCommandID() { - final String res = new String (_initialID); + final String res = new String (initialID); // "increase" the ID for the next call boolean carry = true; // want to increment initially - for (int i = _initialID.length-1; carry && i>=0; i--) + for (int i = initialID.length-1; carry && i>=0; i--) { - if (_initialID[i] == 'Z') + if (initialID[i] == 'Z') { - _initialID[i] = 'A'; + initialID[i] = 'A'; } else { - _initialID[i]++; + initialID[i]++; carry = false; // did not wrap round } } diff --git a/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java b/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java index 272a870..a7e2b0a 100644 --- a/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java +++ b/src/main/java/org/apache/commons/net/nntp/ArticleIterator.java @@ -45,7 +45,7 @@ class ArticleIterator implements Iterator<Article>, Iterable<Article> { @Override public Article next() { final String line = stringIterator.next(); - return NNTPClient.__parseArticleEntry(line); + return NNTPClient.parseArticleEntry(line); } @Override diff --git a/src/main/java/org/apache/commons/net/nntp/NNTP.java b/src/main/java/org/apache/commons/net/nntp/NNTP.java index 4b5c265..72f6e09 100644 --- a/src/main/java/org/apache/commons/net/nntp/NNTP.java +++ b/src/main/java/org/apache/commons/net/nntp/NNTP.java @@ -87,11 +87,11 @@ public class NNTP extends SocketClient // We have to ensure that the protocol communication is in ASCII // but we use ISO-8859-1 just in case 8-bit characters cross // the wire. - private static final Charset __DEFAULT_ENCODING = StandardCharsets.ISO_8859_1; + private static final Charset DEFAULT_ENCODING = StandardCharsets.ISO_8859_1; boolean _isAllowedToPost; - int _replyCode; - String _replyString; + private int replyCode; + private String replyString; /** * Wraps {@link SocketClient#_input_} @@ -121,7 +121,7 @@ public class NNTP extends SocketClient public NNTP() { setDefaultPort(DEFAULT_PORT); - _replyString = null; + replyString = null; _reader_ = null; _writer_ = null; _isAllowedToPost = false; @@ -130,33 +130,33 @@ public class NNTP extends SocketClient private void __getReply() throws IOException { - _replyString = _reader_.readLine(); + replyString = _reader_.readLine(); - if (_replyString == null) { + if (replyString == null) { throw new NNTPConnectionClosedException( "Connection closed without indication."); } // In case we run into an anomaly we don't want fatal index exceptions // to be thrown. - if (_replyString.length() < 3) { + if (replyString.length() < 3) { throw new MalformedServerReplyException( - "Truncated server reply: " + _replyString); + "Truncated server reply: " + replyString); } try { - _replyCode = Integer.parseInt(_replyString.substring(0, 3)); + replyCode = Integer.parseInt(replyString.substring(0, 3)); } catch (final NumberFormatException e) { throw new MalformedServerReplyException( - "Could not parse response code.\nServer Reply: " + _replyString); + "Could not parse response code.\nServer Reply: " + replyString); } - fireReplyReceived(_replyCode, _replyString + SocketClient.NETASCII_EOL); + fireReplyReceived(replyCode, replyString + SocketClient.NETASCII_EOL); - if (_replyCode == NNTPReply.SERVICE_DISCONTINUED) { + if (replyCode == NNTPReply.SERVICE_DISCONTINUED) { throw new NNTPConnectionClosedException( "NNTP response 400 received. Server closed connection."); } @@ -174,13 +174,13 @@ public class NNTP extends SocketClient super._connectAction_(); _reader_ = new CRLFLineReader(new InputStreamReader(_input_, - __DEFAULT_ENCODING)); + DEFAULT_ENCODING)); _writer_ = new BufferedWriter(new OutputStreamWriter(_output_, - __DEFAULT_ENCODING)); + DEFAULT_ENCODING)); __getReply(); - _isAllowedToPost = _replyCode == NNTPReply.SERVER_READY_POSTING_ALLOWED; + _isAllowedToPost = replyCode == NNTPReply.SERVER_READY_POSTING_ALLOWED; } /*** @@ -197,7 +197,7 @@ public class NNTP extends SocketClient super.disconnect(); _reader_ = null; _writer_ = null; - _replyString = null; + replyString = null; _isAllowedToPost = false; } @@ -253,7 +253,7 @@ public class NNTP extends SocketClient fireCommandSent(command, message); __getReply(); - return _replyCode; + return replyCode; } @@ -343,7 +343,7 @@ public class NNTP extends SocketClient ***/ public int getReplyCode() { - return _replyCode; + return replyCode; } /*** @@ -366,7 +366,7 @@ public class NNTP extends SocketClient public int getReply() throws IOException { __getReply(); - return _replyCode; + return replyCode; } @@ -378,7 +378,7 @@ public class NNTP extends SocketClient ***/ public String getReplyString() { - return _replyString; + return replyString; } diff --git a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java index 9b7ee2c..886866f 100644 --- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java +++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java @@ -125,7 +125,7 @@ public class NNTPClient extends NNTP * s = name of the group.) */ - private static void __parseGroupReply(final String reply, final NewsgroupInfo info) + private static void parseGroupReply(final String reply, final NewsgroupInfo info) throws MalformedServerReplyException { final String tokens[] = reply.split(" "); @@ -134,15 +134,15 @@ public class NNTPClient extends NNTP try { // Get estimated article count - info._setArticleCount(Long.parseLong(tokens[i++])); + info.setArticleCount(Long.parseLong(tokens[i++])); // Get first article number - info._setFirstArticle(Long.parseLong(tokens[i++])); + info.setFirstArticle(Long.parseLong(tokens[i++])); // Get last article number - info._setLastArticle(Long.parseLong(tokens[i++])); + info.setLastArticle(Long.parseLong(tokens[i++])); // Get newsgroup name - info._setNewsgroup(tokens[i++]); + info.setNewsgroup(tokens[i++]); - info._setPostingPermission(NewsgroupInfo.UNKNOWN_POSTING_PERMISSION); + info.setPostingPermission(NewsgroupInfo.UNKNOWN_POSTING_PERMISSION); return ; } catch (final NumberFormatException e) { @@ -156,7 +156,7 @@ public class NNTPClient extends NNTP // Format: group last first p - static NewsgroupInfo __parseNewsgroupListEntry(final String entry) + static NewsgroupInfo parseNewsgroupListEntry(final String entry) { final String tokens[] = entry.split(" "); if (tokens.length < 4) { @@ -166,18 +166,18 @@ public class NNTPClient extends NNTP int i = 0; - result._setNewsgroup(tokens[i++]); + result.setNewsgroup(tokens[i++]); try { final long lastNum = Long.parseLong(tokens[i++]); final long firstNum = Long.parseLong(tokens[i++]); - result._setFirstArticle(firstNum); - result._setLastArticle(lastNum); + result.setFirstArticle(firstNum); + result.setLastArticle(lastNum); if ((firstNum == 0) && (lastNum == 0)) { - result._setArticleCount(0); + result.setArticleCount(0); } else { - result._setArticleCount(lastNum - firstNum + 1); + result.setArticleCount(lastNum - firstNum + 1); } } catch (final NumberFormatException e) { return null; @@ -187,21 +187,21 @@ public class NNTPClient extends NNTP { case 'y': case 'Y': - result._setPostingPermission( + result.setPostingPermission( NewsgroupInfo.PERMITTED_POSTING_PERMISSION); break; case 'n': case 'N': - result._setPostingPermission( + result.setPostingPermission( NewsgroupInfo.PROHIBITED_POSTING_PERMISSION); break; case 'm': case 'M': - result._setPostingPermission( + result.setPostingPermission( NewsgroupInfo.MODERATED_POSTING_PERMISSION); break; default: - result._setPostingPermission( + result.setPostingPermission( NewsgroupInfo.UNKNOWN_POSTING_PERMISSION); break; } @@ -217,7 +217,7 @@ public class NNTPClient extends NNTP * will be true, and the subject will contain the raw info. * @since 3.0 */ - static Article __parseArticleEntry(final String line) { + static Article parseArticleEntry(final String line) { // Extract the article information // Mandatory format (from NNTP RFC 2980) is : // articleNumber\tSubject\tAuthor\tDate\tID\tReference(s)\tByte Count\tLine Count @@ -251,7 +251,7 @@ public class NNTPClient extends NNTP String line; try (final BufferedReader reader = new DotTerminatedMessageReader(_reader_)) { while ((line = reader.readLine()) != null) { - final NewsgroupInfo tmp = __parseNewsgroupListEntry(line); + final NewsgroupInfo tmp = parseNewsgroupListEntry(line); if (tmp != null) { list.addElement(tmp); } else { @@ -731,7 +731,7 @@ public class NNTPClient extends NNTP } if (info != null) { - __parseGroupReply(getReplyString(), info); + parseGroupReply(getReplyString(), info); } return true; @@ -1442,7 +1442,7 @@ public class NNTPClient extends NNTP if (replyCode == NNTPReply.AUTHENTICATION_ACCEPTED) { - _isAllowedToPost = true; + this._isAllowedToPost = true; return true; } } diff --git a/src/main/java/org/apache/commons/net/nntp/NNTPCommand.java b/src/main/java/org/apache/commons/net/nntp/NNTPCommand.java index 8a9e219..03726a8 100644 --- a/src/main/java/org/apache/commons/net/nntp/NNTPCommand.java +++ b/src/main/java/org/apache/commons/net/nntp/NNTPCommand.java @@ -48,7 +48,7 @@ public final class NNTPCommand private NNTPCommand() {} - private static final String[] _commands = { + private static final String[] commands = { "ARTICLE", "BODY", "GROUP", "HEAD", "HELP", "IHAVE", "LAST", "LIST", "NEWGROUPS", "NEWNEWS", "NEXT", "POST", "QUIT", "SLAVE", "STAT", "AUTHINFO", "XOVER", "XHDR" @@ -65,7 +65,7 @@ public final class NNTPCommand ***/ public static String getCommand(final int command) { - return _commands[command]; + return commands[command]; } } diff --git a/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java b/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java index 23b2b88..ffcbf91 100644 --- a/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java +++ b/src/main/java/org/apache/commons/net/nntp/NewsgroupInfo.java @@ -57,27 +57,27 @@ public final class NewsgroupInfo private long lastArticle; private int postingPermission; - void _setNewsgroup(final String newsgroup) + void setNewsgroup(final String newsgroup) { this.newsgroup = newsgroup; } - void _setArticleCount(final long count) + void setArticleCount(final long count) { estimatedArticleCount = count; } - void _setFirstArticle(final long first) + void setFirstArticle(final long first) { firstArticle = first; } - void _setLastArticle(final long last) + void setLastArticle(final long last) { lastArticle = last; } - void _setPostingPermission(final int permission) + void setPostingPermission(final int permission) { postingPermission = permission; } diff --git a/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java b/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java index ee4e25a..6275f53 100644 --- a/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java +++ b/src/main/java/org/apache/commons/net/nntp/NewsgroupIterator.java @@ -40,7 +40,7 @@ class NewsgroupIterator implements Iterator<NewsgroupInfo>, Iterable<NewsgroupIn @Override public NewsgroupInfo next() { final String line = stringIterator.next(); - return NNTPClient.__parseNewsgroupListEntry(line); + return NNTPClient.parseNewsgroupListEntry(line); } @Override diff --git a/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java b/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java index 62f895a..59f7d00 100644 --- a/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java +++ b/src/main/java/org/apache/commons/net/smtp/AuthenticatingSMTPClient.java @@ -235,7 +235,7 @@ public class AuthenticatingSMTPClient extends SMTPSClient final Mac hmac_md5 = Mac.getInstance("HmacMD5"); hmac_md5.init(new SecretKeySpec(password.getBytes(getCharset()), "HmacMD5")); // compute the result: - final byte[] hmacResult = _convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharset()); + final byte[] hmacResult = convertToHexString(hmac_md5.doFinal(serverChallenge)).getBytes(getCharset()); // join the byte arrays to form the reply final byte[] usernameBytes = username.getBytes(getCharset()); final byte[] toEncode = new byte[usernameBytes.length + 1 /* the space */ + hmacResult.length]; @@ -274,7 +274,7 @@ public class AuthenticatingSMTPClient extends SMTPSClient * @param a The byte array to convert. * @return The resulting String of hex codes. */ - private String _convertToHexString(final byte[] a) + private String convertToHexString(final byte[] a) { final StringBuilder result = new StringBuilder(a.length*2); for (final byte element : a) diff --git a/src/main/java/org/apache/commons/net/smtp/RelayPath.java b/src/main/java/org/apache/commons/net/smtp/RelayPath.java index e7a5524..c49c152 100644 --- a/src/main/java/org/apache/commons/net/smtp/RelayPath.java +++ b/src/main/java/org/apache/commons/net/smtp/RelayPath.java @@ -31,8 +31,8 @@ import java.util.Vector; public final class RelayPath { - Vector<String> path; - String emailAddress; + private Vector<String> path; + private String emailAddress; /*** * Create a relay path with the specified email address as the ultimate 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 a640c23..80ba39d 100644 --- a/src/main/java/org/apache/commons/net/telnet/Telnet.java +++ b/src/main/java/org/apache/commons/net/telnet/Telnet.java @@ -61,7 +61,7 @@ class Telnet extends SocketClient /* public */ static final int DEFAULT_PORT = 23; - int[] doResponse, willResponse, options; + private int[] doResponse, willResponse, options; /* TERMINAL-TYPE option (start)*/ /*** diff --git a/src/main/java/org/apache/commons/net/telnet/TelnetCommand.java b/src/main/java/org/apache/commons/net/telnet/TelnetCommand.java index f66d1fd..57c1228 100644 --- a/src/main/java/org/apache/commons/net/telnet/TelnetCommand.java +++ b/src/main/java/org/apache/commons/net/telnet/TelnetCommand.java @@ -93,13 +93,13 @@ public final class TelnetCommand public static final int SYNCH = 242; /*** String representations of commands. ***/ - private static final String __commandString[] = { + private static final String commandString[] = { "IAC", "DONT", "DO", "WONT", "WILL", "SB", "GA", "EL", "EC", "AYT", "AO", "IP", "BRK", "DMARK", "NOP", "SE", "EOR", "ABORT", "SUSP", "EOF" }; - private static final int __FIRST_COMMAND = IAC; - private static final int __LAST_COMMAND = EOF; + private static final int FIRST_COMMAND = IAC; + private static final int LAST_COMMAND = EOF; /*** * Returns the string representation of the telnet protocol command @@ -110,7 +110,7 @@ public final class TelnetCommand ***/ public static String getCommand(final int code) { - return __commandString[__FIRST_COMMAND - code]; + return commandString[FIRST_COMMAND - code]; } /*** @@ -122,7 +122,7 @@ public final class TelnetCommand **/ public static boolean isValidCommand(final int code) { - return code <= __FIRST_COMMAND && code >= __LAST_COMMAND; + return code <= FIRST_COMMAND && code >= LAST_COMMAND; } // Cannot be instantiated diff --git a/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java b/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java index 485f178..ae5c43b 100644 --- a/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java +++ b/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java @@ -26,12 +26,12 @@ public class WindowSizeOptionHandler extends TelnetOptionHandler /*** * Horizontal Size ***/ - private int m_nWidth = 80; + private int width = 80; /*** * Vertical Size ***/ - private int m_nHeight = 24; + private int height = 24; /*** * Window size option @@ -67,8 +67,8 @@ public class WindowSizeOptionHandler extends TelnetOptionHandler acceptremote ); - m_nWidth = nWidth; - m_nHeight = nHeight; + width = nWidth; + height = nHeight; } /*** @@ -90,8 +90,8 @@ public class WindowSizeOptionHandler extends TelnetOptionHandler false ); - m_nWidth = nWidth; - m_nHeight = nHeight; + width = nWidth; + height = nHeight; } /*** @@ -103,25 +103,25 @@ public class WindowSizeOptionHandler extends TelnetOptionHandler @Override public int[] startSubnegotiationLocal() { - final int nCompoundWindowSize = m_nWidth * 0x10000 + m_nHeight; + final int nCompoundWindowSize = width * 0x10000 + height; int nResponseSize = 5; int nIndex; int nShift; int nTurnedOnBits; - if (m_nWidth % 0x100 == 0xFF) { + if (width % 0x100 == 0xFF) { nResponseSize += 1; } - if (m_nWidth / 0x100 == 0xFF) { + if (width / 0x100 == 0xFF) { nResponseSize += 1; } - if (m_nHeight % 0x100 == 0xFF) { + if (height % 0x100 == 0xFF) { nResponseSize += 1; } - if (m_nHeight / 0x100 == 0xFF) { + if (height / 0x100 == 0xFF) { nResponseSize += 1; } diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java index f680647..7317a07 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPAckPacket.java @@ -44,7 +44,7 @@ import java.net.InetAddress; public final class TFTPAckPacket extends TFTPPacket { /*** The block number being acknowledged by the packet. ***/ - int _blockNumber; + int blockNumber; /*** * Creates an acknowledgment packet to be sent to a host at a given port @@ -57,7 +57,7 @@ public final class TFTPAckPacket extends TFTPPacket public TFTPAckPacket(final InetAddress destination, final int port, final int blockNumber) { super(TFTPPacket.ACKNOWLEDGEMENT, destination, port); - _blockNumber = blockNumber; + this.blockNumber = blockNumber; } /*** @@ -81,7 +81,7 @@ public final class TFTPAckPacket extends TFTPPacket throw new TFTPPacketException("TFTP operator code does not match type."); } - _blockNumber = (((data[2] & 0xff) << 8) | (data[3] & 0xff)); + this.blockNumber = (((data[2] & 0xff) << 8) | (data[3] & 0xff)); } /*** @@ -100,11 +100,11 @@ public final class TFTPAckPacket extends TFTPPacket { data[0] = 0; data[1] = (byte)type; - data[2] = (byte)((_blockNumber & 0xffff) >> 8); - data[3] = (byte)(_blockNumber & 0xff); + data[2] = (byte)((blockNumber & 0xffff) >> 8); + data[3] = (byte)(blockNumber & 0xff); - datagram.setAddress(_address); - datagram.setPort(_port); + datagram.setAddress(address); + datagram.setPort(port); datagram.setData(data); datagram.setLength(4); @@ -131,10 +131,10 @@ public final class TFTPAckPacket extends TFTPPacket data = new byte[4]; data[0] = 0; data[1] = (byte)type; - data[2] = (byte)((_blockNumber & 0xffff) >> 8); - data[3] = (byte)(_blockNumber & 0xff); + data[2] = (byte)((blockNumber & 0xffff) >> 8); + data[3] = (byte)(blockNumber & 0xff); - return new DatagramPacket(data, data.length, _address, _port); + return new DatagramPacket(data, data.length, address, port); } @@ -145,7 +145,7 @@ public final class TFTPAckPacket extends TFTPPacket ***/ public int getBlockNumber() { - return _blockNumber; + return blockNumber; } @@ -156,7 +156,7 @@ public final class TFTPAckPacket extends TFTPPacket ***/ public void setBlockNumber(final int blockNumber) { - _blockNumber = blockNumber; + this.blockNumber = blockNumber; } /** @@ -165,7 +165,7 @@ public final class TFTPAckPacket extends TFTPPacket */ @Override public String toString() { - return super.toString() + " ACK " + _blockNumber; + return super.toString() + " ACK " + blockNumber; } } diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java index 3d16ac0..0ee837b 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java @@ -63,7 +63,7 @@ public class TFTPClient extends TFTP public static final int DEFAULT_MAX_TIMEOUTS = 5; /*** The maximum number of timeouts allowed before failing. ***/ - private int __maxTimeouts; + private int maxTimeouts; /*** The number of bytes received in the ongoing download. ***/ private long totalBytesReceived = 0; @@ -78,7 +78,7 @@ public class TFTPClient extends TFTP ***/ public TFTPClient() { - __maxTimeouts = DEFAULT_MAX_TIMEOUTS; + maxTimeouts = DEFAULT_MAX_TIMEOUTS; } /*** @@ -94,9 +94,9 @@ public class TFTPClient extends TFTP public void setMaxTimeouts(final int numTimeouts) { if (numTimeouts < 1) { - __maxTimeouts = 1; + maxTimeouts = 1; } else { - __maxTimeouts = numTimeouts; + maxTimeouts = numTimeouts; } } @@ -108,7 +108,7 @@ public class TFTPClient extends TFTP ***/ public int getMaxTimeouts() { - return __maxTimeouts; + return maxTimeouts; } @@ -242,11 +242,11 @@ public class TFTPClient extends TFTP bufferedSend(error); } } catch (final SocketException e) { - if (++timeouts >= __maxTimeouts) { + if (++timeouts >= maxTimeouts) { throw new IOException("Connection timed out."); } } catch (final InterruptedIOException e) { - if (++timeouts >= __maxTimeouts) { + if (++timeouts >= maxTimeouts) { throw new IOException("Connection timed out."); } } catch (final TFTPPacketException e) { @@ -435,11 +435,11 @@ public class TFTPClient extends TFTP bufferedSend(error); } } catch (final SocketException e) { - if (++timeouts >= __maxTimeouts) { + if (++timeouts >= maxTimeouts) { throw new IOException("Connection timed out."); } } catch (final InterruptedIOException e) { - if (++timeouts >= __maxTimeouts) { + if (++timeouts >= maxTimeouts) { throw new IOException("Connection timed out."); } } catch (final TFTPPacketException e) { diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java index fe9b5a2..f542388 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPDataPacket.java @@ -53,13 +53,13 @@ public final class TFTPDataPacket extends TFTPPacket int blockNumber; /*** The length of the data. ***/ - int length; + private int length; /*** The offset into the _data array at which the data begins. ***/ - int offset; + private int offset; /*** The data stored in the packet. ***/ - byte[] data; + private byte[] data; /*** * Creates a data packet to be sent to a host at a given port @@ -152,8 +152,8 @@ public final class TFTPDataPacket extends TFTPPacket System.arraycopy(this.data, offset, data, 4, length); } - datagram.setAddress(_address); - datagram.setPort(_port); + datagram.setAddress(address); + datagram.setPort(port); datagram.setData(data); datagram.setLength(length + 4); @@ -185,7 +185,7 @@ public final class TFTPDataPacket extends TFTPPacket System.arraycopy(this.data, offset, data, 4, length); - return new DatagramPacket(data, length + 4, _address, _port); + return new DatagramPacket(data, length + 4, address, port); } /*** diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java index 7d71c9f..50b879b 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPErrorPacket.java @@ -70,10 +70,10 @@ public final class TFTPErrorPacket extends TFTPPacket public static final int NO_SUCH_USER = 7; /*** The error code of this packet. ***/ - int error; + private int error; /*** The error message of this packet. ***/ - String message; + private String message; /*** * Creates an error packet to be sent to a host at a given port @@ -161,8 +161,8 @@ public final class TFTPErrorPacket extends TFTPPacket data[length + 4] = 0; - datagram.setAddress(_address); - datagram.setPort(_port); + datagram.setAddress(address); + datagram.setPort(port); datagram.setData(data); datagram.setLength(length + 4); @@ -200,7 +200,7 @@ public final class TFTPErrorPacket extends TFTPPacket data[length + 4] = 0; - return new DatagramPacket(data, data.length, _address, _port); + return new DatagramPacket(data, data.length, address, port); } diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java index 623eb9f..0fa9ebd 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPPacket.java @@ -104,10 +104,10 @@ public abstract class TFTPPacket int type; /*** The port the packet came from or is going to. ***/ - int _port; + int port; /*** The host the packet is going to be sent or where it came from. ***/ - InetAddress _address; + InetAddress address; /*** * When you receive a datagram that you expect to be a TFTP packet, you use @@ -170,8 +170,8 @@ public abstract class TFTPPacket TFTPPacket(final int type, final InetAddress address, final int port) { this.type = type; - this._address = address; - this._port = port; + this.address = address; + this.port = port; } /*** @@ -219,7 +219,7 @@ public abstract class TFTPPacket ***/ public final InetAddress getAddress() { - return _address; + return address; } /*** @@ -230,7 +230,7 @@ public abstract class TFTPPacket ***/ public final int getPort() { - return _port; + return port; } /*** @@ -239,7 +239,7 @@ public abstract class TFTPPacket ***/ public final void setPort(final int port) { - _port = port; + this.port = port; } /*** Sets the host address where the packet is going to be sent. @@ -247,7 +247,7 @@ public abstract class TFTPPacket ***/ public final void setAddress(final InetAddress address) { - _address = address; + this.address = address; } /** @@ -256,6 +256,6 @@ public abstract class TFTPPacket */ @Override public String toString() { - return _address + " " + _port + " " + type; + return address + " " + port + " " + type; } } diff --git a/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java b/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java index 8457eed..c9f0be9 100644 --- a/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java +++ b/src/main/java/org/apache/commons/net/tftp/TFTPRequestPacket.java @@ -191,8 +191,8 @@ public abstract class TFTPRequestPacket extends TFTPPacket System.arraycopy(modeBytes[mode], 0, data, fileLength + 3, modeLength); - datagram.setAddress(_address); - datagram.setPort(_port); + datagram.setAddress(address); + datagram.setPort(port); datagram.setData(data); datagram.setLength(fileLength + modeLength + 3); @@ -227,7 +227,7 @@ public abstract class TFTPRequestPacket extends TFTPPacket System.arraycopy(modeBytes[mode], 0, data, fileLength + 3, modeLength); - return new DatagramPacket(data, data.length, _address, _port); + return new DatagramPacket(data, data.length, address, port); } /*** 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 b374b97..a27f25f 100644 --- a/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java +++ b/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java @@ -101,9 +101,9 @@ public class TFTPServerMain { if (packet instanceof TFTPAckPacket) { final TFTPAckPacket ack = (TFTPAckPacket) packet; System.out.println("Change ack block num"); - ack._blockNumber--; + ack.blockNumber--; super.sendData(tftp, packet); - ack._blockNumber++; + ack.blockNumber++; } break; case 2:
