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 c5eaef063c76e61bf9f01ebed2ea10c6fa55f1e5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jun 16 18:51:30 2024 -0400
Fix PMD UnnecessaryModifier
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/commons/net/bsd/RExecClient.java | 2 +-
.../commons/net/examples/cidr/SubnetUtilsExample.java | 2 +-
.../apache/commons/net/examples/ftp/FTPClientExample.java | 4 ++--
.../apache/commons/net/examples/mail/POP3ExportMbox.java | 8 ++++----
.../java/org/apache/commons/net/examples/unix/chargen.java | 2 +-
.../java/org/apache/commons/net/finger/FingerClient.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPClient.java | 6 +++---
src/main/java/org/apache/commons/net/ftp/FTPCmd.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPFile.java | 2 +-
.../org/apache/commons/net/ftp/FTPListParseEngine.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPSClient.java | 2 +-
src/main/java/org/apache/commons/net/nntp/NNTPClient.java | 8 ++++----
src/main/java/org/apache/commons/net/smtp/SMTPClient.java | 2 +-
src/test/java/org/apache/commons/net/MockTcpServer.java | 4 ++--
.../apache/commons/net/daytime/MockDaytimeTCPServer.java | 2 +-
.../java/org/apache/commons/net/examples/MainTest.java | 4 ++--
.../org/apache/commons/net/ftp/parser/MLSDComparison.java | 4 ++--
.../apache/commons/net/io/ToNetASCIIInputStreamTest.java | 2 +-
.../commons/net/telnet/TelnetClientFunctionalTest.java | 2 +-
.../org/apache/commons/net/telnet/TelnetClientTest.java | 2 +-
.../org/apache/commons/net/tftp/TFTPServerPathTest.java | 14 +++++++-------
src/test/java/org/apache/commons/net/tftp/TFTPTest.java | 6 +++---
23 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7c02d4ee..b6e68b4b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -75,6 +75,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD
UnusedFormalParameter.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD
AvoidBranchingStatementAsLastInLoop in
org.apache.commons.net.bsd.RCommandClient.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD
UselessOverridingMethod in org.apache.commons.net.telnet.TelnetClient.</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD
UnnecessaryModifier.</action>
<!-- ADD -->
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory,
Dependabot">Bump org.apache.commons:commons-parent from 70 to 71 #261.</action>
diff --git a/src/main/java/org/apache/commons/net/bsd/RExecClient.java
b/src/main/java/org/apache/commons/net/bsd/RExecClient.java
index e3a8537a..872d457e 100644
--- a/src/main/java/org/apache/commons/net/bsd/RExecClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RExecClient.java
@@ -81,7 +81,7 @@ public class RExecClient extends SocketClient {
InputStream createErrorStream() throws IOException {
final Socket socket;
- try (final ServerSocket server =
_serverSocketFactory_.createServerSocket(0, 1, getLocalAddress())) {
+ try (ServerSocket server = _serverSocketFactory_.createServerSocket(0,
1, getLocalAddress())) {
_output_.write(Integer.toString(server.getLocalPort()).getBytes(StandardCharsets.UTF_8));
// $NON-NLS-1$
_output_.write(NULL_CHAR);
_output_.flush();
diff --git
a/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java
b/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java
index 879e57ae..7b5d6b0f 100644
--- a/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java
+++ b/src/main/java/org/apache/commons/net/examples/cidr/SubnetUtilsExample.java
@@ -51,7 +51,7 @@ public class SubnetUtilsExample {
final String prompt = "Enter an IP address (e.g. 192.168.0.10):";
System.out.println(prompt);
- try (final Scanner scanner = new Scanner(System.in,
Charset.defaultCharset().name())) {
+ try (Scanner scanner = new Scanner(System.in,
Charset.defaultCharset().name())) {
while (scanner.hasNextLine()) {
final String address = scanner.nextLine();
System.out.println("The IP address [" + address + "] is " +
(info.isInRange(address) ? "" : "not ") + "within the subnet [" + subnet + "]");
diff --git
a/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
b/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
index 5aa8189e..126c9a7c 100644
--- a/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
+++ b/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
@@ -355,7 +355,7 @@ public final class FTPClientExample {
ftp.setUseEPSVwithIPv4(useEpsvWithIPv4);
if (storeFile) {
- try (final InputStream input = new FileInputStream(local)) {
+ try (InputStream input = new FileInputStream(local)) {
ftp.storeFile(remote, input);
}
@@ -446,7 +446,7 @@ public final class FTPClientExample {
System.out.println("Failed: " + ftp.getReplyString());
}
} else {
- try (final OutputStream output = new FileOutputStream(local)) {
+ try (OutputStream output = new FileOutputStream(local)) {
ftp.retrieveFile(remote, output);
}
diff --git
a/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java
b/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java
index 1b2010b8..1a64f32e 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/POP3ExportMbox.java
@@ -129,7 +129,7 @@ public final class POP3ExportMbox {
System.out.println("Writing dir: " + mbox);
// Currently POP3Client uses iso-8859-1
for (int i = 1; i <= count; i++) {
- try (final OutputStreamWriter fw = new
OutputStreamWriter(new FileOutputStream(new File(mbox, i + ".eml")),
+ try (OutputStreamWriter fw = new
OutputStreamWriter(new FileOutputStream(new File(mbox, i + ".eml")),
StandardCharsets.ISO_8859_1)) {
writeFile(pop3, fw, i);
}
@@ -137,7 +137,7 @@ public final class POP3ExportMbox {
} else {
System.out.println("Writing file: " + mbox);
// Currently POP3Client uses iso-8859-1
- try (final OutputStreamWriter fw = new
OutputStreamWriter(new FileOutputStream(mbox), StandardCharsets.ISO_8859_1)) {
+ try (OutputStreamWriter fw = new OutputStreamWriter(new
FileOutputStream(mbox), StandardCharsets.ISO_8859_1)) {
for (int i = 1; i <= count; i++) {
writeMbox(pop3, fw, i);
}
@@ -158,7 +158,7 @@ public final class POP3ExportMbox {
}
private static void writeFile(final POP3Client pop3, final
OutputStreamWriter fw, final int i) throws IOException {
- try (final BufferedReader r = (BufferedReader)
pop3.retrieveMessage(i)) {
+ try (BufferedReader r = (BufferedReader) pop3.retrieveMessage(i)) {
String line;
while ((line = r.readLine()) != null) {
fw.write(line);
@@ -172,7 +172,7 @@ public final class POP3ExportMbox {
= new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy");
final String replyTo = "MAILER-DAEMON"; // default
final Date received = new Date();
- try (final BufferedReader r = (BufferedReader)
pop3.retrieveMessage(i)) {
+ try (BufferedReader r = (BufferedReader) pop3.retrieveMessage(i)) {
fw.append("From ");
fw.append(replyTo);
fw.append(' ');
diff --git a/src/main/java/org/apache/commons/net/examples/unix/chargen.java
b/src/main/java/org/apache/commons/net/examples/unix/chargen.java
index 928dfda6..9ad9371b 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/chargen.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/chargen.java
@@ -46,7 +46,7 @@ public final class chargen {
// We want to timeout if a response takes longer than 60 seconds
client.setDefaultTimeout(60000);
client.connect(host);
- try (final BufferedReader chargenInput = new BufferedReader(new
InputStreamReader(client.getInputStream(), Charset.defaultCharset()))) {
+ try (BufferedReader chargenInput = new BufferedReader(new
InputStreamReader(client.getInputStream(), Charset.defaultCharset()))) {
// We assume the chargen service outputs lines, but it really
doesn't
// have to, so this code might actually not work if no newlines are
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 d2294d08..db92d54e 100644
--- a/src/main/java/org/apache/commons/net/finger/FingerClient.java
+++ b/src/main/java/org/apache/commons/net/finger/FingerClient.java
@@ -145,7 +145,7 @@ public class FingerClient extends SocketClient {
int read;
final StringBuilder result = new StringBuilder(buffer.length);
- try (final BufferedReader input = new BufferedReader(new
InputStreamReader(getInputStream(longOutput, user), getCharset()))) {
+ try (BufferedReader input = new BufferedReader(new
InputStreamReader(getInputStream(longOutput, user), getCharset()))) {
while (true) {
read = input.read(buffer, 0, buffer.length);
if (read <= 0) {
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 ea307fb9..af555fd3 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -703,7 +703,7 @@ public class FTPClient extends FTP implements Configurable {
if (dataConnectionMode == ACTIVE_LOCAL_DATA_CONNECTION_MODE) {
// if no activePortRange was set (correctly) -> getActivePort() = 0
// -> new ServerSocket(0) -> bind to any free local port
- try (final ServerSocket server =
_serverSocketFactory_.createServerSocket(getActivePort(), 1, getHostAddress()))
{
+ try (ServerSocket server =
_serverSocketFactory_.createServerSocket(getActivePort(), 1, getHostAddress()))
{
// Try EPRT only if remote server is over IPv6, if not use
PORT,
// because EPRT has no advantage over PORT on IPv4.
// It could even have the disadvantage,
@@ -2356,11 +2356,11 @@ public class FTPClient extends FTP implements
Configurable {
*/
public String[] listNames(final String pathname) throws IOException {
final ArrayList<String> results = new ArrayList<>();
- try (final Socket socket = _openDataConnection_(FTPCmd.NLST,
getListArguments(pathname))) {
+ try (Socket socket = _openDataConnection_(FTPCmd.NLST,
getListArguments(pathname))) {
if (socket == null) {
return null;
}
- try (final BufferedReader reader = new BufferedReader(new
InputStreamReader(socket.getInputStream(), getControlEncoding()))) {
+ try (BufferedReader reader = new BufferedReader(new
InputStreamReader(socket.getInputStream(), getControlEncoding()))) {
String line;
while ((line = reader.readLine()) != null) {
results.add(line);
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPCmd.java
b/src/main/java/org/apache/commons/net/ftp/FTPCmd.java
index 5d8c0bb2..1979a4d5 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPCmd.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPCmd.java
@@ -254,7 +254,7 @@ public enum FTPCmd {
*
* @return The FTP protcol command string corresponding to a specified
command code.
*/
- public final String getCommand() {
+ public String getCommand() {
return name();
}
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 25b45499..dadc93b1 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFile.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFile.java
@@ -421,7 +421,7 @@ public class FTPFile implements Serializable {
return "[Invalid: could not parse file entry]";
}
final StringBuilder sb = new StringBuilder();
- try (final Formatter fmt = new Formatter(sb)) {
+ try (Formatter fmt = new Formatter(sb)) {
sb.append(formatType());
sb.append(permissionToString(USER_ACCESS));
sb.append(permissionToString(GROUP_ACCESS));
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
b/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
index a4ca970f..f7100645 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
@@ -235,7 +235,7 @@ public class FTPListParseEngine {
* @throws IOException thrown on any failure to read the stream
*/
private void read(final InputStream inputStream, final String charsetName)
throws IOException {
- try (final BufferedReader reader = new BufferedReader(new
InputStreamReader(inputStream, Charsets.toCharset(charsetName)))) {
+ try (BufferedReader reader = new BufferedReader(new
InputStreamReader(inputStream, Charsets.toCharset(charsetName)))) {
String line = this.parser.readNextEntry(reader);
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 507148fd..8179c58d 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
@@ -797,7 +797,7 @@ public class FTPSClient extends FTPClient {
if (getDataConnectionMode() == ACTIVE_LOCAL_DATA_CONNECTION_MODE) {
// if no activePortRange was set (correctly) -> getActivePort() = 0
// -> new ServerSocket(0) -> bind to any free local port
- try (final ServerSocket server =
_serverSocketFactory_.createServerSocket(getActivePort(), 1, getHostAddress()))
{
+ try (ServerSocket server =
_serverSocketFactory_.createServerSocket(getActivePort(), 1, getHostAddress()))
{
// Try EPRT only if remote server is over IPv6, if not use
PORT,
// because EPRT has no advantage over PORT on IPv4.
// It could even have the disadvantage,
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 c6b09864..d7cd7fbf 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
@@ -399,7 +399,7 @@ public class NNTPClient extends NNTP {
return null;
}
- try (final StringWriter help = new StringWriter(); final
BufferedReader reader = new DotTerminatedMessageReader(_reader_)) {
+ try (StringWriter help = new StringWriter(); BufferedReader reader =
new DotTerminatedMessageReader(_reader_)) {
Util.copyReader(reader, help);
return help.toString();
}
@@ -426,7 +426,7 @@ public class NNTPClient extends NNTP {
}
final Vector<String> list = new Vector<>();
- try (final BufferedReader reader = new
DotTerminatedMessageReader(_reader_)) {
+ try (BufferedReader reader = new DotTerminatedMessageReader(_reader_))
{
String line;
while ((line = reader.readLine()) != null) {
@@ -516,7 +516,7 @@ public class NNTPClient extends NNTP {
return null;
}
- try (final BufferedReader reader = new
DotTerminatedMessageReader(_reader_)) {
+ try (BufferedReader reader = new DotTerminatedMessageReader(_reader_))
{
String line;
final ArrayList<String> list = new ArrayList<>();
while ((line = reader.readLine()) != null) {
@@ -602,7 +602,7 @@ public class NNTPClient extends NNTP {
final Vector<NewsgroupInfo> list = new Vector<>(2048);
String line;
- try (final BufferedReader reader = new
DotTerminatedMessageReader(_reader_)) {
+ try (BufferedReader reader = new DotTerminatedMessageReader(_reader_))
{
while ((line = reader.readLine()) != null) {
final NewsgroupInfo tmp = parseNewsgroupListEntry(line);
if (tmp == null) {
diff --git a/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
b/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
index 88ba62d5..4c44430d 100644
--- a/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
+++ b/src/main/java/org/apache/commons/net/smtp/SMTPClient.java
@@ -322,7 +322,7 @@ public class SMTPClient extends SMTP {
* @throws IOException If an I/O error occurs while
either sending a command to the server or receiving a reply from the server.
*/
public boolean sendShortMessageData(final String message) throws
IOException {
- try (final Writer writer = sendMessageData()) {
+ try (Writer writer = sendMessageData()) {
if (writer == null) {
return false;
}
diff --git a/src/test/java/org/apache/commons/net/MockTcpServer.java
b/src/test/java/org/apache/commons/net/MockTcpServer.java
index d09f1802..581a4c4e 100644
--- a/src/test/java/org/apache/commons/net/MockTcpServer.java
+++ b/src/test/java/org/apache/commons/net/MockTcpServer.java
@@ -35,7 +35,7 @@ import java.net.Socket;
* // other fields and constructors are omitted for brevity
* {@literal @Override}
* protected void processClientSocket(final Socket clientSocket) throws
Exception {
- * try (final PrintWriter pw = new
PrintWriter(clientSocket.getOutputStream())) {
+ * try (PrintWriter pw = new
PrintWriter(clientSocket.getOutputStream())) {
* pw.write("Hello, World!");
* pw.flush();
* }
@@ -131,7 +131,7 @@ public abstract class MockTcpServer implements Runnable,
Closeable {
@Override
public final void run() {
while (running) {
- try (final Socket clientSocket = serverSocket.accept()) {
+ try (Socket clientSocket = serverSocket.accept()) {
processClientSocket(clientSocket);
} catch (final IOException e) {
System.err.println("IOException on MockWebServer
serverSocket.accept(): " + e);
diff --git
a/src/test/java/org/apache/commons/net/daytime/MockDaytimeTCPServer.java
b/src/test/java/org/apache/commons/net/daytime/MockDaytimeTCPServer.java
index 19d0a31e..3d1cd744 100644
--- a/src/test/java/org/apache/commons/net/daytime/MockDaytimeTCPServer.java
+++ b/src/test/java/org/apache/commons/net/daytime/MockDaytimeTCPServer.java
@@ -98,7 +98,7 @@ public final class MockDaytimeTCPServer extends MockTcpServer
{
@Override
protected void processClientSocket(final Socket clientSocket) throws
Exception {
- try (final PrintWriter pw = new
PrintWriter(clientSocket.getOutputStream())) {
+ try (PrintWriter pw = new PrintWriter(clientSocket.getOutputStream()))
{
final Clock nextClock =
Objects.requireNonNull(responseQueue.poll(5, TimeUnit.SECONDS), "Could not
obtain next clock for DaytimeTCPMockServer");
final ZonedDateTime dateTime = ZonedDateTime.now(nextClock);
pw.write(dateTime.format(DAYTIME_DATA_FORMAT));
diff --git a/src/test/java/org/apache/commons/net/examples/MainTest.java
b/src/test/java/org/apache/commons/net/examples/MainTest.java
index d2caabb9..b4b14785 100644
--- a/src/test/java/org/apache/commons/net/examples/MainTest.java
+++ b/src/test/java/org/apache/commons/net/examples/MainTest.java
@@ -88,7 +88,7 @@ public class MainTest {
final String sourceFile = new
File(URLDecoder.decode(codeSource.getLocation().getFile(),
StandardCharsets.UTF_8.name())).getCanonicalPath();
final Properties p = new Properties();
if (sourceFile.endsWith(".jar")) {
- try (final JarFile jf = new JarFile(sourceFile)) {
+ try (JarFile jf = new JarFile(sourceFile)) {
final Enumeration<JarEntry> e = jf.entries();
while (e.hasMoreElements()) {
final JarEntry je = e.nextElement();
@@ -112,7 +112,7 @@ public class MainTest {
public void testCheckExamplesPropertiesIsComplete() throws Exception {
final Properties cp = scanClasses();
final Properties fp = new Properties();
- try (final InputStream inputStream =
this.getClass().getResourceAsStream("examples.properties")) {
+ try (InputStream inputStream =
this.getClass().getResourceAsStream("examples.properties")) {
fp.load(inputStream);
}
@SuppressWarnings("unchecked") // OK
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
index 63c55d1c..df7cb64b 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MLSDComparison.java
@@ -181,12 +181,12 @@ public class MLSDComparison {
for (final File mlsd : files) {
// System.out.println(mlsd);
FTPListParseEngine engine = new
FTPListParseEngine(MLSxEntryParser.getInstance());
- try (final InputStream is = new FileInputStream(mlsd)) {
+ try (InputStream is = new FileInputStream(mlsd)) {
engine.readServerList(is, FTP.DEFAULT_CONTROL_ENCODING);
}
final FTPFile[] mlsds = engine.getFiles(FTPFileFilters.ALL);
final File listFile = new File(mlsd.getParentFile(),
mlsd.getName().replace("_mlsd", "_list"));
- try (final InputStream inputStream = new
FileInputStream(listFile)) {
+ try (InputStream inputStream = new FileInputStream(listFile)) {
final FTPClientConfig cfg = new FTPClientConfig();
cfg.setServerTimeZoneId("GMT");
final UnixFTPEntryParser parser = new
UnixFTPEntryParser(cfg);
diff --git
a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
index 7cf9aa75..3b981ddb 100644
--- a/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
+++ b/src/test/java/org/apache/commons/net/io/ToNetASCIIInputStreamTest.java
@@ -32,7 +32,7 @@ public class ToNetASCIIInputStreamTest {
final byte[] data = input.getBytes(StandardCharsets.US_ASCII);
final byte[] expected = expect.getBytes(StandardCharsets.US_ASCII);
final InputStream source = new ByteArrayInputStream(data);
- try (final ToNetASCIIInputStream toNetASCII = new
ToNetASCIIInputStream(source)) {
+ try (ToNetASCIIInputStream toNetASCII = new
ToNetASCIIInputStream(source)) {
final byte[] output = new byte[data.length * 2]; // cannot be
longer than twice the input
final int length = byByte ? getSingleBytes(toNetASCII, output) :
getBuffer(toNetASCII, output);
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 a18d1807..9cd50052 100644
---
a/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
+++
b/src/test/java/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
@@ -42,7 +42,7 @@ public class TelnetClientFunctionalTest extends TestCase {
boolean testresult = false;
tc1.connect("rainmaker.wunderground.com", 3000);
- try (final InputStream is = tc1.getInputStream(); final OutputStream
os = tc1.getOutputStream()) {
+ try (InputStream is = tc1.getInputStream(); final OutputStream os =
tc1.getOutputStream()) {
boolean cont = waitForString(is, "Return to continue:", 30000);
if (cont) {
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 cce975e2..93513693 100644
--- a/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
+++ b/src/test/java/org/apache/commons/net/telnet/TelnetClientTest.java
@@ -721,7 +721,7 @@ public class TelnetClientTest extends TestCase implements
TelnetNotificationHand
final byte[] expected1 = { (byte) 't', (byte) 'e', (byte) 's', (byte)
't', (byte) '1' };
final byte[] expected2 = { (byte) 't', (byte) 'e', (byte) 's', (byte)
't', (byte) '2' };
- try (final PipedOutputStream po = new PipedOutputStream(); final
PipedInputStream pi = new PipedInputStream(po)) {
+ try (PipedOutputStream po = new PipedOutputStream(); final
PipedInputStream pi = new PipedInputStream(po)) {
final OutputStream os = STANDARD.server.getOutputStream();
final OutputStream ostc = STANDARD.client.getOutputStream();
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
b/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
index b49f9456..c1ee8c62 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java
@@ -122,14 +122,14 @@ public class TFTPServerPathTest {
tftpClient.setSoTimeout(Duration.ofMillis(2000));
// we can read file
- try (final OutputStream os = Files.newOutputStream(fileToWrite)) {
+ try (OutputStream os = Files.newOutputStream(fileToWrite)) {
final String writeFileName = fileToRead.getFileName().toString();
final int bytesRead = tftpClient.receiveFile(writeFileName,
TFTP.BINARY_MODE, os, serverAddress, serverPort);
assertEquals(fileToReadContentLength, bytesRead);
}
// but we cannot write to it
- try (final InputStream is = Files.newInputStream(fileToRead)) {
+ try (InputStream is = Files.newInputStream(fileToRead)) {
final String readFileName = fileToRead.getFileName().toString();
final IOException exception = assertThrows(IOException.class, ()
-> tftpClient.sendFile(readFileName, TFTP.BINARY_MODE, is, serverAddress,
serverPort));
assertEquals("Error code 4 received: Write not allowed by
server.", exception.getMessage());
@@ -148,14 +148,14 @@ public class TFTPServerPathTest {
tftpClient.setSoTimeout(Duration.ofMillis(2000));
// we cannot read file
- try (final OutputStream os = Files.newOutputStream(fileToWrite)) {
+ try (OutputStream os = Files.newOutputStream(fileToWrite)) {
final String readFileName = fileToRead.getFileName().toString();
final IOException exception = assertThrows(IOException.class, ()
-> tftpClient.receiveFile(readFileName, TFTP.BINARY_MODE, os, serverAddress,
serverPort));
assertEquals("Error code 4 received: Read not allowed by server.",
exception.getMessage());
}
// but we can write to it
- try (final InputStream is = Files.newInputStream(fileToRead)) {
+ try (InputStream is = Files.newInputStream(fileToRead)) {
deleteFile(fileToWrite, false);
final String writeFileName = fileToWrite.getFileName().toString();
tftpClient.sendFile(writeFileName, TFTP.BINARY_MODE, is,
serverAddress, serverPort);
@@ -172,7 +172,7 @@ public class TFTPServerPathTest {
tftpClient = new TFTPClient();
tftpClient.open();
- try (final InputStream is = Files.newInputStream(fileToRead)) {
+ try (InputStream is = Files.newInputStream(fileToRead)) {
final IOException exception = assertThrows(IOException.class, ()
-> tftpClient.sendFile("../foo", TFTP.BINARY_MODE, is, serverAddress,
serverPort));
assertEquals("Error code 0 received: Cannot access files outside
of TFTP server root.", exception.getMessage());
assertFalse(Files.exists(serverDirectory.resolve("foo")), "file
created when it should not have been");
@@ -195,14 +195,14 @@ public class TFTPServerPathTest {
Files.write(fileToRead, content);
// send file
- try (final InputStream is = Files.newInputStream(fileToRead)) {
+ try (InputStream is = Files.newInputStream(fileToRead)) {
deleteFile(fileToWrite, false);
final String writeFileName = fileToWrite.getFileName().toString();
tftpClient.sendFile(writeFileName, TFTP.BINARY_MODE, is,
serverAddress, serverPort);
}
// then verify it contents
- try (final OutputStream os = Files.newOutputStream(fileToWrite)) {
+ try (OutputStream os = Files.newOutputStream(fileToWrite)) {
final String readFileName = fileToRead.getFileName().toString();
final int readBytes = tftpClient.receiveFile(readFileName,
TFTP.BINARY_MODE, os, serverAddress, serverPort);
assertEquals(content.length, readBytes);
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
index d734670e..16f3513a 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
@@ -68,7 +68,7 @@ public class TFTPTest extends TestCase {
* Create a file, size specified in bytes
*/
private static File createFile(final File file, final int size) throws
IOException {
- try (final OutputStream os = new BufferedOutputStream(new
FileOutputStream(file))) {
+ try (OutputStream os = new BufferedOutputStream(new
FileOutputStream(file))) {
final byte[] temp = "0".getBytes();
for (int i = 0; i < size; i++) {
os.write(temp);
@@ -134,7 +134,7 @@ public class TFTPTest extends TestCase {
out.delete();
assertFalse("Couldn't clear output location", out.exists());
- try (final FileOutputStream output = new FileOutputStream(out)) {
+ try (FileOutputStream output = new FileOutputStream(out)) {
tftp.receiveFile(file.getName(), mode, output, "localhost",
SERVER_PORT);
}
@@ -196,7 +196,7 @@ public class TFTPTest extends TestCase {
in.delete();
assertFalse("Couldn't clear output location", in.exists());
- try (final FileInputStream fis = new FileInputStream(file)) {
+ try (FileInputStream fis = new FileInputStream(file)) {
tftp.sendFile(in.getName(), mode, fis, "localhost",
SERVER_PORT);
}
