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 2020/09/20 19:04:57 UTC
[commons-net] 01/09: Use Java 7 diamonds.
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 089220322e79ed4a1f1bbc9291e8633d24282ae0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Sep 20 14:55:09 2020 -0400
Use Java 7 diamonds.
---
.../org/apache/commons/net/examples/mail/IMAPExportMbox.java | 2 +-
.../java/org/apache/commons/net/examples/mail/SMTPMail.java | 2 +-
.../java/org/apache/commons/net/examples/nntp/NNTPUtils.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTP.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPClient.java | 8 ++++----
src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java | 2 +-
.../java/org/apache/commons/net/ftp/FTPListParseEngine.java | 10 +++++-----
.../org/apache/commons/net/ftp/parser/MLSxEntryParser.java | 2 +-
.../commons/net/ftp/parser/VMSVersioningFTPEntryParser.java | 2 +-
src/main/java/org/apache/commons/net/imap/IMAP.java | 2 +-
src/main/java/org/apache/commons/net/nntp/Article.java | 2 +-
src/main/java/org/apache/commons/net/nntp/NNTPClient.java | 6 +++---
src/main/java/org/apache/commons/net/nntp/Threader.java | 4 ++--
src/main/java/org/apache/commons/net/ntp/TimeInfo.java | 4 ++--
src/main/java/org/apache/commons/net/pop3/POP3.java | 2 +-
src/main/java/org/apache/commons/net/smtp/RelayPath.java | 2 +-
src/main/java/org/apache/commons/net/util/ListenerList.java | 2 +-
.../apache/commons/net/ftp/FTPClientConfigFunctionalTest.java | 2 +-
.../apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java | 4 ++--
src/test/java/org/apache/commons/net/tftp/TFTPServer.java | 2 +-
src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java | 2 +-
22 files changed, 34 insertions(+), 34 deletions(-)
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 1b3b15c..7b13f08 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
@@ -332,7 +332,7 @@ public final class IMAPExportMbox
private final BufferedWriter bw;
volatile int total = 0;
volatile String lastFetched;
- volatile List<String> missingIds = new ArrayList<String>();
+ volatile List<String> missingIds = new ArrayList<>();
volatile long lastSeq = -1;
private final String eol;
private final SimpleDateFormat DATE_FORMAT // for mbox From_ lines
diff --git a/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java b/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java
index adf26ed..eac3dbc 100644
--- a/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java
+++ b/src/main/java/org/apache/commons/net/examples/mail/SMTPMail.java
@@ -45,7 +45,7 @@ public final class SMTPMail
public static void main(String[] args)
{
String sender, recipient, subject, fileName, server, cc;
- List<String> ccList = new ArrayList<String>();
+ List<String> ccList = new ArrayList<>();
BufferedReader stdin;
FileReader fileReader = null;
Writer writer;
diff --git a/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java b/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java
index a1f8afb..2db46c4 100644
--- a/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java
+++ b/src/main/java/org/apache/commons/net/examples/nntp/NNTPUtils.java
@@ -38,7 +38,7 @@ public class NNTPUtils {
*/
public static List<Article> getArticleInfo(NNTPClient client, long lowArticleNumber, long highArticleNumber)
throws IOException {
- List<Article> articles = new ArrayList<Article>();
+ List<Article> articles = new ArrayList<>();
Iterable<Article> arts = client.iterateArticleInfo(lowArticleNumber, highArticleNumber);
for(Article article : arts){
articles.add(article);
diff --git a/src/main/java/org/apache/commons/net/ftp/FTP.java b/src/main/java/org/apache/commons/net/ftp/FTP.java
index bc62e15..8745692 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTP.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTP.java
@@ -269,7 +269,7 @@ public class FTP extends SocketClient
{
super();
setDefaultPort(DEFAULT_PORT);
- _replyLines = new ArrayList<String>();
+ _replyLines = new ArrayList<>();
_newReplyString = false;
_replyString = null;
_controlEncoding = DEFAULT_CONTROL_ENCODING;
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 8b1379f..4555e62 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClient.java
@@ -973,7 +973,7 @@ implements Configurable
// Exception claiming we're not connected
if ( __autodetectEncoding )
{
- ArrayList<String> oldReplyLines = new ArrayList<String> (_replyLines);
+ ArrayList<String> oldReplyLines = new ArrayList<> (_replyLines);
int oldReplyCode = _replyCode;
if ( hasFeature("UTF8") || hasFeature("UTF-8")) // UTF8 appears to be the default
{
@@ -2421,7 +2421,7 @@ implements Configurable
}
boolean success = FTPReply.isPositiveCompletion(replyCode);
// we init the map here, so we don't keep trying if we know the command will fail
- __featuresMap = new HashMap<String, Set<String>>();
+ __featuresMap = new HashMap<>();
if (!success) {
return false;
}
@@ -2439,7 +2439,7 @@ implements Configurable
key = key.toUpperCase(Locale.ENGLISH);
Set<String> entries = __featuresMap.get(key);
if (entries == null) {
- entries = new HashSet<String>();
+ entries = new HashSet<>();
__featuresMap.put(key, entries);
}
entries.add(value);
@@ -2958,7 +2958,7 @@ implements Configurable
BufferedReader reader =
new BufferedReader(new InputStreamReader(socket.getInputStream(), getControlEncoding()));
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
String line;
while ((line = reader.readLine()) != null) {
results.add(line);
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java b/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
index ae8f593..10d56eb 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
@@ -367,7 +367,7 @@ public class FTPClientConfig
this.shortMonthNames = config.shortMonthNames;
}
- private static final Map<String, Object> LANGUAGE_CODE_MAP = new TreeMap<String, Object>();
+ private static final Map<String, Object> LANGUAGE_CODE_MAP = new TreeMap<>();
static {
// if there are other commonly used month name encodings which
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 2009449..d5f1114 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
@@ -205,7 +205,7 @@ public class FTPHTTPClient extends FTPClient {
}
output.write(CRLF);
- List<String> response = new ArrayList<String>();
+ List<String> response = new ArrayList<>();
BufferedReader reader = new BufferedReader(
new InputStreamReader(input, getCharset()));
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 87eca30..b409915 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
@@ -75,7 +75,7 @@ import org.apache.commons.net.util.Charsets;
* uses this class transparently.
*/
public class FTPListParseEngine {
- private List<String> entries = new LinkedList<String>();
+ private List<String> entries = new LinkedList<>();
private ListIterator<String> _internalIterator = entries.listIterator();
private final FTPFileEntryParser parser;
@@ -114,7 +114,7 @@ public class FTPListParseEngine {
public void readServerList(InputStream stream, String encoding)
throws IOException
{
- this.entries = new LinkedList<String>();
+ this.entries = new LinkedList<>();
readStream(stream, encoding);
this.parser.preParse(this.entries);
resetIterator();
@@ -173,7 +173,7 @@ public class FTPListParseEngine {
* check each entry for null before referencing it.
*/
public FTPFile[] getNext(int quantityRequested) {
- List<FTPFile> tmpResults = new LinkedList<FTPFile>();
+ List<FTPFile> tmpResults = new LinkedList<>();
int count = quantityRequested;
while (count > 0 && this._internalIterator.hasNext()) {
String entry = this._internalIterator.next();
@@ -215,7 +215,7 @@ public class FTPListParseEngine {
* check each entry for null before referencing it.
*/
public FTPFile[] getPrevious(int quantityRequested) {
- List<FTPFile> tmpResults = new LinkedList<FTPFile>();
+ List<FTPFile> tmpResults = new LinkedList<>();
int count = quantityRequested;
while (count > 0 && this._internalIterator.hasPrevious()) {
String entry = this._internalIterator.previous();
@@ -265,7 +265,7 @@ public class FTPListParseEngine {
public FTPFile[] getFiles(FTPFileFilter filter)
throws IOException // TODO remove; not actually thrown
{
- List<FTPFile> tmpResults = new ArrayList<FTPFile>();
+ List<FTPFile> tmpResults = new ArrayList<>();
Iterator<String> iter = this.entries.iterator();
while (iter.hasNext()) {
String entry = iter.next();
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
index 6cdf9ea..ee985c2 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java
@@ -59,7 +59,7 @@ public class MLSxEntryParser extends FTPFileEntryParserImpl
// This class is immutable, so a single instance can be shared.
private static final MLSxEntryParser PARSER = new MLSxEntryParser();
- private static final HashMap<String, Integer> TYPE_TO_INT = new HashMap<String, Integer>();
+ private static final HashMap<String, Integer> TYPE_TO_INT = new HashMap<>();
static {
TYPE_TO_INT.put("file", Integer.valueOf(FTPFile.FILE_TYPE));
TYPE_TO_INT.put("cdir", Integer.valueOf(FTPFile.DIRECTORY_TYPE)); // listed directory
diff --git a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
index ad445fd..2e2619a 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
@@ -102,7 +102,7 @@ public class VMSVersioningFTPEntryParser extends VMSFTPEntryParser
*/
@Override
public List<String> preParse(List<String> original) {
- HashMap<String, Integer> existingEntries = new HashMap<String, Integer>();
+ HashMap<String, Integer> existingEntries = new HashMap<>();
ListIterator<String> iter = original.listIterator();
while (iter.hasNext()) {
String entry = iter.next().trim();
diff --git a/src/main/java/org/apache/commons/net/imap/IMAP.java b/src/main/java/org/apache/commons/net/imap/IMAP.java
index ddcca6a..9ac0290 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAP.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAP.java
@@ -121,7 +121,7 @@ public class IMAP extends SocketClient
__state = IMAPState.DISCONNECTED_STATE;
_reader = null;
__writer = null;
- _replyLines = new ArrayList<String>();
+ _replyLines = new ArrayList<>();
createCommandSupport();
}
diff --git a/src/main/java/org/apache/commons/net/nntp/Article.java b/src/main/java/org/apache/commons/net/nntp/Article.java
index ba23507..a2ad1b9 100644
--- a/src/main/java/org/apache/commons/net/nntp/Article.java
+++ b/src/main/java/org/apache/commons/net/nntp/Article.java
@@ -49,7 +49,7 @@ public class Article implements Threadable {
return;
}
if (references == null) {
- references = new ArrayList<String>();
+ references = new ArrayList<>();
}
isReply = true;
for(String s : msgId.split(" ")) {
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 be3f0de..53e4fd8 100644
--- a/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
+++ b/src/main/java/org/apache/commons/net/nntp/NNTPClient.java
@@ -247,7 +247,7 @@ public class NNTPClient extends NNTP
BufferedReader reader = new DotTerminatedMessageReader(_reader_);
// Start of with a big vector because we may be reading a very large
// amount of groups.
- Vector<NewsgroupInfo> list = new Vector<NewsgroupInfo>(2048);
+ Vector<NewsgroupInfo> list = new Vector<>(2048);
String line;
try {
@@ -791,7 +791,7 @@ public class NNTPClient extends NNTP
BufferedReader reader = new DotTerminatedMessageReader(_reader_);
String line;
- ArrayList<String> list = new ArrayList<String>();
+ ArrayList<String> list = new ArrayList<>();
while((line=reader.readLine()) != null) {
list.add(line);
}
@@ -1264,7 +1264,7 @@ public class NNTPClient extends NNTP
return null;
}
- Vector<String> list = new Vector<String>();
+ Vector<String> list = new Vector<>();
BufferedReader reader = new DotTerminatedMessageReader(_reader_);
String line;
diff --git a/src/main/java/org/apache/commons/net/nntp/Threader.java b/src/main/java/org/apache/commons/net/nntp/Threader.java
index d638594..37244b9 100644
--- a/src/main/java/org/apache/commons/net/nntp/Threader.java
+++ b/src/main/java/org/apache/commons/net/nntp/Threader.java
@@ -57,7 +57,7 @@ public class Threader {
return null;
}
- HashMap<String,ThreadContainer> idTable = new HashMap<String,ThreadContainer>();
+ HashMap<String,ThreadContainer> idTable = new HashMap<>();
// walk through each Threadable element
for (Threadable t : messages) {
@@ -309,7 +309,7 @@ public class Threader {
}
// TODO verify this will avoid rehashing
- HashMap<String, ThreadContainer> subjectTable = new HashMap<String, ThreadContainer>((int) (count * 1.2), (float) 0.9);
+ HashMap<String, ThreadContainer> subjectTable = new HashMap<>((int) (count * 1.2), (float) 0.9);
count = 0;
for (ThreadContainer c = root.child; c != null; c = c.next) {
diff --git a/src/main/java/org/apache/commons/net/ntp/TimeInfo.java b/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
index c3903b1..1af502b 100644
--- a/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
+++ b/src/main/java/org/apache/commons/net/ntp/TimeInfo.java
@@ -120,7 +120,7 @@ public class TimeInfo {
public void addComment(String comment)
{
if (_comments == null) {
- _comments = new ArrayList<String>();
+ _comments = new ArrayList<>();
}
_comments.add(comment);
}
@@ -136,7 +136,7 @@ public class TimeInfo {
}
_detailsComputed = true;
if (_comments == null) {
- _comments = new ArrayList<String>();
+ _comments = new ArrayList<>();
}
TimeStamp origNtpTime = _message.getOriginateTimeStamp();
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 915c362..7868bbc 100644
--- a/src/main/java/org/apache/commons/net/pop3/POP3.java
+++ b/src/main/java/org/apache/commons/net/pop3/POP3.java
@@ -104,7 +104,7 @@ public class POP3 extends SocketClient
__popState = DISCONNECTED_STATE;
_reader = null;
_writer = null;
- _replyLines = new ArrayList<String>();
+ _replyLines = new ArrayList<>();
_commandSupport_ = new ProtocolCommandSupport(this);
}
diff --git a/src/main/java/org/apache/commons/net/smtp/RelayPath.java b/src/main/java/org/apache/commons/net/smtp/RelayPath.java
index 0fbe98d..5271b38 100644
--- a/src/main/java/org/apache/commons/net/smtp/RelayPath.java
+++ b/src/main/java/org/apache/commons/net/smtp/RelayPath.java
@@ -42,7 +42,7 @@ public final class RelayPath
***/
public RelayPath(String emailAddress)
{
- _path = new Vector<String>();
+ _path = new Vector<>();
_emailAddress = emailAddress;
}
diff --git a/src/main/java/org/apache/commons/net/util/ListenerList.java b/src/main/java/org/apache/commons/net/util/ListenerList.java
index 10a3ffc..79857c7 100644
--- a/src/main/java/org/apache/commons/net/util/ListenerList.java
+++ b/src/main/java/org/apache/commons/net/util/ListenerList.java
@@ -33,7 +33,7 @@ public class ListenerList implements Serializable, Iterable<EventListener>
public ListenerList()
{
- __listeners = new CopyOnWriteArrayList<EventListener>();
+ __listeners = new CopyOnWriteArrayList<>();
}
public void addListener(EventListener listener)
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 26db09f..867149d 100644
--- a/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
@@ -97,7 +97,7 @@ public class FTPClientConfigFunctionalTest extends TestCase {
private TreeSet<FTPFile> getSortedList(FTPFile[] files) {
// create a TreeSet which will sort each element
// as it is added.
- TreeSet<FTPFile> sorted = new TreeSet<FTPFile>(new Comparator<Object>() {
+ TreeSet<FTPFile> sorted = new TreeSet<>(new Comparator<Object>() {
@Override
public int compare(Object o1, Object o2) {
diff --git a/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java b/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
index 768bae8..53cd2c1 100644
--- a/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
+++ b/src/test/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParserTest.java
@@ -102,7 +102,7 @@ public class MVSFTPEntryParserTest extends FTPParseTestFramework {
}
protected List<String[]> getAllGoodListings() {
- List<String[]> l = new ArrayList<String[]>();
+ List<String[]> l = new ArrayList<>();
l.add(goodsamplesDatasetList);
l.add(goodsamplesMemberList);
l.add(goodsamplesJES1List);
@@ -175,7 +175,7 @@ public class MVSFTPEntryParserTest extends FTPParseTestFramework {
public void testUnixListings() {
MVSFTPEntryParser parser = new MVSFTPEntryParser();
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
Collections.addAll(list, goodsamplesUnixList);
parser.preParse(list);
for (String test : list) {
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
index 2778904..975b20a 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServer.java
@@ -86,7 +86,7 @@ public class TFTPServer implements Runnable
private static final int DEFAULT_TFTP_PORT = 69;
public static enum ServerMode { GET_ONLY, PUT_ONLY, GET_AND_PUT; }
- private final HashSet<TFTPTransfer> transfers_ = new HashSet<TFTPTransfer>();
+ private final HashSet<TFTPTransfer> transfers_ = new HashSet<>();
private volatile boolean shutdownServer = false;
private TFTP serverTftp_;
private File serverReadDirectory_;
diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java b/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
index ecb5809..abb6c25 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPServerMain.java
@@ -41,7 +41,7 @@ public class TFTPServerMain {
public static void main(String [] args) throws Exception {
int port = 6901;
int argc;
- Map<String,String> opts = new HashMap<String,String>();
+ Map<String,String> opts = new HashMap<>();
opts.put("-p", System.getProperty("java.io.tmpdir"));
// Parse options
for (argc = 0; argc < args.length; argc++)