Project: javamail
Repository: mercurial
Revision: 861
Author: shannon
Date: 2016-08-31 23:57:52 UTC
Link:
Log Message:
------------
Exploit Java SE 7 diamond inference
Add missing @Overrides
fix copyright dates
fix copyright date
Revisions:
----------
858
859
860
861
Modified Paths:
---------------
mail/src/main/java/com/sun/mail/iap/Argument.java
mail/src/main/java/com/sun/mail/iap/Protocol.java
mail/src/main/java/com/sun/mail/iap/Response.java
mail/src/main/java/com/sun/mail/imap/IMAPFolder.java
mail/src/main/java/com/sun/mail/imap/IMAPMessage.java
mail/src/main/java/com/sun/mail/imap/IMAPMultipartDataSource.java
mail/src/main/java/com/sun/mail/imap/IMAPStore.java
mail/src/main/java/com/sun/mail/imap/IdleManager.java
mail/src/main/java/com/sun/mail/imap/MessageCache.java
mail/src/main/java/com/sun/mail/imap/Rights.java
mail/src/main/java/com/sun/mail/imap/Utility.java
mail/src/main/java/com/sun/mail/imap/protocol/BODYSTRUCTURE.java
mail/src/main/java/com/sun/mail/imap/protocol/ENVELOPE.java
mail/src/main/java/com/sun/mail/imap/protocol/FetchResponse.java
mail/src/main/java/com/sun/mail/imap/protocol/ID.java
mail/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
mail/src/main/java/com/sun/mail/imap/protocol/IMAPResponse.java
mail/src/main/java/com/sun/mail/imap/protocol/IMAPSaslAuthenticator.java
mail/src/main/java/com/sun/mail/imap/protocol/ListInfo.java
mail/src/main/java/com/sun/mail/imap/protocol/MailboxInfo.java
mail/src/main/java/com/sun/mail/imap/protocol/MessageSet.java
mail/src/main/java/com/sun/mail/imap/protocol/Namespaces.java
mail/src/main/java/com/sun/mail/imap/protocol/Status.java
mail/src/main/java/com/sun/mail/imap/protocol/UIDSet.java
mail/src/main/java/com/sun/mail/pop3/POP3Message.java
mail/src/main/java/com/sun/mail/pop3/Protocol.java
mail/src/main/java/com/sun/mail/smtp/DigestMD5.java
mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
mail/src/main/java/com/sun/mail/util/SocketFetcher.java
mail/src/main/java/com/sun/mail/util/logging/LogManagerProperties.java
mail/src/main/java/com/sun/mail/util/logging/MailHandler.java
mail/src/main/java/javax/mail/EventQueue.java
mail/src/main/java/javax/mail/FetchProfile.java
mail/src/main/java/javax/mail/Flags.java
mail/src/main/java/javax/mail/Folder.java
mail/src/main/java/javax/mail/Multipart.java
mail/src/main/java/javax/mail/Service.java
mail/src/main/java/javax/mail/Session.java
mail/src/main/java/javax/mail/Store.java
mail/src/main/java/javax/mail/Transport.java
mail/src/main/java/javax/mail/internet/InternetAddress.java
mail/src/main/java/javax/mail/internet/InternetHeaders.java
mail/src/main/java/javax/mail/internet/MimeBodyPart.java
mail/src/main/java/javax/mail/internet/MimeMessage.java
mail/src/main/java/javax/mail/internet/MimeUtility.java
mail/src/main/java/javax/mail/internet/NewsAddress.java
mail/src/main/java/javax/mail/internet/ParameterList.java
mail/src/test/java/com/sun/mail/imap/IMAPFetchProfileTest.java
mail/src/test/java/com/sun/mail/imap/protocol/UIDSetTest.java
mail/src/test/java/com/sun/mail/test/TestServer.java
mail/src/test/java/com/sun/mail/util/UUDecoderStreamTest.java
mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java
mail/src/test/java/com/sun/mail/util/logging/AbstractLogging.java
mail/src/test/java/com/sun/mail/util/logging/LogManagerPropertiesTest.java
mail/src/test/java/com/sun/mail/util/logging/MailHandlerTest.java
mail/src/test/java/com/sun/mail/util/logging/SeverityComparatorTest.java
mail/src/test/java/javax/mail/internet/FoldTest.java
mail/src/test/java/javax/mail/internet/HeaderTokenizerTest.java
mail/src/test/java/javax/mail/internet/InternetAddressFoldTest.java
mail/src/test/java/javax/mail/internet/InternetAddressTest.java
mail/src/main/java/com/sun/mail/auth/OAuth2SaslClient.java
mail/src/main/java/com/sun/mail/auth/OAuth2SaslClientFactory.java
mail/src/main/java/com/sun/mail/handlers/handler_base.java
mail/src/main/java/com/sun/mail/handlers/image_gif.java
mail/src/main/java/com/sun/mail/handlers/image_jpeg.java
mail/src/main/java/com/sun/mail/handlers/message_rfc822.java
mail/src/main/java/com/sun/mail/handlers/multipart_mixed.java
mail/src/main/java/com/sun/mail/handlers/text_html.java
mail/src/main/java/com/sun/mail/handlers/text_plain.java
mail/src/main/java/com/sun/mail/handlers/text_xml.java
mail/src/main/java/com/sun/mail/imap/ACL.java
mail/src/main/java/com/sun/mail/imap/DefaultFolder.java
mail/src/main/java/com/sun/mail/imap/IMAPBodyPart.java
mail/src/main/java/com/sun/mail/imap/IMAPInputStream.java
mail/src/main/java/com/sun/mail/imap/IMAPNestedMessage.java
mail/src/main/java/com/sun/mail/imap/ModifiedSinceTerm.java
mail/src/main/java/com/sun/mail/imap/OlderTerm.java
mail/src/main/java/com/sun/mail/imap/SortTerm.java
mail/src/main/java/com/sun/mail/imap/YoungerTerm.java
mail/src/main/java/com/sun/mail/pop3/AppendStream.java
mail/src/main/java/com/sun/mail/pop3/DefaultFolder.java
mail/src/main/java/com/sun/mail/pop3/POP3Folder.java
mail/src/main/java/com/sun/mail/pop3/POP3Store.java
mail/src/main/java/com/sun/mail/pop3/TempFile.java
mail/src/main/java/com/sun/mail/pop3/WritableSharedFile.java
mail/src/main/java/com/sun/mail/smtp/SMTPOutputStream.java
mail/src/main/java/com/sun/mail/smtp/SMTPSaslAuthenticator.java
mail/src/main/java/com/sun/mail/util/BASE64DecoderStream.java
mail/src/main/java/com/sun/mail/util/BASE64EncoderStream.java
mail/src/main/java/com/sun/mail/util/CRLFOutputStream.java
mail/src/main/java/com/sun/mail/util/LogOutputStream.java
mail/src/main/java/com/sun/mail/util/MailSSLSocketFactory.java
mail/src/main/java/com/sun/mail/util/MimeUtil.java
mail/src/main/java/com/sun/mail/util/QDecoderStream.java
mail/src/main/java/com/sun/mail/util/QEncoderStream.java
mail/src/main/java/com/sun/mail/util/QPDecoderStream.java
mail/src/main/java/com/sun/mail/util/QPEncoderStream.java
mail/src/main/java/com/sun/mail/util/TraceInputStream.java
mail/src/main/java/com/sun/mail/util/TraceOutputStream.java
mail/src/main/java/com/sun/mail/util/UUDecoderStream.java
mail/src/main/java/com/sun/mail/util/UUEncoderStream.java
mail/src/main/java/com/sun/mail/util/WriteTimeoutSocket.java
mail/src/main/java/javax/mail/Address.java
mail/src/main/java/javax/mail/Message.java
mail/src/main/java/javax/mail/MessagingException.java
mail/src/main/java/javax/mail/Provider.java
mail/src/main/java/javax/mail/URLName.java
mail/src/main/java/javax/mail/event/ConnectionAdapter.java
mail/src/main/java/javax/mail/event/ConnectionEvent.java
mail/src/main/java/javax/mail/event/FolderAdapter.java
mail/src/main/java/javax/mail/event/FolderEvent.java
mail/src/main/java/javax/mail/event/MessageChangedEvent.java
mail/src/main/java/javax/mail/event/MessageCountAdapter.java
mail/src/main/java/javax/mail/event/MessageCountEvent.java
mail/src/main/java/javax/mail/event/StoreEvent.java
mail/src/main/java/javax/mail/event/TransportAdapter.java
mail/src/main/java/javax/mail/event/TransportEvent.java
mail/src/main/java/javax/mail/internet/AddressException.java
mail/src/main/java/javax/mail/internet/ContentDisposition.java
mail/src/main/java/javax/mail/internet/ContentType.java
mail/src/main/java/javax/mail/internet/MimeMultipart.java
mail/src/main/java/javax/mail/internet/MimePart.java
mail/src/main/java/javax/mail/internet/MimePartDataSource.java
mail/src/main/java/javax/mail/internet/PreencodedMimeBodyPart.java
mail/src/main/java/javax/mail/search/AddressStringTerm.java
mail/src/main/java/javax/mail/search/AddressTerm.java
mail/src/main/java/javax/mail/search/AndTerm.java
mail/src/main/java/javax/mail/search/BodyTerm.java
mail/src/main/java/javax/mail/search/ComparisonTerm.java
mail/src/main/java/javax/mail/search/DateTerm.java
mail/src/main/java/javax/mail/search/FlagTerm.java
mail/src/main/java/javax/mail/search/FromStringTerm.java
mail/src/main/java/javax/mail/search/FromTerm.java
mail/src/main/java/javax/mail/search/HeaderTerm.java
mail/src/main/java/javax/mail/search/IntegerComparisonTerm.java
mail/src/main/java/javax/mail/search/MessageIDTerm.java
mail/src/main/java/javax/mail/search/MessageNumberTerm.java
mail/src/main/java/javax/mail/search/NotTerm.java
mail/src/main/java/javax/mail/search/OrTerm.java
mail/src/main/java/javax/mail/search/ReceivedDateTerm.java
mail/src/main/java/javax/mail/search/RecipientStringTerm.java
mail/src/main/java/javax/mail/search/RecipientTerm.java
mail/src/main/java/javax/mail/search/SentDateTerm.java
mail/src/main/java/javax/mail/search/SizeTerm.java
mail/src/main/java/javax/mail/search/StringTerm.java
mail/src/main/java/javax/mail/search/SubjectTerm.java
mail/src/main/java/javax/mail/util/ByteArrayDataSource.java
mail/src/main/java/javax/mail/util/SharedByteArrayInputStream.java
mail/src/main/java/javax/mail/util/SharedFileInputStream.java
mail/src/test/java/com/sun/mail/imap/IMAPAlertTest.java
mail/src/test/java/com/sun/mail/imap/IMAPCloseFailureTest.java
mail/src/test/java/com/sun/mail/imap/IMAPHandler.java
mail/src/test/java/com/sun/mail/imap/IMAPIdleManagerTest.java
mail/src/test/java/com/sun/mail/imap/IMAPIdleStateTest.java
mail/src/test/java/com/sun/mail/imap/IMAPIdleUntaggedResponseTest.java
mail/src/test/java/com/sun/mail/imap/IMAPLoginFailureTest.java
mail/src/test/java/com/sun/mail/imap/IMAPResponseEventTest.java
mail/src/test/java/com/sun/mail/imap/IMAPSaslHandler.java
mail/src/test/java/com/sun/mail/imap/IMAPUidExpungeTest.java
mail/src/test/java/com/sun/mail/pop3/POP3Handler.java
mail/src/test/java/com/sun/mail/smtp/NopServer.java
mail/src/test/java/com/sun/mail/smtp/SMTPHandler.java
mail/src/test/java/com/sun/mail/smtp/SMTPIOExceptionTest.java
mail/src/test/java/com/sun/mail/smtp/SMTPSaslHandler.java
mail/src/test/java/com/sun/mail/smtp/SMTPWriteTimeoutTest.java
mail/src/test/java/com/sun/mail/test/ClassLoaderSuite.java
mail/src/test/java/com/sun/mail/test/NullOutputStream.java
mail/src/test/java/com/sun/mail/test/ProtocolHandler.java
mail/src/test/java/com/sun/mail/test/SavedSocketFactory.java
mail/src/test/java/javax/mail/internet/EncodeFileName.java
mail/src/test/java/javax/mail/internet/MimeBodyPartTest.java
android/activation/pom.xml
android/mail/pom.xml
client/pom.xml
demo/pom.xml
dsn/pom.xml
gimap/pom.xml
imap/pom.xml
javadoc/pom.xml
logging/pom.xml
mail/src/main/java/javax/mail/MultipartDataSource.java
mail/src/main/java/javax/mail/Quota.java
mail/src/test/java/com/sun/mail/imap/protocol/IMAPProtocolTest.java
mail/src/test/java/com/sun/mail/smtp/SMTPSaslLoginTest.java
mail/src/test/java/com/sun/mail/util/ContentTypeCleaner.java
mail/src/test/java/javax/mail/internet/AllowEncodedMessages.java
mail/src/test/java/javax/mail/internet/MailDateFormatTest.java
mail/src/test/java/javax/mail/internet/MimeMultipartPropertyTest.java
mail/src/test/java/javax/mail/internet/MimeUtilityTest.java
mail/src/test/java/javax/mail/internet/ModifyMessageTest.java
mail/src/test/java/javax/mail/internet/NonAsciiBoundaryTest.java
mail/src/test/java/javax/mail/internet/RestrictEncodingTest.java
mailapi/pom.xml
mailapijar/pom.xml
mailhandler/pom.xml
mbox/native/pom.xml
oldmail/pom.xml
outlook/pom.xml
parent-distrib/pom.xml
pop3/pom.xml
publish/pom.xml
servlet/pom.xml
smtp/pom.xml
taglib/pom.xml
webapp/pom.xml
mbox/src/main/java/com/sun/mail/mbox/MboxMessage.java
Diffs:
------
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/iap/Argument.java
--- a/mail/src/main/java/com/sun/mail/iap/Argument.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/iap/Argument.java Tue Aug 30 19:45:58 2016 +0200
@@ -57,7 +57,7 @@
* Constructor
*/
public Argument() {
- items = new ArrayList<Object>(1);
+ items = new ArrayList<>(1);
}
/**
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/iap/Protocol.java
--- a/mail/src/main/java/com/sun/mail/iap/Protocol.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/iap/Protocol.java Tue Aug 30 19:45:58 2016 +0200
@@ -89,7 +89,7 @@
private String localHostName;
private final List<ResponseHandler> handlers
- = new CopyOnWriteArrayList<ResponseHandler>();
+ = new CopyOnWriteArrayList<>();
private volatile long timestamp;
@@ -332,7 +332,7 @@
*/
public synchronized Response[] command(String command, Argument args) {
commandStart(command);
- List<Response> v = new ArrayList<Response>();
+ List<Response> v = new ArrayList<>();
boolean done = false;
String tag = null;
Response r = null;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/iap/Response.java
--- a/mail/src/main/java/com/sun/mail/iap/Response.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/iap/Response.java Tue Aug 30 19:45:58 2016 +0200
@@ -287,7 +287,7 @@
}
index++; // skip '('
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
skipSpaces();
if (peekByte() != ')') {
do {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/IMAPFolder.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPFolder.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPFolder.java Tue Aug 30 19:45:58 2016 +0200
@@ -1090,7 +1090,7 @@
// process saved responses and return corresponding events
if (mi.responses != null) {
- openEvents = new ArrayList<MailEvent>();
+ openEvents = new ArrayList<>();
for (IMAPResponse ir : mi.responses) {
if (ir.keyEquals("VANISHED")) {
// "VANISHED" SP ["(EARLIER)"] SP known-uids
@@ -1279,7 +1279,7 @@
Response[] r = null;
// to collect non-FETCH responses & unsolicited FETCH FLAG responses
- List<Response> v = new ArrayList<Response>();
+ List<Response> v = new ArrayList<>();
try {
r = getProtocol().fetch(msgsets, command.toString());
} catch (ConnectionException cex) {
@@ -2560,7 +2560,7 @@
if (m != null) // found it
return m;
} else
- uidTable = new Hashtable<Long, IMAPMessage>();
+ uidTable = new Hashtable<>();
// Check with the server
// Issue UID FETCH command
@@ -2596,12 +2596,12 @@
try {
synchronized(messageCacheLock) {
if (uidTable == null)
- uidTable = new Hashtable<Long, IMAPMessage>();
+ uidTable = new Hashtable<>();
// Issue UID FETCH for given range
long[] ua = getProtocol().fetchSequenceNumbers(start, end);
- List<Message> ma = new ArrayList<Message>();
+ List<Message> ma = new ArrayList<>();
// NOTE: Below must be within messageCacheLock region
for (int i = 0; i < ua.length; i++) {
Message m = uidTable.get(Long.valueOf(ua[i]));
@@ -2635,7 +2635,7 @@
long[] unavailUids = uids;
if (uidTable != null) {
// to collect unavailable UIDs
- List<Long> v = new ArrayList<Long>();
+ List<Long> v = new ArrayList<>();
for (long uid : uids) {
if (!uidTable.containsKey(uid)) {
// This UID has not been loaded yet.
@@ -2649,7 +2649,7 @@
unavailUids[i] = v.get(i);
}
} else
- uidTable = new Hashtable<Long, IMAPMessage>();
+ uidTable = new Hashtable<>();
if (unavailUids.length > 0) {
// Issue UID FETCH request for given uids
@@ -2700,7 +2700,7 @@
// insert this message into uidTable
if (uidTable == null)
- uidTable = new Hashtable<Long, IMAPMessage>();
+ uidTable = new Hashtable<>();
uidTable.put(Long.valueOf(uid), m);
}
} catch (ConnectionException cex) {
@@ -3538,7 +3538,7 @@
if (uid != null && msg.getUID() != uid.uid) {
msg.setUID(uid.uid);
if (uidTable == null)
- uidTable = new Hashtable<Long, IMAPMessage>();
+ uidTable = new Hashtable<>();
uidTable.put(Long.valueOf(uid.uid), msg);
notify = true;
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/IMAPMessage.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPMessage.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPMessage.java Tue Aug 30 19:45:58 2016 +0200
@@ -125,7 +125,7 @@
* Could this somehow be included in the InternetHeaders object ??
*/
private Hashtable<String, String> loadedHeaders
- = new Hashtable<String, String>(1);
+ = new Hashtable<>(1);
// This is our Envelope
static final String EnvelopeCmd = "ENVELOPE INTERNALDATE RFC822.SIZE";
@@ -1102,7 +1102,7 @@
private boolean needMessage = false;
private boolean needRDate = false;
private String[] hdrs = null;
- private Set<FetchItem> need = new HashSet<FetchItem>();
+ private Set<FetchItem> need = new HashSet<>();
/**
* Create a FetchProfileCondition to determine if we need to fetch
@@ -1215,7 +1215,7 @@
// add entry into uid table
if (((IMAPFolder)folder).uidTable == null)
((IMAPFolder) folder).uidTable
- = new Hashtable<Long, IMAPMessage>();
+ = new Hashtable<>();
((IMAPFolder)folder).uidTable.put(Long.valueOf(u.uid), this);
}
@@ -1310,7 +1310,7 @@
if (extensionItems == null || extensionItems.isEmpty())
return;
if (items == null)
- items = new HashMap<String, Object>();
+ items = new HashMap<>();
items.putAll(extensionItems);
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/IMAPMultipartDataSource.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPMultipartDataSource.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPMultipartDataSource.java Tue Aug 30 19:45:58 2016 +0200
@@ -62,7 +62,7 @@
String sectionId, IMAPMessage msg) {
super(part);
- parts = new ArrayList<IMAPBodyPart>(bs.length);
+ parts = new ArrayList<>(bs.length);
for (int i = 0; i < bs.length; i++)
parts.add(
new IMAPBodyPart(bs[i],
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/IMAPStore.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPStore.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPStore.java Tue Aug 30 19:45:58 2016 +0200
@@ -256,7 +256,7 @@
// container for the pool's IMAP protocol objects
private Vector<IMAPProtocol> authenticatedConnections
- = new Vector<IMAPProtocol>();
+ = new Vector<>();
// vectore of open folders
private Vector<IMAPFolder> folders;
@@ -522,7 +522,7 @@
if (s != null && s.length() > 0) {
if (logger.isLoggable(Level.CONFIG))
logger.config("SASL mechanisms allowed: " + s);
- List<String> v = new ArrayList<String>(5);
+ List<String> v = new ArrayList<>(5);
StringTokenizer st = new StringTokenizer(s, " ,");
while (st.hasMoreTokens()) {
String m = st.nextToken();
@@ -783,7 +783,7 @@
// issue special ID command to Yahoo! Mail IMAP server
//
http://en.wikipedia.org/wiki/Yahoo%21_Mail#Free_IMAP_and_SMTPs_access
if (guid != null) {
- Map<String,String> gmap = new HashMap<String,String>();
+ Map<String,String> gmap = new HashMap<>();
gmap.put("GUID", guid);
p.id(gmap);
}
@@ -1102,7 +1102,7 @@
// Add folder to folder-list
if (folder != null) {
if (pool.folders == null)
- pool.folders = new Vector<IMAPFolder>();
+ pool.folders = new Vector<>();
pool.folders.addElement(folder);
}
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/IdleManager.java
--- a/mail/src/main/java/com/sun/mail/imap/IdleManager.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/IdleManager.java Tue Aug 30 19:45:58 2016 +0200
@@ -140,8 +140,8 @@
private MailLogger logger;
private volatile boolean die = false;
private volatile boolean running;
- private Queue<IMAPFolder> toWatch = new ConcurrentLinkedQueue<IMAPFolder>();
- private Queue<IMAPFolder> toAbort = new ConcurrentLinkedQueue<IMAPFolder>();
+ private Queue<IMAPFolder> toWatch = new ConcurrentLinkedQueue<>();
+ private Queue<IMAPFolder> toAbort = new ConcurrentLinkedQueue<>();
/**
* Create an IdleManager. The Session is used only to configure
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/MessageCache.java
--- a/mail/src/main/java/com/sun/mail/imap/MessageCache.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/MessageCache.java Tue Aug 30 19:45:58 2016 +0200
@@ -217,7 +217,7 @@
public IMAPMessage[] removeExpungedMessages() {
logger.fine("remove expunged messages");
// list of expunged messages
- List<IMAPMessage> mlist = new ArrayList<IMAPMessage>();
+ List<IMAPMessage> mlist = new ArrayList<>();
/*
* Walk through the array compressing it by copying
@@ -268,7 +268,7 @@
public IMAPMessage[] removeExpungedMessages(Message[] msgs) {
logger.fine("remove expunged messages");
// list of expunged messages
- List<IMAPMessage> mlist = new ArrayList<IMAPMessage>();
+ List<IMAPMessage> mlist = new ArrayList<>();
/*
* Copy the message numbers of the expunged messages into
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/Rights.java
--- a/mail/src/main/java/com/sun/mail/imap/Rights.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/Rights.java Tue Aug 30 19:45:58 2016 +0200
@@ -305,7 +305,7 @@
* @return array of Rights.Right objects representing rights
*/
public Right[] getRights() {
- List<Right> v = new ArrayList<Right>();
+ List<Right> v = new ArrayList<>();
for (int i = 0; i < this.rights.length; i++)
if (this.rights[i])
v.add(Right.getInstance((char)i));
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/Utility.java
--- a/mail/src/main/java/com/sun/mail/imap/Utility.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/Utility.java Tue Aug 30 19:45:58 2016 +0200
@@ -77,7 +77,7 @@
* @return the MessageSet array
*/
public static MessageSet[] toMessageSet(Message[] msgs, Condition cond) {
- List<MessageSet> v = new ArrayList<MessageSet>(1);
+ List<MessageSet> v = new ArrayList<>(1);
int current, next;
IMAPMessage msg;
@@ -170,7 +170,7 @@
* @return the UIDSet array
*/
public static UIDSet[] toUIDSet(Message[] msgs) {
- List<UIDSet> v = new ArrayList<UIDSet>(1);
+ List<UIDSet> v = new ArrayList<>(1);
long current, next;
IMAPMessage msg;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/BODYSTRUCTURE.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/BODYSTRUCTURE.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/BODYSTRUCTURE.java Tue Aug 30 19:45:58 2016 +0200
@@ -104,7 +104,7 @@
System.out.println("DEBUG IMAP: parsing multipart");
type = "multipart";
processedType = MULTI;
- List<BODYSTRUCTURE> v = new ArrayList<BODYSTRUCTURE>(1);
+ List<BODYSTRUCTURE> v = new ArrayList<>(1);
int i = 1;
do {
v.add(new BODYSTRUCTURE(r));
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/ENVELOPE.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/ENVELOPE.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/ENVELOPE.java Tue Aug 30 19:45:58 2016 +0200
@@ -153,7 +153,7 @@
return null;
}
- List<InternetAddress> v = new ArrayList<InternetAddress>();
+ List<InternetAddress> v = new ArrayList<>();
do {
IMAPAddress a = new IMAPAddress(r);
@@ -211,7 +211,7 @@
// representation of the group is accumulated in a StringBuffer.
StringBuffer sb = new StringBuffer();
sb.append(groupname).append(':');
- List<InternetAddress> v = new ArrayList<InternetAddress>();
+ List<InternetAddress> v = new ArrayList<>();
while (r.peekByte() != ')') {
IMAPAddress a = new IMAPAddress(r);
if (a.isEndOfGroup()) // reached end of group
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/FetchResponse.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/FetchResponse.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/FetchResponse.java Tue Aug 30 19:45:58 2016 +0200
@@ -158,7 +158,7 @@
*/
public static <T extends Item> List<T> getItems(Response[] r, int msgno,
Class<T> c) {
- List<T> items = new ArrayList<T>();
+ List<T> items = new ArrayList<>();
if (r == null)
return items;
@@ -201,7 +201,7 @@
throw new ParsingException(
"error in FETCH parsing, missing '(' at index " + index);
- List<Item> v = new ArrayList<Item>();
+ List<Item> v = new ArrayList<>();
Item i = null;
do {
index++; // skip '(', or SPACE
@@ -298,7 +298,7 @@
for (int i = 0; i < fitems.length; i++) {
if (match(fitems[i].getName())) {
if (extensionItems == null)
- extensionItems = new HashMap<String, Object>();
+ extensionItems = new HashMap<>();
extensionItems.put(fitems[i].getName(),
fitems[i].parseItem(this));
return true;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/ID.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/ID.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/ID.java Tue Aug 30 19:45:58 2016 +0200
@@ -75,7 +75,7 @@
if (c != '(')
throw new ProtocolException("Missing '(' at start of ID");
- serverParams = new HashMap<String, String>();
+ serverParams = new HashMap<>();
String[] v = r.readStringList();
if (v != null) {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java Tue Aug 30 19:45:58 2016 +0200
@@ -178,7 +178,7 @@
!PropUtil.getBooleanProperty(props, "mail.debug.auth", false);
if (capabilities == null)
- capabilities = new HashMap<String, String>();
+ capabilities = new HashMap<>();
searchCharsets = new String[2]; // 2, for now.
searchCharsets[0] = "UTF-8";
@@ -214,8 +214,8 @@
Response response = r[r.length-1];
if (response.isOK()) {
- capabilities = new HashMap<String, String>(10);
- authmechs = new ArrayList<String>(5);
+ capabilities = new HashMap<>(10);
+ authmechs = new ArrayList<>(5);
for (int i = 0, len = r.length; i < len; i++) {
if (!(r[i] instanceof IMAPResponse))
continue;
@@ -249,8 +249,8 @@
s = r.readAtom();
if (!s.equalsIgnoreCase("CAPABILITY"))
return;
- capabilities = new HashMap<String, String>(10);
- authmechs = new ArrayList<String>(5);
+ capabilities = new HashMap<>(10);
+ authmechs = new ArrayList<>(5);
parseCapabilities(r);
}
@@ -512,7 +512,7 @@
*/
public synchronized void authlogin(String u, String p)
throws ProtocolException {
- List<Response> v = new ArrayList<Response>();
+ List<Response> v = new ArrayList<>();
String tag = null;
Response r = null;
boolean done = false;
@@ -626,7 +626,7 @@
*/
public synchronized void authplain(String authzid, String u, String p)
throws ProtocolException {
- List<Response> v = new ArrayList<Response>();
+ List<Response> v = new ArrayList<>();
String tag = null;
Response r = null;
boolean done = false;
@@ -735,7 +735,7 @@
*/
public synchronized void authntlm(String authzid, String u, String p)
throws ProtocolException {
- List<Response> v = new ArrayList<Response>();
+ List<Response> v = new ArrayList<>();
String tag = null;
Response r = null;
boolean done = false;
@@ -832,7 +832,7 @@
*/
public synchronized void authoauth2(String u, String p)
throws ProtocolException {
- List<Response> v = new ArrayList<Response>();
+ List<Response> v = new ArrayList<>();
String tag = null;
Response r = null;
boolean done = false;
@@ -961,7 +961,7 @@
List<String> v;
if (allowed != null && allowed.length > 0) {
// remove anything not supported by the server
- v = new ArrayList<String>(allowed.length);
+ v = new ArrayList<>(allowed.length);
for (int i = 0; i < allowed.length; i++)
if (authmechs.contains(allowed[i])) // XXX - case must match
v.add(allowed[i]);
@@ -1063,7 +1063,7 @@
@Deprecated
public void id(String guid) throws ProtocolException {
// support this for now, but remove it soon
- Map<String,String> gmap = new HashMap<String,String>();
+ Map<String,String> gmap = new HashMap<>();
gmap.put("GUID", guid);
id(gmap);
}
@@ -1273,7 +1273,7 @@
args.writeAtom(cap);
simpleCommand("ENABLE", args);
if (enabled == null)
- enabled = new HashSet<String>();
+ enabled = new HashSet<>();
enabled.add(cap.toUpperCase(Locale.ENGLISH));
}
@@ -1504,7 +1504,7 @@
Response response = r[r.length-1];
if (response.isOK()) { // command succesful
- List<ListInfo> v = new ArrayList<ListInfo>(1);
+ List<ListInfo> v = new ArrayList<>(1);
for (int i = 0, len = r.length; i < len; i++) {
if (!(r[i] instanceof IMAPResponse))
continue;
@@ -2004,7 +2004,7 @@
"UID", true);
UID u;
- List<UID> v = new ArrayList<UID>();
+ List<UID> v = new ArrayList<>();
for (int i = 0, len = r.length; i < len; i++) {
if (r[i] == null || !(r[i] instanceof FetchResponse))
continue;
@@ -2069,7 +2069,7 @@
Response[] r = command("UID FETCH " + msgSequence +
" (FLAGS) (CHANGEDSINCE " + String.valueOf(modseq) + ")", null);
- List<Integer> v = new ArrayList<Integer>();
+ List<Integer> v = new ArrayList<>();
for (int i = 0, len = r.length; i < len; i++) {
if (r[i] == null || !(r[i] instanceof FetchResponse))
continue;
@@ -2526,7 +2526,7 @@
// Grab all SEARCH responses
if (response.isOK()) { // command succesful
- List<Integer> v = new ArrayList<Integer>();
+ List<Integer> v = new ArrayList<>();
int num;
for (int i = 0, len = r.length; i < len; i++) {
if (!(r[i] instanceof IMAPResponse))
@@ -2618,7 +2618,7 @@
// Grab all SORT responses
if (response.isOK()) { // command succesful
- List<Integer> v = new ArrayList<Integer>();
+ List<Integer> v = new ArrayList<>();
int num;
for (int i = 0, len = r.length; i < len; i++) {
if (!(r[i] instanceof IMAPResponse))
@@ -2708,7 +2708,7 @@
Response response = r[r.length-1];
- Map<String, Quota> tab = new HashMap<String, Quota>();
+ Map<String, Quota> tab = new HashMap<>();
// Grab all QUOTAROOT and QUOTA responses
if (response.isOK()) { // command succesful
@@ -2776,7 +2776,7 @@
Response[] r = command("GETQUOTA", args);
Quota quota = null;
- List<Quota> v = new ArrayList<Quota>();
+ List<Quota> v = new ArrayList<>();
Response response = r[r.length-1];
// Grab all QUOTA responses
@@ -2871,7 +2871,7 @@
if (r.readByte() != '(')
throw new ParsingException("parse error in QUOTA");
- List<Quota.Resource> v = new ArrayList<Quota.Resource>();
+ List<Quota.Resource> v = new ArrayList<>();
while (r.peekByte() != ')') {
// quota_resource ::= atom SP number SP number
String name = r.readAtom();
@@ -2970,7 +2970,7 @@
Response response = r[r.length-1];
// Grab all ACL responses
- List<ACL> v = new ArrayList<ACL>();
+ List<ACL> v = new ArrayList<>();
if (response.isOK()) { // command succesful
for (int i = 0, len = r.length; i < len; i++) {
if (!(r[i] instanceof IMAPResponse))
@@ -3026,7 +3026,7 @@
Response response = r[r.length-1];
// Grab LISTRIGHTS response
- List<Rights> v = new ArrayList<Rights>();
+ List<Rights> v = new ArrayList<>();
if (response.isOK()) { // command succesful
for (int i = 0, len = r.length; i < len; i++) {
if (!(r[i] instanceof IMAPResponse))
@@ -3129,7 +3129,7 @@
if (!hasCapability("IDLE"))
throw new BadCommandException("IDLE not supported");
- List<Response> v = new ArrayList<Response>();
+ List<Response> v = new ArrayList<>();
boolean done = false;
Response r = null;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/IMAPResponse.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/IMAPResponse.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/IMAPResponse.java Tue Aug 30 19:45:58 2016 +0200
@@ -112,7 +112,7 @@
return null;
index++; // skip '('
- List<String> v = new ArrayList<String>();
+ List<String> v = new ArrayList<>();
int start;
for (start = index; buffer[index] != ')'; index++) {
if (buffer[index] == ' ') { // got one item
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/IMAPSaslAuthenticator.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/IMAPSaslAuthenticator.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/IMAPSaslAuthenticator.java Tue Aug 30 19:45:58 2016 +0200
@@ -90,7 +90,7 @@
final String p) throws ProtocolException {
synchronized (pr) { // authenticate method should be synchronized
- List<Response> v = new ArrayList<Response>();
+ List<Response> v = new ArrayList<>();
String tag = null;
Response r = null;
boolean done = false;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/ListInfo.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/ListInfo.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/ListInfo.java Tue Aug 30 19:45:58 2016 +0200
@@ -67,7 +67,7 @@
public ListInfo(IMAPResponse r) throws ParsingException {
String[] s = r.readSimpleList();
- List<String> v = new ArrayList<String>(); // accumulate attributes
+ List<String> v = new ArrayList<>(); // accumulate attributes
if (s != null) {
// non-empty attribute list
for (int i = 0; i < s.length; i++) {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/MailboxInfo.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/MailboxInfo.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/MailboxInfo.java Tue Aug 30 19:45:58 2016 +0200
@@ -101,12 +101,12 @@
r[i] = null; // remove this response
} else if (ir.keyEquals("VANISHED")) {
if (responses == null)
- responses = new ArrayList<IMAPResponse>();
+ responses = new ArrayList<>();
responses.add(ir);
r[i] = null; // remove this response
} else if (ir.keyEquals("FETCH")) {
if (responses == null)
- responses = new ArrayList<IMAPResponse>();
+ responses = new ArrayList<>();
responses.add(ir);
r[i] = null; // remove this response
} else if (ir.isUnTagged() && ir.isOK()) {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/MessageSet.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/MessageSet.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/MessageSet.java Tue Aug 30 19:45:58 2016 +0200
@@ -74,7 +74,7 @@
* @return array of MessageSet objects
*/
public static MessageSet[] createMessageSets(int[] msgs) {
- List<MessageSet> v = new ArrayList<MessageSet>();
+ List<MessageSet> v = new ArrayList<>();
int i,j;
for (i=0; i < msgs.length; i++) {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/Namespaces.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/Namespaces.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/Namespaces.java Tue Aug 30 19:45:58 2016 +0200
@@ -152,7 +152,7 @@
r.skipSpaces();
// Namespace = nil / "(" 1*( Namespace_Element) ")"
if (r.peekByte() == '(') {
- List<Namespace> v = new ArrayList<Namespace>();
+ List<Namespace> v = new ArrayList<>();
r.readByte();
do {
Namespace ns = new Namespace(r);
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/Status.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/Status.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/Status.java Tue Aug 30 19:45:58 2016 +0200
@@ -108,7 +108,7 @@
highestmodseq = r.readLong();
else {
if (items == null)
- items = new HashMap<String,Long>();
+ items = new HashMap<>();
items.put(attr.toUpperCase(Locale.ENGLISH),
Long.valueOf(r.readLong()));
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/imap/protocol/UIDSet.java
--- a/mail/src/main/java/com/sun/mail/imap/protocol/UIDSet.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/protocol/UIDSet.java Tue Aug 30 19:45:58 2016 +0200
@@ -78,7 +78,7 @@
public static UIDSet[] createUIDSets(long[] uids) {
if (uids == null)
return null;
- List<UIDSet> v = new ArrayList<UIDSet>();
+ List<UIDSet> v = new ArrayList<>();
int i,j;
for (i=0; i < uids.length; i++) {
@@ -108,7 +108,7 @@
public static UIDSet[] parseUIDSets(String uids) {
if (uids == null)
return null;
- List<UIDSet> v = new ArrayList<UIDSet>();
+ List<UIDSet> v = new ArrayList<>();
StringTokenizer st = new StringTokenizer(uids, ",:", true);
long start = -1;
UIDSet cur = null;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/pop3/POP3Message.java
--- a/mail/src/main/java/com/sun/mail/pop3/POP3Message.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/pop3/POP3Message.java Tue Aug 30 19:45:58 2016 +0200
@@ -73,7 +73,7 @@
// rawData itself is never null
private SoftReference<InputStream> rawData
- = new SoftReference<InputStream>(null);
+ = new SoftReference<>(null);
public POP3Message(Folder folder, int msgno)
throws MessagingException {
@@ -238,7 +238,7 @@
// skipped the header, the message is what's left
msgSize = rawcontent.available();
- rawData = new SoftReference<InputStream>(rawcontent);
+ rawData = new SoftReference<>(rawcontent);
}
}
} catch (EOFException eex) {
@@ -311,7 +311,7 @@
} catch (IOException ex) {
// ignore it
}
- rawData = new SoftReference<InputStream>(null);
+ rawData = new SoftReference<>(null);
}
if (contentStream != null) {
try {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/pop3/Protocol.java
--- a/mail/src/main/java/com/sun/mail/pop3/Protocol.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/pop3/Protocol.java Tue Aug 30 19:45:58 2016 +0200
@@ -210,7 +210,7 @@
return;
}
- capabilities = new HashMap<String, String>(10);
+ capabilities = new HashMap<>(10);
BufferedReader r = null;
try {
r = new BufferedReader(new InputStreamReader(in, "us-ascii"));
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/smtp/DigestMD5.java
--- a/mail/src/main/java/com/sun/mail/smtp/DigestMD5.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/smtp/DigestMD5.java Tue Aug 30 19:45:58 2016 +0200
@@ -179,7 +179,7 @@
@SuppressWarnings("fallthrough")
private Map<String, String> tokenize(String serverResponse)
throws IOException {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
byte[] bytes = serverResponse.getBytes("iso-8859-1"); // really ASCII?
String key = null;
int ttype;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
--- a/mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java Tue Aug 30 19:45:58 2016 +0200
@@ -109,7 +109,7 @@
private Hashtable<String, String> extMap;
private Map<String, Authenticator> authenticators
- = new HashMap<String, Authenticator>();
+ = new HashMap<>();
private String defaultAuthenticationMechanisms; // set in constructor
private boolean quitWait = false; // true if we should wait
@@ -418,7 +418,7 @@
*/
public synchronized String[] getSASLMechanisms() {
if (saslMechanisms == UNKNOWN_SA) {
- List<String> v = new ArrayList<String>(5);
+ List<String> v = new ArrayList<>(5);
String s = session.getProperty("mail." + name + ".sasl.mechanisms");
if (s != null && s.length() > 0) {
if (logger.isLoggable(Level.FINE))
@@ -1144,13 +1144,13 @@
List<String> v;
if (allowed != null && allowed.length > 0) {
// remove anything not supported by the server
- v = new ArrayList<String>(allowed.length);
+ v = new ArrayList<>(allowed.length);
for (int i = 0; i < allowed.length; i++)
if (supportsAuthentication(allowed[i])) // XXX - case must match
v.add(allowed[i]);
} else {
// everything is allowed
- v = new ArrayList<String>();
+ v = new ArrayList<>();
if (extMap != null) {
String a = extMap.get("AUTH");
if (a != null) {
@@ -1459,7 +1459,7 @@
if (a.isGroup()) {
if (groups == null) {
// first group, catch up with where we are
- groups = new ArrayList<Address>();
+ groups = new ArrayList<>();
for (int k = 0; k < i; k++)
groups.add(addresses[k]);
}
@@ -1641,7 +1641,7 @@
BufferedReader rd =
new BufferedReader(new StringReader(lastServerResponse));
String line;
- extMap = new Hashtable<String, String>();
+ extMap = new Hashtable<>();
try {
boolean first = true;
while ((line = rd.readLine()) != null) {
@@ -1799,9 +1799,9 @@
* valid addr: 552 (quota), 450, 451, 452 (quota), 421 (srvr abort)
*/
protected void rcptTo() throws MessagingException {
- List<InternetAddress> valid = new ArrayList<InternetAddress>();
- List<InternetAddress> validUnsent = new ArrayList<InternetAddress>();
- List<InternetAddress> invalid = new ArrayList<InternetAddress>();
+ List<InternetAddress> valid = new ArrayList<>();
+ List<InternetAddress> validUnsent = new ArrayList<>();
+ List<InternetAddress> invalid = new ArrayList<>();
int retCode = -1;
MessagingException mex = null;
boolean sendFailed = false;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/util/SocketFetcher.java
--- a/mail/src/main/java/com/sun/mail/util/SocketFetcher.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/util/SocketFetcher.java Tue Aug 30 19:45:58 2016 +0200
@@ -572,7 +572,7 @@
if (logger.isLoggable(Level.FINER))
logger.finer("SSL enabled protocols before " +
Arrays.asList(prots));
- List<String> eprots = new ArrayList<String>();
+ List<String> eprots = new ArrayList<>();
for (int i = 0; i < prots.length; i++) {
if (prots[i] != null && !prots[i].startsWith("SSL"))
eprots.add(prots[i]);
@@ -787,7 +787,7 @@
*/
private static String[] stringArray(String s) {
StringTokenizer st = new StringTokenizer(s);
- List<String> tokens = new ArrayList<String>();
+ List<String> tokens = new ArrayList<>();
while (st.hasMoreTokens())
tokens.add(st.nextToken());
return tokens.toArray(new String[tokens.size()]);
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/util/logging/LogManagerProperties.java
--- a/mail/src/main/java/com/sun/mail/util/logging/LogManagerProperties.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/util/logging/LogManagerProperties.java Tue Aug 30 19:45:58 2016 +0200
@@ -666,7 +666,7 @@
final Class<?> thisClass = LogManagerProperties.class;
assert Modifier.isFinal(thisClass.getModifiers()) : thisClass;
try {
- final HashSet<String> traces = new HashSet<String>();
+ final HashSet<String> traces = new HashSet<>();
Throwable t = Throwable.class.getConstructor().newInstance();
for (StackTraceElement ste : t.getStackTrace()) {
if (!thisClass.getName().equals(ste.getClassName())) {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/com/sun/mail/util/logging/MailHandler.java
--- a/mail/src/main/java/com/sun/mail/util/logging/MailHandler.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/com/sun/mail/util/logging/MailHandler.java Tue Aug 30 19:45:58 2016 +0200
@@ -391,7 +391,7 @@
* 4. MUTEX_REPORT when cycle of records is detected.
* 5. MUTEXT_LINKAGE when a linkage error is reported.
*/
- private static final ThreadLocal<Integer> MUTEX = new ThreadLocal<Integer>();
+ private static final ThreadLocal<Integer> MUTEX = new ThreadLocal<>();
/**
* The marker object used to report a publishing state.
* This must be less than the body filter index (-1).
@@ -2063,7 +2063,7 @@
try {
Object canidate;
Object result;
- final Map<Object, Object> seen = new HashMap<Object, Object>();
+ final Map<Object, Object> seen = new HashMap<>();
try {
intern(seen, this.errorManager);
} catch (final SecurityException se) {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/EventQueue.java
--- a/mail/src/main/java/javax/mail/EventQueue.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/EventQueue.java Tue Aug 30 19:45:58 2016 +0200
@@ -107,7 +107,7 @@
Vector<? extends EventListener> vector) {
// if this is the first event, create the queue and start the event task
if (q == null) {
- q = new LinkedBlockingQueue<QueueElement>();
+ q = new LinkedBlockingQueue<>();
if (executor != null) {
executor.execute(this);
} else {
@@ -124,7 +124,7 @@
*/
synchronized void terminateQueue() {
if (q != null) {
- Vector<EventListener> dummyListeners = new Vector<EventListener>();
+ Vector<EventListener> dummyListeners = new Vector<>();
dummyListeners.setSize(1); // need atleast one listener
q.add(new QueueElement(new TerminatorEvent(), dummyListeners));
q = null;
@@ -138,7 +138,7 @@
static synchronized EventQueue getApplicationEventQueue(Executor ex) {
ClassLoader cl = Session.getContextClassLoader();
if (appq == null)
- appq = new WeakHashMap<ClassLoader,EventQueue>();
+ appq = new WeakHashMap<>();
EventQueue q = appq.get(cl);
if (q == null) {
q = new EventQueue(ex);
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/FetchProfile.java
--- a/mail/src/main/java/javax/mail/FetchProfile.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/FetchProfile.java Tue Aug 30 19:45:58 2016 +0200
@@ -180,7 +180,7 @@
*/
public void add(Item item) {
if (specials == null)
- specials = new Vector<Item>();
+ specials = new Vector<>();
specials.addElement(item);
}
@@ -192,7 +192,7 @@
*/
public void add(String headerName) {
if (headers == null)
- headers = new Vector<String>();
+ headers = new Vector<>();
headers.addElement(headerName);
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/Flags.java
--- a/mail/src/main/java/javax/mail/Flags.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/Flags.java Tue Aug 30 19:45:58 2016 +0200
@@ -213,7 +213,7 @@
* @param flag the flag for initialization
*/
public Flags(String flag) {
- user_flags = new Hashtable<String, String>(1);
+ user_flags = new Hashtable<>(1);
user_flags.put(flag.toLowerCase(Locale.ENGLISH), flag);
}
@@ -233,7 +233,7 @@
*/
public void add(String flag) {
if (user_flags == null)
- user_flags = new Hashtable<String, String>(1);
+ user_flags = new Hashtable<>(1);
user_flags.put(flag.toLowerCase(Locale.ENGLISH), flag);
}
@@ -248,7 +248,7 @@
if (f.user_flags != null) { // add user-defined flags
if (user_flags == null)
- user_flags = new Hashtable<String, String>(1);
+ user_flags = new Hashtable<>(1);
Enumeration<String> e = f.user_flags.keys();
@@ -403,7 +403,7 @@
* @return array of Flags.Flag objects representing system flags
*/
public Flag[] getSystemFlags() {
- Vector<Flag> v = new Vector<Flag>();
+ Vector<Flag> v = new Vector<>();
if ((system_flags & ANSWERED_BIT) != 0)
v.addElement(Flag.ANSWERED);
if ((system_flags & DELETED_BIT) != 0)
@@ -431,7 +431,7 @@
* @return array of Strings, each String represents a flag.
*/
public String[] getUserFlags() {
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
if (user_flags != null) {
Enumeration<String> e = user_flags.elements();
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/Folder.java
--- a/mail/src/main/java/javax/mail/Folder.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/Folder.java Tue Aug 30 19:45:58 2016 +0200
@@ -1288,7 +1288,7 @@
*/
public Message[] search(SearchTerm term, Message[] msgs)
throws MessagingException {
- List<Message> matchedMsgs = new ArrayList<Message>();
+ List<Message> matchedMsgs = new ArrayList<>();
// Run thru the given messages
for (Message msg : msgs) {
@@ -1337,7 +1337,7 @@
public synchronized void
addConnectionListener(ConnectionListener l) {
if (connectionListeners == null)
- connectionListeners = new Vector<ConnectionListener>();
+ connectionListeners = new Vector<>();
connectionListeners.addElement(l);
}
@@ -1403,7 +1403,7 @@
*/
public synchronized void addFolderListener(FolderListener l) {
if (folderListeners == null)
- folderListeners = new Vector<FolderListener>();
+ folderListeners = new Vector<>();
folderListeners.addElement(l);
}
@@ -1484,7 +1484,7 @@
*/
public synchronized void addMessageCountListener(MessageCountListener l) {
if (messageCountListeners == null)
- messageCountListeners = new Vector<MessageCountListener>();
+ messageCountListeners = new Vector<>();
messageCountListeners.addElement(l);
}
@@ -1574,7 +1574,7 @@
public synchronized void
addMessageChangedListener(MessageChangedListener l) {
if (messageChangedListeners == null)
- messageChangedListeners = new Vector<MessageChangedListener>();
+ messageChangedListeners = new Vector<>();
messageChangedListeners.addElement(l);
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/Multipart.java
--- a/mail/src/main/java/javax/mail/Multipart.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/Multipart.java Tue Aug 30 19:45:58 2016 +0200
@@ -214,7 +214,7 @@
public synchronized void addBodyPart(BodyPart part)
throws MessagingException {
if (parts == null)
- parts = new Vector<BodyPart>();
+ parts = new Vector<>();
parts.addElement(part);
part.setParent(this);
@@ -237,7 +237,7 @@
public synchronized void addBodyPart(BodyPart part, int index)
throws MessagingException {
if (parts == null)
- parts = new Vector<BodyPart>();
+ parts = new Vector<>();
parts.insertElementAt(part, index);
part.setParent(this);
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/Service.java
--- a/mail/src/main/java/javax/mail/Service.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/Service.java Tue Aug 30 19:45:58 2016 +0200
@@ -87,7 +87,7 @@
* deadlocks when notifying listeners.)
*/
private final Vector<ConnectionListener> connectionListeners
- = new Vector<ConnectionListener>();
+ = new Vector<>();
/**
* The queue of events to be delivered.
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/Session.java
--- a/mail/src/main/java/javax/mail/Session.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/Session.java Tue Aug 30 19:45:58 2016 +0200
@@ -186,15 +186,15 @@
private final Properties props;
private final Authenticator authenticator;
private final Hashtable<URLName, PasswordAuthentication> authTable
- = new Hashtable<URLName, PasswordAuthentication>();
+ = new Hashtable<>();
private boolean debug = false;
private PrintStream out; // debug output stream
private MailLogger logger;
- private final Vector<Provider> providers = new Vector<Provider>();
+ private final Vector<Provider> providers = new Vector<>();
private final Hashtable<String, Provider> providersByProtocol
- = new Hashtable<String, Provider>();
+ = new Hashtable<>();
private final Hashtable<String, Provider> providersByClassName
- = new Hashtable<String, Provider>();
+ = new Hashtable<>();
private final Properties addressMap = new Properties();
// maps type to protocol
// the queue of events to be delivered, if mail.event.scope===session
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/Store.java
--- a/mail/src/main/java/javax/mail/Store.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/Store.java Tue Aug 30 19:45:58 2016 +0200
@@ -204,7 +204,7 @@
*/
public synchronized void addStoreListener(StoreListener l) {
if (storeListeners == null)
- storeListeners = new Vector<StoreListener>();
+ storeListeners = new Vector<>();
storeListeners.addElement(l);
}
@@ -260,7 +260,7 @@
*/
public synchronized void addFolderListener(FolderListener l) {
if (folderListeners == null)
- folderListeners = new Vector<FolderListener>();
+ folderListeners = new Vector<>();
folderListeners.addElement(l);
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/Transport.java
--- a/mail/src/main/java/javax/mail/Transport.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/Transport.java Tue Aug 30 19:45:58 2016 +0200
@@ -214,12 +214,12 @@
* indexed by address type
*/
Map<String, List<Address>> protocols
- = new HashMap<String, List<Address>>();
+ = new HashMap<>();
// Lists of addresses
- List<Address> invalid = new ArrayList<Address>();
- List<Address> validSent = new ArrayList<Address>();
- List<Address> validUnsent = new ArrayList<Address>();
+ List<Address> invalid = new ArrayList<>();
+ List<Address> validSent = new ArrayList<>();
+ List<Address> validUnsent = new ArrayList<>();
for (int i = 0; i < addresses.length; i++) {
// is this address type already in the map?
@@ -228,7 +228,7 @@
v.add(addresses[i]);
} else {
// need to add a new protocol
- List<Address> w = new ArrayList<Address>();
+ List<Address> w = new ArrayList<>();
w.add(addresses[i]);
protocols.put(addresses[i].getType(), w);
}
@@ -377,7 +377,7 @@
*/
public synchronized void addTransportListener(TransportListener l) {
if (transportListeners == null)
- transportListeners = new Vector<TransportListener>();
+ transportListeners = new Vector<>();
transportListeners.addElement(l);
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/internet/InternetAddress.java
--- a/mail/src/main/java/javax/mail/internet/InternetAddress.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/internet/InternetAddress.java Tue Aug 30 19:45:58 2016 +0200
@@ -699,7 +699,7 @@
boolean route_addr = false; // address came from route-addr term
boolean rfc822 = false; // looks like an RFC822 address
char c;
- List<InternetAddress> v = new ArrayList<InternetAddress>();
+ List<InternetAddress> v = new ArrayList<>();
InternetAddress ma;
for (start = end = -1, index = 0; index < length; index++) {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/internet/InternetHeaders.java
--- a/mail/src/main/java/javax/mail/internet/InternetHeaders.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/internet/InternetHeaders.java Tue Aug 30 19:45:58 2016 +0200
@@ -304,7 +304,7 @@
* are inserted to indicate the preferred order of headers.
*/
public InternetHeaders() {
- headers = new ArrayList<InternetHeader>(40);
+ headers = new ArrayList<>(40);
headers.add(new InternetHeader("Return-Path", null));
headers.add(new InternetHeader("Received", null));
headers.add(new InternetHeader("Resent-Date", null));
@@ -353,7 +353,7 @@
* @exception MessagingException for any I/O error reading the stream
*/
public InternetHeaders(InputStream is) throws MessagingException {
- headers = new ArrayList<InternetHeader>(40);
+ headers = new ArrayList<>(40);
load(is);
}
@@ -440,7 +440,7 @@
public String[] getHeader(String name) {
Iterator<InternetHeader> e = headers.iterator();
// XXX - should we just step through in index order?
- List<String> v = new ArrayList<String>(); // accumulate return values
+ List<String> v = new ArrayList<>(); // accumulate return values
while (e.hasNext()) {
InternetHeader h = e.next();
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/internet/MimeBodyPart.java
--- a/mail/src/main/java/javax/mail/internet/MimeBodyPart.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/internet/MimeBodyPart.java Tue Aug 30 19:45:58 2016 +0200
@@ -1330,7 +1330,7 @@
// Tokenize the header to obtain the Language-tags (skip comments)
HeaderTokenizer h = new HeaderTokenizer(s, HeaderTokenizer.MIME);
- List<String> v = new ArrayList<String>();
+ List<String> v = new ArrayList<>();
HeaderTokenizer.Token tk;
int tkType;
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/internet/MimeMessage.java
--- a/mail/src/main/java/javax/mail/internet/MimeMessage.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/internet/MimeMessage.java Tue Aug 30 19:45:58 2016 +0200
@@ -1675,7 +1675,7 @@
Address a[] = getReplyTo();
reply.setRecipients(Message.RecipientType.TO, a);
if (replyToAll) {
- List<Address> v = new ArrayList<Address>();
+ List<Address> v = new ArrayList<>();
// add my own address to list
InternetAddress me = InternetAddress.getLocalAddress(session);
if (me != null)
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/internet/MimeUtility.java
--- a/mail/src/main/java/javax/mail/internet/MimeUtility.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/internet/MimeUtility.java Tue Aug 30 19:45:58 2016 +0200
@@ -149,7 +149,7 @@
// cached map of whether a charset is compatible with ASCII
// Map<String,Boolean>
private static final Map<String, Boolean> nonAsciiCharsetMap
- = new HashMap<String, Boolean>();
+ = new HashMap<>();
private static final boolean decodeStrict =
PropUtil.getBooleanSystemProperty("mail.mime.decodetext.strict", true);
@@ -1333,8 +1333,8 @@
private static Map<String, String> java2mime;
static {
- java2mime = new HashMap<String, String>(40);
- mime2java = new HashMap<String, String>(10);
+ java2mime = new HashMap<>(40);
+ mime2java = new HashMap<>(10);
try {
// Use this class's classloader to load the mapping file
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/internet/NewsAddress.java
--- a/mail/src/main/java/javax/mail/internet/NewsAddress.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/internet/NewsAddress.java Tue Aug 30 19:45:58 2016 +0200
@@ -212,7 +212,7 @@
throws AddressException {
// XXX - verify format of newsgroup name?
StringTokenizer st = new StringTokenizer(newsgroups, ",");
- List<NewsAddress> nglist = new ArrayList<NewsAddress>();
+ List<NewsAddress> nglist = new ArrayList<>();
while (st.hasMoreTokens()) {
String ng = st.nextToken();
nglist.add(new NewsAddress(ng));
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/main/java/javax/mail/internet/ParameterList.java
--- a/mail/src/main/java/javax/mail/internet/ParameterList.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/main/java/javax/mail/internet/ParameterList.java Tue Aug 30 19:45:58 2016 +0200
@@ -89,7 +89,7 @@
* will all move to the end.
*/
// keep parameters in order
- private Map<String, Object> list = new LinkedHashMap<String, Object>();
+ private Map<String, Object> list = new LinkedHashMap<>();
/**
* A set of names for multi-segment parameters that we
@@ -220,8 +220,8 @@
public ParameterList() {
// initialize other collections only if they'll be needed
if (decodeParameters) {
- multisegmentNames = new HashSet<String>();
- slist = new HashMap<String, Object>();
+ multisegmentNames = new HashSet<>();
+ slist = new HashMap<>();
}
}
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/test/java/com/sun/mail/imap/IMAPFetchProfileTest.java
--- a/mail/src/test/java/com/sun/mail/imap/IMAPFetchProfileTest.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/test/java/com/sun/mail/imap/IMAPFetchProfileTest.java Tue Aug 30 19:45:58 2016 +0200
@@ -206,7 +206,7 @@
*/
private static class IMAPHandlerFetch extends IMAPHandler {
// must be static because handler is cloned for each connection
- protected static Set<String> saw = new HashSet<String>();
+ protected static Set<String> saw = new HashSet<>();
@Override
public void select() throws IOException {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/test/java/com/sun/mail/imap/protocol/UIDSetTest.java
--- a/mail/src/test/java/com/sun/mail/imap/protocol/UIDSetTest.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/test/java/com/sun/mail/imap/protocol/UIDSetTest.java Tue Aug 30 19:45:58 2016 +0200
@@ -85,7 +85,7 @@
public static Collection<TestData[]> data() throws Exception {
junit = true;
// XXX - gratuitous array requirement
- List<TestData[]> testData = new ArrayList<TestData[]>();
+ List<TestData[]> testData = new ArrayList<>();
BufferedReader in = new BufferedReader(new InputStreamReader(
UIDSetTest.class.getResourceAsStream("uiddata")));
TestData t;
@@ -177,7 +177,7 @@
st = new StringTokenizer(line);
tok = st.nextToken();
}
- List<Long> uids = new ArrayList<Long>();
+ List<Long> uids = new ArrayList<>();
if (!tok.equals("EXPECT"))
throw new Exception("Bad test data format: " + line);
while (st.hasMoreTokens()) {
diff -r 8daaa612a61d -r 20571c1dfdc2 mail/src/test/java/com/sun/mail/test/TestServer.java
--- a/mail/src/test/java/com/sun/mail/test/TestServer.java Tue Aug 30 15:44:55 2016 -0700
+++ b/mail/src/test/
[truncated due to length]