Skip to content

Commit f019bab

Browse files
garydgregorygarydgregory
committed
[SpotBugs] Make explicit use of the default encoding
Remove unused imports
1 parent 1ffef37 commit f019bab

14 files changed

+88
-79
lines changed

‎src/main/java/org/apache/commons/net/examples/ftp/TFTPExample.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,25 +159,20 @@ private static boolean receive(final int transferMode, final String hostname, fi
159159
final boolean closed;
160160
FileOutputStream output;
161161
final File file;
162-
163162
file = new File(localFilename);
164-
165163
// If file exists, don't overwrite it.
166164
if (file.exists()) {
167165
System.err.println("Error: " + localFilename + " already exists.");
168166
return false;
169167
}
170-
171168
// Try to open local file for writing
172169
try {
173170
output = new FileOutputStream(file);
174171
} catch (final IOException e) {
175172
tftp.close();
176173
throw new IOException("Error: could not open local file for writing.", e);
177174
}
178-
179175
open(tftp);
180-
181176
// Try to receive remote file via TFTP
182177
try {
183178
final String[] parts = hostname.split(":");
@@ -198,7 +193,6 @@ private static boolean receive(final int transferMode, final String hostname, fi
198193
// Close local socket and output file
199194
closed = close(tftp, output);
200195
}
201-
202196
return closed;
203197
}
204198

‎src/main/java/org/apache/commons/net/examples/mail/IMAPExportMbox.java

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@
1818
package org.apache.commons.net.examples.mail;
1919

2020
import java.io.BufferedWriter;
21-
import java.io.File;
22-
import java.io.FileWriter;
2321
import java.io.IOException;
2422
import java.io.UncheckedIOException;
2523
import java.net.URI;
2624
import java.net.URISyntaxException;
25+
import java.nio.charset.Charset;
26+
import java.nio.file.Files;
27+
import java.nio.file.Path;
28+
import java.nio.file.Paths;
29+
import java.nio.file.StandardOpenOption;
2730
import java.text.ParseException;
2831
import java.text.SimpleDateFormat;
2932
import java.util.ArrayList;
@@ -318,20 +321,23 @@ public static void main(final String[] args) throws IOException, URISyntaxExcept
318321
if (file.equals("-")) {
319322
mboxListener = null;
320323
} else if (file.startsWith("+")) {
321-
final File mbox = new File(file.substring(1));
322-
System.out.println("Appending to file " + mbox);
323-
mboxListener = new MboxListener(new BufferedWriter(new FileWriter(mbox, true)), eol, printHash, printMarker, checkSequence);
324+
final Path mboxPath = Paths.get(file.substring(1));
325+
System.out.println("Appending to file " + mboxPath);
326+
mboxListener = new MboxListener(Files.newBufferedWriter(mboxPath, Charset.defaultCharset(), StandardOpenOption.CREATE, StandardOpenOption.APPEND),
327+
eol, printHash, printMarker, checkSequence);
324328
} else if (file.startsWith("-")) {
325-
final File mbox = new File(file.substring(1));
326-
System.out.println("Writing to file " + mbox);
327-
mboxListener = new MboxListener(new BufferedWriter(new FileWriter(mbox, false)), eol, printHash, printMarker, checkSequence);
329+
final Path mboxPath = Paths.get(file.substring(1));
330+
System.out.println("Writing to file " + mboxPath);
331+
mboxListener = new MboxListener(Files.newBufferedWriter(mboxPath, Charset.defaultCharset(), StandardOpenOption.CREATE), eol, printHash, printMarker,
332+
checkSequence);
328333
} else {
329-
final File mboxFile = new File(file);
330-
if (mboxFile.exists() && mboxFile.length() > 0) {
331-
throw new IOException("mailbox file: " + mboxFile + " already exists and is non-empty!");
334+
final Path mboxPath = Paths.get(file);
335+
if (Files.exists(mboxPath) && Files.size(mboxPath) > 0) {
336+
throw new IOException("mailbox file: " + mboxPath + " already exists and is non-empty!");
332337
}
333-
System.out.println("Creating file " + mboxFile);
334-
mboxListener = new MboxListener(new BufferedWriter(new FileWriter(mboxFile)), eol, printHash, printMarker, checkSequence);
338+
System.out.println("Creating file " + mboxPath);
339+
mboxListener = new MboxListener(Files.newBufferedWriter(mboxPath, Charset.defaultCharset(), StandardOpenOption.CREATE), eol, printHash, printMarker,
340+
checkSequence);
335341
}
336342

337343
final String path = uri.getPath();

‎src/main/java/org/apache/commons/net/examples/mail/IMAPImportMbox.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919

2020
import java.io.BufferedReader;
2121
import java.io.File;
22-
import java.io.FileReader;
2322
import java.io.IOException;
2423
import java.net.URI;
24+
import java.nio.charset.Charset;
25+
import java.nio.file.Files;
26+
import java.nio.file.Paths;
2527
import java.util.ArrayList;
2628
import java.util.BitSet;
2729
import java.util.List;
@@ -133,30 +135,28 @@ public static void main(final String[] args) throws IOException {
133135
int loaded = 0;
134136
try {
135137
imap.setSoTimeout(6000);
136-
137-
final BufferedReader br = new BufferedReader(new FileReader(file)); // TODO charset?
138-
139-
String line;
140-
final StringBuilder sb = new StringBuilder();
141138
boolean wanted = false; // Skip any leading rubbish
142-
while ((line = br.readLine()) != null) {
143-
if (line.startsWith("From ")) { // start of message; i.e. end of previous (if any)
144-
if (process(sb, imap, folder, total)) { // process previous message (if any)
145-
loaded++;
139+
final StringBuilder sb = new StringBuilder();
140+
try (BufferedReader br = Files.newBufferedReader(Paths.get(file), Charset.defaultCharset())) {
141+
String line;
142+
while ((line = br.readLine()) != null) {
143+
if (line.startsWith("From ")) { // start of message; i.e. end of previous (if any)
144+
if (process(sb, imap, folder, total)) { // process previous message (if any)
145+
loaded++;
146+
}
147+
sb.setLength(0);
148+
total++;
149+
wanted = wanted(total, line, msgNums, contains);
150+
} else if (startsWith(line, PATFROM)) { // Unescape ">+From " in body text
151+
line = line.substring(1);
152+
}
153+
// TODO process first Received: line to determine arrival date?
154+
if (wanted) {
155+
sb.append(line);
156+
sb.append(CRLF);
146157
}
147-
sb.setLength(0);
148-
total++;
149-
wanted = wanted(total, line, msgNums, contains);
150-
} else if (startsWith(line, PATFROM)) { // Unescape ">+From " in body text
151-
line = line.substring(1);
152-
}
153-
// TODO process first Received: line to determine arrival date?
154-
if (wanted) {
155-
sb.append(line);
156-
sb.append(CRLF);
157158
}
158159
}
159-
br.close();
160160
if (wanted && process(sb, imap, folder, total)) { // last message (if any)
161161
loaded++;
162162
}

‎src/main/java/org/apache/commons/net/examples/mail/POP3Mail.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
import java.io.BufferedReader;
2121
import java.io.IOException;
22-
import java.io.PrintWriter;
2322
import java.util.Locale;
2423

2524
import org.apache.commons.net.PrintCommandListener;
25+
import org.apache.commons.net.io.Util;
2626
import org.apache.commons.net.pop3.POP3Client;
2727
import org.apache.commons.net.pop3.POP3MessageInfo;
2828
import org.apache.commons.net.pop3.POP3SClient;
@@ -77,7 +77,7 @@ public static void main(final String[] args) {
7777
pop3.setDefaultTimeout(60000);
7878

7979
// suppress login details
80-
pop3.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out), true));
80+
pop3.addProtocolCommandListener(new PrintCommandListener(Util.newPrintWriter(System.out), true));
8181

8282
try {
8383
pop3.connect(server);

‎src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919

2020
import java.io.BufferedReader;
2121
import java.io.FileNotFoundException;
22-
import java.io.FileReader;
2322
import java.io.IOException;
2423
import java.io.InputStreamReader;
25-
import java.io.PrintWriter;
2624
import java.io.Writer;
25+
import java.nio.charset.Charset;
26+
import java.nio.file.Files;
27+
import java.nio.file.Paths;
2728
import java.util.ArrayList;
2829
import java.util.List;
2930

@@ -49,7 +50,7 @@ public static void main(final String[] args) {
4950
String cc;
5051
final List<String> ccList = new ArrayList<>();
5152
final BufferedReader stdin;
52-
FileReader fileReader = null;
53+
BufferedReader fileReader = null;
5354
final Writer writer;
5455
final SimpleSMTPHeader header;
5556
final SMTPClient client;
@@ -61,7 +62,7 @@ public static void main(final String[] args) {
6162

6263
server = args[0];
6364

64-
stdin = new BufferedReader(new InputStreamReader(System.in));
65+
stdin = new BufferedReader(new InputStreamReader(System.in, Charset.defaultCharset()));
6566

6667
try {
6768
System.out.print("From: ");
@@ -101,13 +102,13 @@ public static void main(final String[] args) {
101102
fileName = stdin.readLine();
102103

103104
try {
104-
fileReader = new FileReader(fileName);
105+
fileReader = Files.newBufferedReader(Paths.get(fileName), Charset.defaultCharset());
105106
} catch (final FileNotFoundException e) {
106107
System.err.println("File not found. " + e.getMessage());
107108
}
108109

109110
client = new SMTPClient();
110-
client.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out), true));
111+
client.addProtocolCommandListener(new PrintCommandListener(Util.newPrintWriter(System.out), true));
111112

112113
client.connect(server);
113114

‎src/main/java/org/apache/commons/net/examples/mail/Utils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.io.Console;
2222
import java.io.IOException;
2323
import java.io.InputStreamReader;
24+
import java.nio.charset.Charset;
2425
import java.util.Locale;
2526

2627
/**
@@ -40,7 +41,7 @@ final class Utils {
4041
*/
4142
static String getPassword(final String user, String password) throws IOException {
4243
if ("-".equals(password)) { // stdin
43-
final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
44+
final BufferedReader in = new BufferedReader(new InputStreamReader(System.in, Charset.defaultCharset()));
4445
password = in.readLine();
4546
} else if ("*".equals(password)) { // console
4647
final Console con = System.console(); // Java 1.6

‎src/main/java/org/apache/commons/net/examples/nntp/ArticleReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
import java.io.BufferedReader;
2121
import java.io.IOException;
22-
import java.io.PrintWriter;
2322
import java.net.SocketException;
2423

2524
import org.apache.commons.net.PrintCommandListener;
25+
import org.apache.commons.net.io.Util;
2626
import org.apache.commons.net.nntp.NNTPClient;
2727
import org.apache.commons.net.nntp.NewsgroupInfo;
2828

@@ -44,7 +44,7 @@ public static void main(final String[] args) throws SocketException, IOException
4444
final String articleSpec = args.length >= 3 ? args[2] : null;
4545

4646
final NNTPClient client = new NNTPClient();
47-
client.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out), true));
47+
client.addProtocolCommandListener(new PrintCommandListener(Util.newPrintWriter(System.out), true));
4848
client.connect(hostname);
4949

5050
if (args.length == 5) { // Optional auth

‎src/main/java/org/apache/commons/net/examples/nntp/ExtendedNNTPOps.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
package org.apache.commons.net.examples.nntp;
1919

2020
import java.io.IOException;
21-
import java.io.PrintWriter;
2221

2322
import org.apache.commons.net.PrintCommandListener;
23+
import org.apache.commons.net.io.Util;
2424
import org.apache.commons.net.nntp.Article;
2525
import org.apache.commons.net.nntp.NNTPClient;
2626
import org.apache.commons.net.nntp.NewsgroupInfo;
@@ -47,7 +47,7 @@ public static void main(final String[] args) {
4747

4848
public ExtendedNNTPOps() {
4949
client = new NNTPClient();
50-
client.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out), true));
50+
client.addProtocolCommandListener(new PrintCommandListener(Util.newPrintWriter(System.out), true));
5151
}
5252

5353
private void demo(final String host, final String user, final String password) {

‎src/main/java/org/apache/commons/net/examples/nntp/MessageThreading.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
package org.apache.commons.net.examples.nntp;
1919

2020
import java.io.IOException;
21-
import java.io.PrintWriter;
2221
import java.net.SocketException;
2322

2423
import org.apache.commons.net.PrintCommandListener;
24+
import org.apache.commons.net.io.Util;
2525
import org.apache.commons.net.nntp.Article;
2626
import org.apache.commons.net.nntp.NNTPClient;
2727
import org.apache.commons.net.nntp.NewsgroupInfo;
@@ -42,7 +42,7 @@ public static void main(final String[] args) throws SocketException, IOException
4242
final String newsgroup = args[1];
4343

4444
final NNTPClient client = new NNTPClient();
45-
client.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out), true));
45+
client.addProtocolCommandListener(new PrintCommandListener(Util.newPrintWriter(System.out), true));
4646
client.connect(hostname);
4747

4848
if (args.length == 4) { // Optional auth

‎src/main/java/org/apache/commons/net/examples/nntp/PostMessage.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919

2020
import java.io.BufferedReader;
2121
import java.io.FileNotFoundException;
22-
import java.io.FileReader;
2322
import java.io.IOException;
2423
import java.io.InputStreamReader;
25-
import java.io.PrintWriter;
24+
import java.io.Reader;
2625
import java.io.Writer;
26+
import java.nio.charset.Charset;
27+
import java.nio.file.Files;
28+
import java.nio.file.Paths;
2729

2830
import org.apache.commons.net.PrintCommandListener;
2931
import org.apache.commons.net.io.Util;
@@ -47,7 +49,7 @@ public static void main(final String[] args) {
4749
final String organization;
4850
final String references;
4951
final BufferedReader stdin;
50-
FileReader fileReader = null;
52+
Reader fileReader = null;
5153
final SimpleNNTPHeader header;
5254
final NNTPClient client;
5355

@@ -58,7 +60,7 @@ public static void main(final String[] args) {
5860

5961
server = args[0];
6062

61-
stdin = new BufferedReader(new InputStreamReader(System.in));
63+
stdin = new BufferedReader(new InputStreamReader(System.in, Charset.defaultCharset()));
6264

6365
try {
6466
System.out.print("From: ");
@@ -123,14 +125,14 @@ public static void main(final String[] args) {
123125
fileName = stdin.readLine();
124126

125127
try {
126-
fileReader = new FileReader(fileName);
128+
fileReader = Files.newBufferedReader(Paths.get(fileName), Charset.defaultCharset());
127129
} catch (final FileNotFoundException e) {
128130
System.err.println("File not found. " + e.getMessage());
129131
System.exit(1);
130132
}
131133

132134
client = new NNTPClient();
133-
client.addProtocolCommandListener(new PrintCommandListener(new PrintWriter(System.out), true));
135+
client.addProtocolCommandListener(new PrintCommandListener(Util.newPrintWriter(System.out), true));
134136

135137
client.connect(server);
136138

0 commit comments

Comments
 (0)