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 2021/01/08 15:29:42 UTC
[commons-net] branch master updated: Collapse multiple identical
catch clauses into one.
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 f4bc144 Collapse multiple identical catch clauses into one.
f4bc144 is described below
commit f4bc1441e863552aac1c53098275c80d79865b3e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jan 8 10:29:37 2021 -0500
Collapse multiple identical catch clauses into one.
---
src/main/java/org/apache/commons/net/bsd/RCommandClient.java | 3 ---
.../net/ftp/parser/DefaultFTPFileEntryParserFactory.java | 4 +---
src/main/java/org/apache/commons/net/tftp/TFTP.java | 6 +-----
src/main/java/org/apache/commons/net/tftp/TFTPClient.java | 12 ++----------
.../java/org/apache/commons/net/util/SSLSocketUtils.java | 12 +++++-------
.../commons/net/ftp/FTPClientConfigFunctionalTest.java | 2 --
.../java/org/apache/commons/net/ftp/TestConnectTimeout.java | 9 +--------
7 files changed, 10 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
index 1ea94dd..bfdab17 100644
--- a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
@@ -192,9 +192,6 @@ public class RCommandClient extends RExecClient
_socket_ =
_socketFactory_.createSocket(host, port, localAddr, localPort);
}
- catch (final BindException be) {
- continue;
- }
catch (final SocketException e)
{
continue;
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 5a8a1b2..de72eb2 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
@@ -109,9 +109,7 @@ public class DefaultFTPFileEntryParserFactory
throw new ParserInitializationException(parserClass.getName()
+ " does not implement the interface "
+ "org.apache.commons.net.ftp.FTPFileEntryParser.", e);
- } catch (final Exception e) {
- throw new ParserInitializationException("Error initializing parser", e);
- } catch (final ExceptionInInitializerError e) {
+ } catch (final Exception | ExceptionInInitializerError e) {
throw new ParserInitializationException("Error initializing parser", e);
}
} catch (final ClassNotFoundException e) {
diff --git a/src/main/java/org/apache/commons/net/tftp/TFTP.java b/src/main/java/org/apache/commons/net/tftp/TFTP.java
index 66283f9..1b0f177 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTP.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTP.java
@@ -154,11 +154,7 @@ public class TFTP extends DatagramSocketClient
_socket_.receive(datagram);
}
}
- catch (final SocketException e)
- {
- // Do nothing. We timed out so we hope we're caught up.
- }
- catch (final InterruptedIOException e)
+ catch (final SocketException | InterruptedIOException e)
{
// Do nothing. We timed out so we hope we're caught up.
}
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 8a1d70c..e6a32ce 100644
--- a/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
+++ b/src/main/java/org/apache/commons/net/tftp/TFTPClient.java
@@ -241,11 +241,7 @@ public class TFTPClient extends TFTP
"Unexpected host or port.");
bufferedSend(error);
}
- } catch (final SocketException e) {
- if (++timeouts >= maxTimeouts) {
- throw new IOException("Connection timed out.");
- }
- } catch (final InterruptedIOException e) {
+ } catch (final SocketException | InterruptedIOException e) {
if (++timeouts >= maxTimeouts) {
throw new IOException("Connection timed out.");
}
@@ -434,11 +430,7 @@ public class TFTPClient extends TFTP
"Unexpected host or port.");
bufferedSend(error);
}
- } catch (final SocketException e) {
- if (++timeouts >= maxTimeouts) {
- throw new IOException("Connection timed out.");
- }
- } catch (final InterruptedIOException e) {
+ } catch (final SocketException | InterruptedIOException e) {
if (++timeouts >= maxTimeouts) {
throw new IOException("Connection timed out.");
}
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 f33e191..f06ff9e 100644
--- a/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java
+++ b/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java
@@ -25,6 +25,7 @@ import javax.net.ssl.SSLSocket;
/**
* General utilities for SSLSocket.
+ *
* @since 3.4
*/
public class SSLSocketUtils {
@@ -34,6 +35,7 @@ public class SSLSocketUtils {
/**
* Enable the HTTPS endpoint identification algorithm on an SSLSocket.
+ *
* @param socket the SSL socket
* @return {@code true} on success (this is only supported on Java 1.7+)
*/
@@ -41,7 +43,7 @@ public class SSLSocketUtils {
try {
final Class<?> cls = Class.forName("javax.net.ssl.SSLParameters");
final Method setEndpointIdentificationAlgorithm = cls
- .getDeclaredMethod("setEndpointIdentificationAlgorithm", String.class);
+ .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) {
@@ -52,12 +54,8 @@ public class SSLSocketUtils {
return true;
}
}
- } catch (final SecurityException e) { // Ignored
- } catch (final ClassNotFoundException e) { // Ignored
- } catch (final NoSuchMethodException e) { // Ignored
- } catch (final IllegalArgumentException e) { // Ignored
- } catch (final IllegalAccessException e) { // Ignored
- } catch (final InvocationTargetException e) { // Ignored
+ } catch (final SecurityException | ClassNotFoundException | NoSuchMethodException | IllegalArgumentException |
+ IllegalAccessException | InvocationTargetException e) { // Ignored
}
return false;
}
diff --git a/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java b/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
index ec4b7b9..8b8b48b 100644
--- a/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
@@ -74,8 +74,6 @@ public class FTPClientConfigFunctionalTest extends TestCase {
FTP.login("anonymous","testing@apache.org");
FTP.changeWorkingDirectory("SL.us008001/DF.an/DC.sflnd/DS.metar");
FTP.enterLocalPassiveMode();
- } catch (final SocketException e) {
- e.printStackTrace();
} catch (final IOException e) {
e.printStackTrace();
}
diff --git a/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java b/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
index 5349ba1..92158ac 100644
--- a/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
+++ b/src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java
@@ -38,14 +38,7 @@ public class TestConnectTimeout extends TestCase {
// TODO use a local server if possible
client.connect("www.apache.org", 1234);
fail("Expecting an Exception");
- }
- catch (final ConnectException se) {
- assertTrue(true);
- }
- catch (final SocketTimeoutException se) {
- assertTrue(true);
- }
- catch (final UnknownHostException ue) {
+ } catch (final ConnectException | SocketTimeoutException | UnknownHostException ue) {
// Not much we can do about this, we may be firewalled
assertTrue(true);
}