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
The following commit(s) were added to refs/heads/master by this push:
new 0da7650 Fix Checkstyle errors (line length).
0da7650 is described below
commit 0da76503e34d7cbf37f1c898ca66651c993daaf8
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Sep 20 21:16:09 2020 -0400
Fix Checkstyle errors (line length).
---
.../org/apache/commons/net/PrintCommandListener.java | 7 ++++---
.../apache/commons/net/examples/ftp/TFTPExample.java | 8 ++++----
.../commons/net/examples/mail/IMAPExportMbox.java | 15 ++++++++-------
.../apache/commons/net/examples/mail/IMAPUtils.java | 3 ++-
.../org/apache/commons/net/finger/FingerClient.java | 7 +++----
.../java/org/apache/commons/net/ftp/FTPHTTPClient.java | 18 ++++++++----------
.../org/apache/commons/net/ftp/FTPSSocketFactory.java | 7 ++++---
.../java/org/apache/commons/net/imap/IMAPClient.java | 8 ++++----
src/main/java/org/apache/commons/net/util/Base64.java | 12 ++++++------
.../org/apache/commons/net/util/SSLContextUtils.java | 6 +++---
.../org/apache/commons/net/util/SSLSocketUtils.java | 3 ++-
11 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/PrintCommandListener.java
b/src/main/java/org/apache/commons/net/PrintCommandListener.java
index 1ccb1c7..13f2fd6 100644
--- a/src/main/java/org/apache/commons/net/PrintCommandListener.java
+++ b/src/main/java/org/apache/commons/net/PrintCommandListener.java
@@ -85,7 +85,8 @@ public class PrintCommandListener implements
ProtocolCommandListener
*
* @since 3.0
*/
- public PrintCommandListener(final PrintStream stream, final boolean
suppressLogin, final char eolMarker, final boolean showDirection) {
+ public PrintCommandListener(final PrintStream stream, final boolean
suppressLogin, final char eolMarker,
+ final boolean showDirection) {
this(new PrintWriter(stream), suppressLogin, eolMarker, showDirection);
}
@@ -138,8 +139,8 @@ public class PrintCommandListener implements
ProtocolCommandListener
*
* @since 3.0
*/
- public PrintCommandListener(final PrintWriter writer, final boolean
suppressLogin, final char eolMarker, final boolean showDirection)
- {
+ public PrintCommandListener(final PrintWriter writer, final boolean
suppressLogin, final char eolMarker,
+ final boolean showDirection) {
__writer = writer;
__nologin = suppressLogin;
__eolMarker = eolMarker;
diff --git a/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java
b/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java
index aee4b74..a7fc85f 100644
--- a/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java
+++ b/src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java
@@ -150,8 +150,8 @@ public final class TFTPExample
System.out.println("OK");
}
- private static boolean send(final int transferMode, final String hostname,
final String localFilename, final String remoteFilename,
- final TFTPClient tftp) {
+ private static boolean send(final int transferMode, final String hostname,
final String localFilename,
+ final String remoteFilename, final TFTPClient tftp) {
boolean closed;
FileInputStream input = null;
@@ -199,8 +199,8 @@ public final class TFTPExample
return closed;
}
- private static boolean receive(final int transferMode, final String
hostname, final String localFilename, final String remoteFilename,
- final TFTPClient tftp) {
+ private static boolean receive(final int transferMode, final String
hostname, final String localFilename,
+ final String remoteFilename, final TFTPClient tftp) {
boolean closed;
FileOutputStream output = null;
File file;
diff --git
a/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java
b/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java
index 750c7a7..1ba0754 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java
@@ -345,13 +345,14 @@ public final class IMAPExportMbox
private final boolean printMarker;
private final boolean checkSequence;
- MboxListener(final BufferedWriter bw, final String eol, final boolean
printHash, final boolean printMarker, final boolean checkSequence) {
- this.eol = eol;
- this.printHash = printHash;
- this.printMarker = printMarker;
- DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
- this.bw = bw;
- this.checkSequence = checkSequence;
+ MboxListener(final BufferedWriter bw, final String eol, final boolean
printHash, final boolean printMarker,
+ final boolean checkSequence) {
+ this.eol = eol;
+ this.printHash = printHash;
+ this.printMarker = printMarker;
+ DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
+ this.bw = bw;
+ this.checkSequence = checkSequence;
}
@Override
diff --git a/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java
b/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java
index b0c26ff..b7711ae 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/IMAPUtils.java
@@ -40,7 +40,8 @@ class IMAPUtils {
* @return the IMAP client - connected and logged in
* @throws IOException if any problems occur
*/
- static IMAPClient imapLogin(final URI uri, final int defaultTimeout, final
ProtocolCommandListener listener) throws IOException {
+ static IMAPClient imapLogin(final URI uri, final int defaultTimeout, final
ProtocolCommandListener listener)
+ throws IOException {
final String userInfo = uri.getUserInfo();
if (userInfo == null) {
throw new IllegalArgumentException("Missing userInfo details");
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 4993d86..8cf66c2 100644
--- a/src/main/java/org/apache/commons/net/finger/FingerClient.java
+++ b/src/main/java/org/apache/commons/net/finger/FingerClient.java
@@ -150,8 +150,7 @@ public class FingerClient extends SocketClient
* @throws IOException If an I/O error during the operation.
***/
public InputStream getInputStream(final boolean longOutput, final String
username, final String encoding)
- throws IOException
- {
+ throws IOException {
DataOutputStream output;
final StringBuilder buffer = new StringBuilder(64);
if (longOutput) {
@@ -161,7 +160,8 @@ public class FingerClient extends SocketClient
buffer.append(SocketClient.NETASCII_EOL);
// Note: Charsets.toCharset() returns the platform default for null
input
- final byte[] encodedQuery =
buffer.toString().getBytes(Charsets.toCharset(encoding).name()); // Java 1.6
can use charset directly
+ final byte[] encodedQuery =
buffer.toString().getBytes(Charsets.toCharset(encoding).name()); // Java 1.6
can use
+
// charset directly
output = new DataOutputStream(new BufferedOutputStream(_output_,
1024));
output.write(encodedQuery, 0, encodedQuery.length);
@@ -170,7 +170,6 @@ public class FingerClient extends SocketClient
return _input_;
}
-
/***
* Fingers the connected host and returns the input stream from
* the network connection of the finger query. This is equivalent to
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 573c180..1ee8de7 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
@@ -59,7 +59,8 @@ public class FTPHTTPClient extends FTPClient {
* @param proxyPass the password for the proxy
* @param encoding the encoding to use
*/
- public FTPHTTPClient(final String proxyHost, final int proxyPort, final
String proxyUser, final String proxyPass, final Charset encoding) {
+ public FTPHTTPClient(final String proxyHost, final int proxyPort, final
String proxyUser, final String proxyPass,
+ final Charset encoding) {
this.proxyHost = proxyHost;
this.proxyPort = proxyPort;
this.proxyUsername = proxyUser;
@@ -186,9 +187,9 @@ public class FTPHTTPClient extends FTPClient {
super._connectAction_(socketIsReader);
}
- private BufferedReader tunnelHandshake(final String host, final int port,
final InputStream input, final OutputStream output) throws IOException,
- UnsupportedEncodingException {
- final String connectString = "CONNECT " + host + ":" + port + "
HTTP/1.1";
+ private BufferedReader tunnelHandshake(final String host, final int port,
final InputStream input,
+ final OutputStream output) throws IOException,
UnsupportedEncodingException {
+ final String connectString = "CONNECT " + host + ":" + port + "
HTTP/1.1";
final String hostString = "Host: " + host + ":" + port;
this.tunnelHost = host;
@@ -199,18 +200,15 @@ public class FTPHTTPClient extends FTPClient {
if (proxyUsername != null && proxyPassword != null) {
final String auth = proxyUsername + ":" + proxyPassword;
- final String header = "Proxy-Authorization: Basic "
- + base64.encodeToString(auth.getBytes(charset));
+ final String header = "Proxy-Authorization: Basic " +
base64.encodeToString(auth.getBytes(charset));
output.write(header.getBytes(charset));
}
output.write(CRLF);
final List<String> response = new ArrayList<>();
- final BufferedReader reader = new BufferedReader(
- new InputStreamReader(input, getCharset()));
+ final BufferedReader reader = new BufferedReader(new
InputStreamReader(input, getCharset()));
- for (String line = reader.readLine(); line != null
- && line.length() > 0; line = reader.readLine()) {
+ for (String line = reader.readLine(); line != null && line.length() >
0; line = reader.readLine()) {
response.add(line);
}
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
b/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
index bb68858..3beaaa1 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
@@ -62,11 +62,11 @@ public class FTPSSocketFactory extends SocketFactory {
}
@Override
- public Socket createSocket(final InetAddress address, final int port,
final InetAddress localAddress, final int localPort) throws IOException {
+ public Socket createSocket(final InetAddress address, final int port,
final InetAddress localAddress,
+ final int localPort) throws IOException {
return this.context.getSocketFactory().createSocket(address, port,
localAddress, localPort);
}
-
// DEPRECATED METHODS - for API compatibility only - DO NOT USE
/** @param port the port
@@ -95,7 +95,8 @@ public class FTPSSocketFactory extends SocketFactory {
* @throws IOException on error
* @deprecated (2.2) use {@link
FTPSServerSocketFactory#createServerSocket(int, int, InetAddress) instead} */
@Deprecated
- public java.net.ServerSocket createServerSocket(final int port, final int
backlog, final InetAddress ifAddress) throws IOException {
+ public java.net.ServerSocket createServerSocket(final int port, final int
backlog, final InetAddress ifAddress)
+ throws IOException {
return
this.init(this.context.getServerSocketFactory().createServerSocket(port,
backlog, ifAddress));
}
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 4494bc8..86f297d 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAPClient.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAPClient.java
@@ -251,8 +251,8 @@ public class IMAPClient extends IMAP
* @throws IOException If a network I/O error occurs.
* @since 3.4
*/
- public boolean append(final String mailboxName, final String flags, final
String datetime, final String message) throws IOException
- {
+ public boolean append(final String mailboxName, final String flags, final
String datetime, final String message)
+ throws IOException {
final StringBuilder args = new
StringBuilder(quoteMailboxName(mailboxName));
if (flags != null) {
args.append(" ").append(flags);
@@ -269,12 +269,12 @@ public class IMAPClient extends IMAP
// String literal (probably not used much - if at all)
if (message.startsWith(DQUOTE_S) && message.endsWith(DQUOTE_S)) {
args.append(message);
- return doCommand (IMAPCommand.APPEND, args.toString());
+ return doCommand(IMAPCommand.APPEND, args.toString());
}
args.append('{').append(message.getBytes(IMAP.__DEFAULT_ENCODING).length).append('}');
// length of message
final int status = sendCommand(IMAPCommand.APPEND, args.toString());
return IMAPReply.isContinuation(status) // expecting continuation
response
- && IMAPReply.isSuccess(sendData(message)); // if so, send the data
+ && IMAPReply.isSuccess(sendData(message)); // if so, send the
data
}
/**
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 f280380..2a4e874 100644
--- a/src/main/java/org/apache/commons/net/util/Base64.java
+++ b/src/main/java/org/apache/commons/net/util/Base64.java
@@ -815,17 +815,17 @@ public class Base64 {
* Thrown when the input array needs an output array bigger
than maxResultSize
* @since 1.4
*/
- public static byte[] encodeBase64(final byte[] binaryData, final boolean
isChunked, final boolean urlSafe, final int maxResultSize) {
+ public static byte[] encodeBase64(final byte[] binaryData, final boolean
isChunked, final boolean urlSafe,
+ final int maxResultSize) {
if (binaryData == null || binaryData.length == 0) {
return binaryData;
}
- final long len = getEncodeLength(binaryData, isChunked ? CHUNK_SIZE :
0, isChunked ? CHUNK_SEPARATOR : EMPTY_BYTE_ARRAY);
+ final long len = getEncodeLength(binaryData, isChunked ? CHUNK_SIZE :
0,
+ isChunked ? CHUNK_SEPARATOR : EMPTY_BYTE_ARRAY);
if (len > maxResultSize) {
- throw new IllegalArgumentException("Input array too big, the
output array would be bigger (" +
- len +
- ") than the specified maxium size of " +
- maxResultSize);
+ throw new IllegalArgumentException("Input array too big, the
output array would be bigger (" + len
+ + ") than the specified maxium size of " + maxResultSize);
}
final Base64 b64 = isChunked ? new Base64(urlSafe) : new Base64(0,
CHUNK_SEPARATOR, urlSafe);
diff --git a/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
b/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
index 7912e6d..26e5470 100644
--- a/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
+++ b/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
@@ -57,12 +57,12 @@ public class SSLContextUtils {
* @return the initialised context.
* @throws IOException this is used to wrap any {@link
GeneralSecurityException} that occurs
*/
- public static SSLContext createSSLContext(final String protocol, final
KeyManager[] keyManagers, final TrustManager[] trustManagers)
- throws IOException {
+ public static SSLContext createSSLContext(final String protocol, final
KeyManager[] keyManagers,
+ final TrustManager[] trustManagers) throws IOException {
SSLContext ctx;
try {
ctx = SSLContext.getInstance(protocol);
- ctx.init(keyManagers, trustManagers, /*SecureRandom*/ null);
+ ctx.init(keyManagers, trustManagers, /* SecureRandom */ null);
} catch (final GeneralSecurityException e) {
final IOException ioe = new IOException("Could not initialize SSL
context");
ioe.initCause(e);
diff --git a/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java
b/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java
index f3940ea..f33e191 100644
--- a/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java
+++ b/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java
@@ -40,7 +40,8 @@ public class SSLSocketUtils {
public static boolean enableEndpointNameVerification(final SSLSocket
socket) {
try {
final Class<?> cls = Class.forName("javax.net.ssl.SSLParameters");
- final Method setEndpointIdentificationAlgorithm =
cls.getDeclaredMethod("setEndpointIdentificationAlgorithm", String.class);
+ final Method setEndpointIdentificationAlgorithm = cls
+ .getDeclaredMethod("setEndpointIdentificationAlgorithm",
String.class);
final Method getSSLParameters =
SSLSocket.class.getDeclaredMethod("getSSLParameters");
final Method setSSLParameters =
SSLSocket.class.getDeclaredMethod("setSSLParameters", cls);
if (setEndpointIdentificationAlgorithm != null && getSSLParameters
!= null && setSSLParameters != null) {
