This is an automated email from the ASF dual-hosted git repository.
sebb 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 49505c4 Fix up Charset usage for Java 7+
49505c4 is described below
commit 49505c42e732fff659b99357dc6f2e74cd07f0a6
Author: Sebb <s...@apache.org>
AuthorDate: Mon Jun 22 23:48:37 2020 +0100
Fix up Charset usage for Java 7+
---
.../java/org/apache/commons/net/examples/mail/POP3ExportMbox.java | 6 +++---
src/main/java/org/apache/commons/net/nntp/NNTP.java | 4 +++-
src/main/java/org/apache/commons/net/pop3/POP3.java | 4 +++-
src/main/java/org/apache/commons/net/smtp/SMTP.java | 4 +++-
4 files changed, 12 insertions(+), 6 deletions(-)
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 f1b8d16..59a103e 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
@@ -22,7 +22,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.regex.Matcher;
@@ -142,14 +142,14 @@ public final class POP3ExportMbox
// Currently POP3Client uses iso-8859-1
for (int i = 1; i <= count; i++) {
OutputStreamWriter fw = new OutputStreamWriter(
- new FileOutputStream(new
File(mbox,i+".eml")),Charset.forName("iso-8859-1"));
+ new FileOutputStream(new
File(mbox,i+".eml")),StandardCharsets.ISO_8859_1);
writeFile(pop3, fw, i);
fw.close();
}
} else {
System.out.println("Writing file: " + mbox);
// Currently POP3Client uses iso-8859-1
- OutputStreamWriter fw = new OutputStreamWriter(new
FileOutputStream(mbox),Charset.forName("iso-8859-1"));
+ OutputStreamWriter fw = new OutputStreamWriter(new
FileOutputStream(mbox),StandardCharsets.ISO_8859_1);
for (int i = 1; i <= count; i++) {
writeMbox(pop3, fw, i);
}
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 bc36ea0..f5b2fa3 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTP.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTP.java
@@ -22,6 +22,8 @@ import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.net.MalformedServerReplyException;
import org.apache.commons.net.ProtocolCommandSupport;
@@ -85,7 +87,7 @@ 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 String __DEFAULT_ENCODING = "ISO-8859-1";
+ private static final Charset __DEFAULT_ENCODING =
StandardCharsets.ISO_8859_1;
boolean _isAllowedToPost;
int _replyCode;
diff --git a/src/main/java/org/apache/commons/net/pop3/POP3.java
b/src/main/java/org/apache/commons/net/pop3/POP3.java
index 5522c2f..915c362 100644
--- a/src/main/java/org/apache/commons/net/pop3/POP3.java
+++ b/src/main/java/org/apache/commons/net/pop3/POP3.java
@@ -23,6 +23,8 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -76,7 +78,7 @@ public class POP3 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.
- static final String _DEFAULT_ENCODING = "ISO-8859-1";
+ static final Charset _DEFAULT_ENCODING = StandardCharsets.ISO_8859_1;
private int __popState;
BufferedWriter _writer;
diff --git a/src/main/java/org/apache/commons/net/smtp/SMTP.java
b/src/main/java/org/apache/commons/net/smtp/SMTP.java
index c09dca4..9601bc9 100644
--- a/src/main/java/org/apache/commons/net/smtp/SMTP.java
+++ b/src/main/java/org/apache/commons/net/smtp/SMTP.java
@@ -22,6 +22,8 @@ import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import org.apache.commons.net.MalformedServerReplyException;
@@ -89,7 +91,7 @@ public class SMTP 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 String __DEFAULT_ENCODING = "ISO-8859-1";
+ private static final Charset __DEFAULT_ENCODING =
StandardCharsets.ISO_8859_1;
/**
* The encoding to use (user-settable).
