You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/16 09:45:50 UTC
[17/18] james-project git commit: JAMES-2107 Run IntelliJ inspection:
"Explicit type parameter can be removed"
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
index 50c4ad3..bcbc54f 100644
--- a/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
+++ b/mailbox/lucene/src/main/java/org/apache/james/mailbox/lucene/search/LuceneMessageSearchIndex.java
@@ -987,7 +987,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
IndexSearcher searcher = null;
try {
- Set<MessageUid> uids = new HashSet<MessageUid>();
+ Set<MessageUid> uids = new HashSet<>();
searcher = new IndexSearcher(IndexReader.open(writer, true));
// query for all the documents sorted by uid
@@ -1007,7 +1007,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
}
}
- List<MessageRange> ranges = MessageRange.toRanges(new ArrayList<MessageUid>(uids));
+ List<MessageRange> ranges = MessageRange.toRanges(new ArrayList<>(uids));
UidRange[] nRanges = new UidRange[ranges.size()];
for (int i = 0; i < ranges.size(); i++) {
MessageRange range = ranges.get(i);
@@ -1028,7 +1028,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
}
private Sort createSort(List<SearchQuery.Sort> sorts) {
- List<SortField> fields = new ArrayList<SortField>();
+ List<SortField> fields = new ArrayList<>();
for (SearchQuery.Sort sort : sorts) {
boolean reverse = sort.isReverse();
@@ -1336,7 +1336,7 @@ public class LuceneMessageSearchIndex extends ListeningMessageSearchIndex {
* @param f
*/
private void indexFlags(Document doc, Flags f) {
- List<String> fString = new ArrayList<String>();
+ List<String> fString = new ArrayList<>();
Flag[] flags = f.getSystemFlags();
for (Flag flag : flags) {
fString.add(toString(flag));
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
index 15a9edb..4f36473 100644
--- a/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
+++ b/mailbox/lucene/src/test/java/org/apache/james/mailbox/lucene/search/LuceneMailboxMessageSearchIndexTest.java
@@ -44,8 +44,8 @@ import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.mailbox.model.SearchQuery.AddressType;
import org.apache.james.mailbox.model.SearchQuery.DateResolution;
import org.apache.james.mailbox.model.SearchQuery.Sort;
-import org.apache.james.mailbox.model.SearchQuery.Sort.SortClause;
import org.apache.james.mailbox.model.SearchQuery.Sort.Order;
+import org.apache.james.mailbox.model.SearchQuery.Sort.SortClause;
import org.apache.james.mailbox.model.SimpleMailboxACL;
import org.apache.james.mailbox.model.TestId;
import org.apache.james.mailbox.model.TestMessageId;
@@ -106,18 +106,18 @@ public class LuceneMailboxMessageSearchIndexTest {
id5 = factory.generate();
index = new LuceneMessageSearchIndex(null, new TestId.Factory(), new RAMDirectory(), true, useLenient(), factory);
index.setEnableSuffixMatch(true);
- Map<String, String> headersSubject = new HashMap<String, String>();
+ Map<String, String> headersSubject = new HashMap<>();
headersSubject.put("Subject", "test (fwd)");
headersSubject.put("From", "test99 <te...@localhost>");
headersSubject.put("To", "test2 <te...@localhost>, test3 <te...@localhost>");
- Map<String, String> headersTest = new HashMap<String, String>();
+ Map<String, String> headersTest = new HashMap<>();
headersTest.put("Test", "test");
headersTest.put("From", "test1 <te...@localhost>");
headersTest.put("To", "test3 <te...@localhost>, test4 <te...@localhost>");
headersTest.put("Cc", "test21 <te...@localhost>, test6 <te...@foobar>");
- Map<String, String> headersTestSubject = new HashMap<String, String>();
+ Map<String, String> headersTestSubject = new HashMap<>();
headersTestSubject.put("Test", "test");
headersTestSubject.put("Subject", "test2");
headersTestSubject.put("Date", "Thu, 14 Feb 1990 12:00:00 +0000 (GMT)");
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
index 03c0639..3189e46 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
@@ -407,7 +407,7 @@ public class MaildirFolder {
public SortedMap<MessageUid, MaildirMessageName> getUidMap(MailboxSession session, FilenameFilter filter, MessageUid from, MessageUid to)
throws MailboxException {
SortedMap<MessageUid, MaildirMessageName> allUids = getUidMap(session, from, to);
- SortedMap<MessageUid, MaildirMessageName> filteredUids = new TreeMap<MessageUid, MaildirMessageName>();
+ SortedMap<MessageUid, MaildirMessageName> filteredUids = new TreeMap<>();
for (Entry<MessageUid, MaildirMessageName> entry : allUids.entrySet()) {
if (filter.accept(null, entry.getValue().getFullName()))
filteredUids.put(entry.getKey(), entry.getValue());
@@ -430,7 +430,7 @@ public class MaildirFolder {
public SortedMap<MessageUid, MaildirMessageName> getUidMap(MailboxSession session, FilenameFilter filter, int limit) throws MailboxException {
MessageUid to = null;
SortedMap<MessageUid, MaildirMessageName> allUids = getUidMap(session, MessageUid.MIN_VALUE, to);
- SortedMap<MessageUid, MaildirMessageName> filteredUids = new TreeMap<MessageUid, MaildirMessageName>();
+ SortedMap<MessageUid, MaildirMessageName> filteredUids = new TreeMap<>();
int theLimit = limit;
if (limit < 1)
theLimit = allUids.size();
@@ -538,7 +538,7 @@ public class MaildirFolder {
* @return The uid map
*/
private Map<MessageUid, MaildirMessageName> createUidFile() throws MailboxException {
- final Map<MessageUid, MaildirMessageName> uidMap = new TreeMap<MessageUid, MaildirMessageName>();
+ final Map<MessageUid, MaildirMessageName> uidMap = new TreeMap<>();
File uidList = uidFile;
PrintWriter pw = null;
try {
@@ -565,12 +565,12 @@ public class MaildirFolder {
}
private Map<MessageUid, MaildirMessageName> updateUidFile() throws MailboxException {
- final Map<MessageUid, MaildirMessageName> uidMap = new TreeMap<MessageUid, MaildirMessageName>();
+ final Map<MessageUid, MaildirMessageName> uidMap = new TreeMap<>();
File uidList = uidFile;
String[] curFiles = curFolder.list();
String[] newFiles = newFolder.list();
messageCount = curFiles.length + newFiles.length;
- HashMap<String, MessageUid> reverseUidMap = new HashMap<String, MessageUid>(messageCount);
+ HashMap<String, MessageUid> reverseUidMap = new HashMap<>(messageCount);
FileReader fileReader = null;
BufferedReader reader = null;
PrintWriter pw = null;
@@ -617,7 +617,7 @@ public class MaildirFolder {
}
private Map<MessageUid, MaildirMessageName> readUidFile(MailboxSession session, MessageUid from, MessageUid to) throws MailboxException {
- final Map<MessageUid, MaildirMessageName> uidMap = new HashMap<MessageUid, MaildirMessageName>();
+ final Map<MessageUid, MaildirMessageName> uidMap = new HashMap<>();
File uidList = uidFile;
FileReader fileReader = null;
@@ -672,7 +672,7 @@ public class MaildirFolder {
private SortedMap<MessageUid, MaildirMessageName> truncateMap(Map<MessageUid, MaildirMessageName> map, MessageUid from, MessageUid to) {
TreeMap<MessageUid, MaildirMessageName> sortedMap;
if (map instanceof TreeMap<?, ?>) sortedMap = (TreeMap<MessageUid, MaildirMessageName>) map;
- else sortedMap = new TreeMap<MessageUid, MaildirMessageName>(map);
+ else sortedMap = new TreeMap<>(map);
if (to != null)
return sortedMap.subMap(from, to.next());
return sortedMap.tailMap(from);
@@ -745,7 +745,7 @@ public class MaildirFolder {
// the first line in the file contains the next uid and message count
if (line != null)
readUidListHeader(line);
- ArrayList<String> lines = new ArrayList<String>();
+ ArrayList<String> lines = new ArrayList<>();
while ((line = reader.readLine()) != null)
lines.add(line);
uid = getNextUid();
@@ -763,7 +763,7 @@ public class MaildirFolder {
String[] curFiles = curFolder.list();
String[] newFiles = newFolder.list();
messageCount = curFiles.length + newFiles.length;
- ArrayList<String> lines = new ArrayList<String>();
+ ArrayList<String> lines = new ArrayList<>();
String[] allFiles = (String[]) ArrayUtils.addAll(curFiles, newFiles);
for (String file : allFiles) {
MessageUid theUid = getNextUid();
@@ -811,7 +811,7 @@ public class MaildirFolder {
reader = new BufferedReader(fileReader);
String line = reader.readLine();
readUidListHeader(line);
- ArrayList<String> lines = new ArrayList<String>();
+ ArrayList<String> lines = new ArrayList<>();
while ((line = reader.readLine()) != null) {
if (uid.equals(MessageUid.of(Long.valueOf(line.substring(0, line.indexOf(" ")))))) {
line = String.valueOf(uid.asLong()) + " " + messageName;
@@ -854,7 +854,7 @@ public class MaildirFolder {
readUidListHeader(reader.readLine());
// It may be possible that message count is 0 so we should better not try to calculate the size of the ArrayList
- ArrayList<String> lines = new ArrayList<String>();
+ ArrayList<String> lines = new ArrayList<>();
String line;
int lineNumber = 1;
while ((line = reader.readLine()) != null) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/UidConstraint.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/UidConstraint.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/UidConstraint.java
index 52656f9..482a433 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/UidConstraint.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/UidConstraint.java
@@ -22,7 +22,7 @@ import java.util.LinkedList;
public class UidConstraint {
- private final LinkedList<Constraint> constraints = new LinkedList<Constraint>();
+ private final LinkedList<Constraint> constraints = new LinkedList<>();
public UidConstraint append(Constraint constraint) {
constraints.add(constraint);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
index b7f5d9e..e24e4c7 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java
@@ -56,7 +56,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
/**
* A request-scoped list of mailboxes in order to refer to them via id
*/
- private final ArrayList<Mailbox> mailboxCache = new ArrayList<Mailbox>();
+ private final ArrayList<Mailbox> mailboxCache = new ArrayList<>();
private final MailboxSession session;
@@ -133,7 +133,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
FilenameFilter filter = MaildirMessageName.createRegexFilter(searchPattern);
File root = maildirStore.getMailboxRootForUser(mailboxPath.getUser());
File[] folders = root.listFiles(filter);
- ArrayList<Mailbox> mailboxList = new ArrayList<Mailbox>();
+ ArrayList<Mailbox> mailboxList = new ArrayList<>();
for (File folder : folders)
if (folder.isDirectory()) {
Mailbox mailbox = maildirStore.loadMailbox(session, root, mailboxPath.getNamespace(), mailboxPath.getUser(), folder.getName());
@@ -242,7 +242,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail
public List<Mailbox> list() throws MailboxException {
File maildirRoot = maildirStore.getMaildirRoot();
- List<Mailbox> mailboxList = new ArrayList<Mailbox>();
+ List<Mailbox> mailboxList = new ArrayList<>();
if (maildirStore.getMaildirLocation().endsWith("/" + MaildirStore.PATH_FULLUSER)) {
File[] users = maildirRoot.listFiles();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
index 1e77933..11370ec 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java
@@ -131,7 +131,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
public List<MessageUid> findRecentMessageUidsInMailbox(Mailbox mailbox) throws MailboxException {
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
SortedMap<MessageUid, MaildirMessageName> recentMessageNames = folder.getRecentMessages(mailboxSession);
- return new ArrayList<MessageUid>(recentMessageNames.keySet());
+ return new ArrayList<>(recentMessageNames.keySet());
}
@@ -152,7 +152,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
*/
@Override
public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator flagsUpdateCalculator, MessageRange set) throws MailboxException {
- final List<UpdatedFlags> updatedFlags = new ArrayList<UpdatedFlags>();
+ final List<UpdatedFlags> updatedFlags = new ArrayList<>();
final MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
Iterator<MailboxMessage> it = findInMailbox(mailbox, set, FetchType.Metadata, -1);
@@ -214,7 +214,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
@Override
public Map<MessageUid, MessageMetaData> expungeMarkedForDeletionInMailbox(Mailbox mailbox, MessageRange set)
throws MailboxException {
- List<MailboxMessage> results = new ArrayList<MailboxMessage>();
+ List<MailboxMessage> results = new ArrayList<>();
final MessageUid from = set.getUidFrom();
final MessageUid to = set.getUidTo();
final Type type = set.getType();
@@ -235,7 +235,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
-1);
break;
}
- Map<MessageUid, MessageMetaData> uids = new HashMap<MessageUid, MessageMetaData>();
+ Map<MessageUid, MessageMetaData> uids = new HashMap<>();
for (MailboxMessage m : results) {
MessageUid uid = m.getUid();
uids.put(uid, new SimpleMessageMetaData(m));
@@ -358,7 +358,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
try {
MaildirMessageName messageName = folder.getMessageNameByUid(mailboxSession, from);
- ArrayList<MailboxMessage> messages = new ArrayList<MailboxMessage>();
+ ArrayList<MailboxMessage> messages = new ArrayList<>();
if (messageName != null && messageName.getFile().exists()) {
messages.add(new MaildirMailboxMessage(mailbox, from, messageName));
}
@@ -380,7 +380,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
else
uidMap = folder.getUidMap(mailboxSession, from, to);
- ArrayList<MailboxMessage> messages = new ArrayList<MailboxMessage>();
+ ArrayList<MailboxMessage> messages = new ArrayList<>();
for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet()) {
messages.add(new MaildirMailboxMessage(mailbox, entry.getKey(), entry.getValue()));
if (max != -1) {
@@ -402,7 +402,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
try {
SortedMap<MessageUid, MaildirMessageName> uidMap = folder.getUidMap(mailboxSession, filter, limit);
- ArrayList<MailboxMessage> filtered = new ArrayList<MailboxMessage>(uidMap.size());
+ ArrayList<MailboxMessage> filtered = new ArrayList<>(uidMap.size());
for (Entry<MessageUid, MaildirMessageName> entry : uidMap.entrySet())
filtered.add(new MaildirMailboxMessage(mailbox, entry.getKey(), entry.getValue()));
return filtered;
@@ -417,7 +417,7 @@ public class MaildirMessageMapper extends AbstractMessageMapper {
MaildirFolder folder = maildirStore.createMaildirFolder(mailbox);
try {
MaildirMessageName messageName = folder.getMessageNameByUid(mailboxSession, uid);
- ArrayList<MailboxMessage> messages = new ArrayList<MailboxMessage>();
+ ArrayList<MailboxMessage> messages = new ArrayList<>();
if (MaildirMessageName.FILTER_DELETED_MESSAGES.accept(null, messageName.getFullName())) {
messages.add(new MaildirMailboxMessage(mailbox, uid, messageName));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
index 552c949..03854b6 100644
--- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
+++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/user/MaildirSubscriptionMapper.java
@@ -168,7 +168,7 @@ public class MaildirSubscriptionMapper extends NonTransactionalMapper implements
* @throws IOException
*/
private void writeSubscriptions(File mailboxFolder, Set<String> subscriptions) throws IOException {
- List<String> sortedSubscriptions = new ArrayList<String>(subscriptions);
+ List<String> sortedSubscriptions = new ArrayList<>(subscriptions);
Collections.sort(sortedSubscriptions);
if (!mailboxFolder.exists())
if (!mailboxFolder.mkdirs())
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
----------------------------------------------------------------------
diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
index a05a7a8..482b892 100644
--- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
+++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MailderMailboxMessageNameTest.java
@@ -42,7 +42,7 @@ public class MailderMailboxMessageNameTest {
@Parameterized.Parameters
public static List<Object[]> testData() {
- List<Object[]> args = new ArrayList<Object[]>();
+ List<Object[]> args = new ArrayList<>();
// no size, two flags
Parts parts = Parts.fullName("1328026049.19146_0.km1111:2,RS").timeSeconds(1328026049)
.baseName("1328026049.19146_0.km1111").flagAnswered().flagSeen();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java
index c7a20d6..3b4f92d 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryAttachmentMapper.java
@@ -39,7 +39,7 @@ public class InMemoryAttachmentMapper implements AttachmentMapper {
private final Map<AttachmentId, Attachment> attachmentsById;
public InMemoryAttachmentMapper() {
- attachmentsById = new ConcurrentHashMap<AttachmentId, Attachment>(INITIAL_SIZE);
+ attachmentsById = new ConcurrentHashMap<>(INITIAL_SIZE);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
index 4ef6936..2500e78 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java
@@ -44,7 +44,7 @@ public class InMemoryMailboxMapper implements MailboxMapper {
private final AtomicLong mailboxIdGenerator = new AtomicLong();
public InMemoryMailboxMapper() {
- mailboxesByPath = new ConcurrentHashMap<MailboxPath, Mailbox>(INITIAL_SIZE);
+ mailboxesByPath = new ConcurrentHashMap<>(INITIAL_SIZE);
}
/**
@@ -147,7 +147,7 @@ public class InMemoryMailboxMapper implements MailboxMapper {
* @see org.apache.james.mailbox.store.mail.MailboxMapper#list()
*/
public List<Mailbox> list() throws MailboxException {
- return new ArrayList<Mailbox>(mailboxesByPath.values());
+ return new ArrayList<>(mailboxesByPath.values());
}
public <T> T execute(Transaction<T> transaction) throws MailboxException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
index 9c6bfc0..81162fe 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java
@@ -54,7 +54,7 @@ public class InMemoryMessageMapper extends AbstractMessageMapper {
public InMemoryMessageMapper(MailboxSession session, UidProvider uidProvider,
ModSeqProvider modSeqProvider) {
super(session, uidProvider, modSeqProvider);
- this.mailboxByUid = new ConcurrentHashMap<InMemoryId, Map<MessageUid, MailboxMessage>>(INITIAL_SIZE);
+ this.mailboxByUid = new ConcurrentHashMap<>(INITIAL_SIZE);
}
private Map<MessageUid, MailboxMessage> getMembershipByUidForMailbox(Mailbox mailbox) {
@@ -64,7 +64,7 @@ public class InMemoryMessageMapper extends AbstractMessageMapper {
private Map<MessageUid, MailboxMessage> getMembershipByUidForId(InMemoryId id) {
Map<MessageUid, MailboxMessage> membershipByUid = mailboxByUid.get(id);
if (membershipByUid == null) {
- membershipByUid = new ConcurrentHashMap<MessageUid, MailboxMessage>(INITIAL_SIZE);
+ membershipByUid = new ConcurrentHashMap<>(INITIAL_SIZE);
mailboxByUid.put(id, membershipByUid);
}
return membershipByUid;
@@ -100,7 +100,7 @@ public class InMemoryMessageMapper extends AbstractMessageMapper {
@Override
public Iterator<MailboxMessage> findInMailbox(Mailbox mailbox, MessageRange set, FetchType ftype, int max)
throws MailboxException {
- List<MailboxMessage> results = new ArrayList<MailboxMessage>(getMembershipByUidForMailbox(mailbox).values());
+ List<MailboxMessage> results = new ArrayList<>(getMembershipByUidForMailbox(mailbox).values());
for (Iterator<MailboxMessage> it = results.iterator(); it.hasNext();) {
if (!set.includes(it.next().getUid())) {
it.remove();
@@ -127,7 +127,7 @@ public class InMemoryMessageMapper extends AbstractMessageMapper {
@Override
public MessageUid findFirstUnseenMessageUid(Mailbox mailbox) throws MailboxException {
- List<MailboxMessage> memberships = new ArrayList<MailboxMessage>(getMembershipByUidForMailbox(mailbox).values());
+ List<MailboxMessage> memberships = new ArrayList<>(getMembershipByUidForMailbox(mailbox).values());
Collections.sort(memberships);
return memberships.stream()
.filter(m -> !m.isSeen())
@@ -139,7 +139,7 @@ public class InMemoryMessageMapper extends AbstractMessageMapper {
@Override
public Map<MessageUid, MessageMetaData> expungeMarkedForDeletionInMailbox(Mailbox mailbox, MessageRange set)
throws MailboxException {
- final Map<MessageUid, MessageMetaData> filteredResult = new HashMap<MessageUid, MessageMetaData>();
+ final Map<MessageUid, MessageMetaData> filteredResult = new HashMap<>();
Iterator<MailboxMessage> it = findInMailbox(mailbox, set, FetchType.Metadata, -1);
while (it.hasNext()) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java
index fa0c9ae..435f351 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryModSeqProvider.java
@@ -31,7 +31,7 @@ import org.apache.james.mailbox.store.mail.ModSeqProvider;
import org.apache.james.mailbox.store.mail.model.Mailbox;
public class InMemoryModSeqProvider implements ModSeqProvider {
- private final ConcurrentMap<InMemoryId, AtomicLong> map = new ConcurrentHashMap<InMemoryId, AtomicLong>();
+ private final ConcurrentMap<InMemoryId, AtomicLong> map = new ConcurrentHashMap<>();
@Override
public long nextModSeq(MailboxSession session, Mailbox mailbox) throws MailboxException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java
index be9942b..d3f4637 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryUidProvider.java
@@ -35,7 +35,7 @@ import com.google.common.base.Optional;
public class InMemoryUidProvider implements UidProvider{
- private final ConcurrentMap<InMemoryId, AtomicLong> map = new ConcurrentHashMap<InMemoryId, AtomicLong>();
+ private final ConcurrentMap<InMemoryId, AtomicLong> map = new ConcurrentHashMap<>();
@Override
public MessageUid nextUid(MailboxSession session, Mailbox mailbox) throws MailboxException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManager.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManager.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManager.java
index dabfb10..8f41f66 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManager.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryPerUserMaxQuotaManager.java
@@ -21,18 +21,18 @@ package org.apache.james.mailbox.inmemory.quota;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.Quota;
import org.apache.james.mailbox.model.QuotaRoot;
+import org.apache.james.mailbox.quota.MaxQuotaManager;
public class InMemoryPerUserMaxQuotaManager implements MaxQuotaManager {
private long maxMessage = Quota.UNLIMITED;
private long maxStorage = Quota.UNLIMITED;
- private final Map<String, Long> userMaxStorage = new ConcurrentHashMap<String, Long>();
- private final Map<String, Long> userMaxMessage = new ConcurrentHashMap<String, Long>();
+ private final Map<String, Long> userMaxStorage = new ConcurrentHashMap<>();
+ private final Map<String, Long> userMaxMessage = new ConcurrentHashMap<>();
@Override
public void setDefaultMaxStorage(long maxStorage) throws MailboxException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java
index 7bad0e6..7ef4d62 100644
--- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java
+++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/user/InMemorySubscriptionMapper.java
@@ -35,7 +35,7 @@ public class InMemorySubscriptionMapper extends NonTransactionalMapper implement
private final Map<String, List<Subscription>> subscriptionsByUser;
public InMemorySubscriptionMapper() {
- subscriptionsByUser = new ConcurrentHashMap<String, List<Subscription>>(INITIAL_SIZE);
+ subscriptionsByUser = new ConcurrentHashMap<>(INITIAL_SIZE);
}
public synchronized void delete(Subscription subscription) {
@@ -72,7 +72,7 @@ public class InMemorySubscriptionMapper extends NonTransactionalMapper implement
final String user = subscription.getUser();
final List<Subscription> subscriptions = subscriptionsByUser.get(user);
if (subscriptions == null) {
- final List<Subscription> newSubscriptions = new ArrayList<Subscription>();
+ final List<Subscription> newSubscriptions = new ArrayList<>();
newSubscriptions.add(subscription);
subscriptionsByUser.put(user, newSubscriptions);
} else {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
index 5ce3126..6e1865b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/FakeAuthenticator.java
@@ -23,7 +23,7 @@ import java.util.Map;
public class FakeAuthenticator implements Authenticator{
- private final Map<String, String> users = new HashMap<String, String>();
+ private final Map<String, String> users = new HashMap<>();
public boolean isAuthentic(String userid, CharSequence passwd) {
String pass = users.get(userid);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java
index beed7f1..eadf5f9 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/JVMMailboxPathLocker.java
@@ -19,16 +19,16 @@
package org.apache.james.mailbox.store;
-import org.apache.james.mailbox.MailboxPathLocker;
-import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.model.MailboxPath;
-
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.apache.james.mailbox.MailboxPathLocker;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
+
/**
* {@link MailboxPathLocker} implementation which helps to synchronize the access the
* same MailboxPath. This is done using one {@link ReentrantReadWriteLock}
@@ -36,7 +36,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
*/
public final class JVMMailboxPathLocker extends AbstractMailboxPathLocker {
- private final ConcurrentHashMap<MailboxPath, ReadWriteLock> paths = new ConcurrentHashMap<MailboxPath, ReadWriteLock>();
+ private final ConcurrentHashMap<MailboxPath, ReadWriteLock> paths = new ConcurrentHashMap<>();
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java
index 61f7f61..ba59371 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxMetaData.java
@@ -49,7 +49,7 @@ public class MailboxMetaData implements MessageManager.MetaData {
public MailboxMetaData(List<MessageUid> recent, Flags premanentFlags, long uidValidity, MessageUid uidNext, long highestModSeq, long messageCount, long unseenCount, MessageUid firstUnseen, boolean writeable, boolean modSeqPermanent, MailboxACL acl) {
super();
if (recent == null) {
- this.recent = new ArrayList<MessageUid>();
+ this.recent = new ArrayList<>();
} else {
this.recent = recent;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
index d4e3d6a..c51154b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
@@ -43,7 +43,7 @@ public class MessageBatcher {
public List<MessageRange> batchMessages(MessageRange set, BatchedOperation batchedOperation) throws MailboxException {
if (moveBatchSize > 0) {
- List<MessageRange> movedRanges = new ArrayList<MessageRange>();
+ List<MessageRange> movedRanges = new ArrayList<>();
for (MessageRange messageRange : set.split(moveBatchSize)) {
movedRanges.addAll(batchedOperation.execute(messageRange));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
index c7eb014..cf75533 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageResultImpl.java
@@ -51,7 +51,7 @@ import com.google.common.base.Objects;
*/
public class MessageResultImpl implements MessageResult {
- private final Map<MimePath, PartContent> partsByPath = new HashMap<MimePath, PartContent>();
+ private final Map<MimePath, PartContent> partsByPath = new HashMap<>();
private MimeDescriptor mimeDescriptor;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
index 7137040..95c1f9b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -82,7 +82,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
private static MimeDescriptorImpl createDescriptor(
final MimeTokenStream parser) throws IOException, MimeException {
EntityState next = parser.next();
- final Collection<MessageResult.Header> headers = new ArrayList<MessageResult.Header>();
+ final Collection<MessageResult.Header> headers = new ArrayList<>();
while (next != EntityState.T_BODY
&& next != EntityState.T_END_OF_STREAM
&& next != EntityState.T_START_MULTIPART) {
@@ -169,7 +169,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
final String subType = descriptor.getSubType();
final String type = descriptor.getMediaType();
final String transferEncoding = descriptor.getTransferEncoding();
- final Map<String, String> contentTypeParameters = new TreeMap<String, String>(descriptor.getContentTypeParameters());
+ final Map<String, String> contentTypeParameters = new TreeMap<>(descriptor.getContentTypeParameters());
final String codeset = descriptor.getCharset();
if (codeset == null) {
if ("TEXT".equals(type)) {
@@ -187,7 +187,7 @@ public class MimeDescriptorImpl implements MimeDescriptor {
final String disposition = descriptor.getContentDispositionType();
final Map<String, String> dispositionParams = descriptor
.getContentDispositionParameters();
- final Collection<MimeDescriptor> parts = new ArrayList<MimeDescriptor>();
+ final Collection<MimeDescriptor> parts = new ArrayList<>();
final String location = descriptor.getContentLocation();
final String md5 = descriptor.getContentMD5Raw();
return new MimeDescriptorImpl(
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
index c436585..ad4375c 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/ResultUtils.java
@@ -54,7 +54,7 @@ public class ResultUtils {
static final Charset US_ASCII = Charset.forName("US-ASCII");
public static List<MessageResult.Header> createHeaders(MailboxMessage document) throws IOException {
- final List<MessageResult.Header> results = new ArrayList<MessageResult.Header>();
+ final List<MessageResult.Header> results = new ArrayList<>();
MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).setMaxHeaderLen(-1).build();
final MimeStreamParser parser = new MimeStreamParser(config);
parser.setContentHandler(new AbstractContentHandler() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
index 24e5374..11d13f8 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
@@ -62,7 +62,7 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
public SimpleMailboxSession(long sessionId, String userName, String password,
final Logger log, List<Locale> localePreferences, char pathSeparator, SessionType type) {
- this(sessionId, userName, password, log, localePreferences, new ArrayList<String>(), null, pathSeparator, type);
+ this(sessionId, userName, password, log, localePreferences, new ArrayList<>(), null, pathSeparator, type);
}
public SimpleMailboxSession(long sessionId, String userName, String password,
@@ -81,7 +81,7 @@ public class SimpleMailboxSession implements MailboxSession, MailboxSession.User
}
this.localePreferences = localePreferences;
- this.attributes = new HashMap<Object, Object>();
+ this.attributes = new HashMap<>();
this.pathSeparator = pathSeparator;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index 09d3a64..aab9340 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
-import java.util.Locale;
import java.util.Random;
import java.util.Set;
@@ -397,7 +396,7 @@ public class StoreMailboxManager implements MailboxManager {
* @return session
*/
protected MailboxSession createSession(String userName, String password, Logger log, SessionType type) {
- return new SimpleMailboxSession(randomId(), userName, password, log, new ArrayList<Locale>(), getDelimiter(), type);
+ return new SimpleMailboxSession(randomId(), userName, password, log, new ArrayList<>(), getDelimiter(), type);
}
/**
@@ -545,7 +544,7 @@ public class StoreMailboxManager implements MailboxManager {
// Create parents first
// If any creation fails then the mailbox will not be created
// TODO: transaction
- final List<MailboxId> mailboxIds = new ArrayList<MailboxId>();
+ final List<MailboxId> mailboxIds = new ArrayList<>();
for (final MailboxPath mailbox : mailboxPath.getHierarchyLevels(getDelimiter()))
locker.executeWithLock(mailboxSession, mailbox, (LockAwareExecution<Void>) () -> {
@@ -696,7 +695,7 @@ public class StoreMailboxManager implements MailboxManager {
List<Mailbox> mailboxes = mailboxSessionMapperFactory.getMailboxMapper(session)
.findMailboxWithPathLike(search);
- List<MailboxMetaData> results = new ArrayList<MailboxMetaData>(mailboxes.size());
+ List<MailboxMetaData> results = new ArrayList<>(mailboxes.size());
for (Mailbox mailbox : mailboxes) {
final String name = mailbox.getName();
if(belongsToNamespaceAndUser(mailboxExpression.getBase(), mailbox)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
index fc9da70..94b8449 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java
@@ -203,7 +203,7 @@ public class StoreMessageIdManager implements MessageIdManager {
}
private Map<QuotaRoot, Integer> buildMapQuotaRoot(Collection<MailboxId> mailboxIdsToBeAdded, Collection<MailboxId> mailboxIdsToBeRemove, MailboxMapper mailboxMapper) throws MailboxException {
- Map<QuotaRoot, Integer> messageCountByQuotaRoot = new HashMap<QuotaRoot, Integer>();
+ Map<QuotaRoot, Integer> messageCountByQuotaRoot = new HashMap<>();
for (MailboxId mailboxId : mailboxIdsToBeAdded) {
QuotaRoot quotaRoot = retrieveQuotaRoot(mailboxMapper, mailboxId);
int currentCount = Optional.fromNullable(messageCountByQuotaRoot.get(quotaRoot)).or(0);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
index e4e3c30..7ff5509 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
@@ -522,7 +522,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
if (resetRecent) {
recent(resetRecent, mailboxSession);
}
- recent = new ArrayList<MessageUid>();
+ recent = new ArrayList<>();
break;
}
MailboxACL resolvedAcl = getResolvedMailboxACL(mailboxSession);
@@ -574,7 +574,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
if (!isWriteable(mailboxSession)) {
throw new ReadOnlyException(getMailboxPath(), mailboxSession.getPathDelimiter());
}
- final SortedMap<MessageUid, Flags> newFlagsByUid = new TreeMap<MessageUid, Flags>();
+ final SortedMap<MessageUid, Flags> newFlagsByUid = new TreeMap<>();
trimFlags(flags, mailboxSession);
@@ -582,7 +582,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
Iterator<UpdatedFlags> it = messageMapper.execute(() -> messageMapper.updateFlags(getMailboxEntity(), new FlagsUpdateCalculator(flags, flagsUpdateMode), set));
- final SortedMap<MessageUid, UpdatedFlags> uFlags = new TreeMap<MessageUid, UpdatedFlags>();
+ final SortedMap<MessageUid, UpdatedFlags> uFlags = new TreeMap<>();
while (it.hasNext()) {
UpdatedFlags flag = it.next();
@@ -590,7 +590,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
uFlags.put(flag.getUid(), flag);
}
- dispatcher.flagsUpdated(mailboxSession, new ArrayList<>(uFlags.keySet()), getMailboxEntity(), new ArrayList<UpdatedFlags>(uFlags.values()));
+ dispatcher.flagsUpdated(mailboxSession, new ArrayList<>(uFlags.keySet()), getMailboxEntity(), new ArrayList<>(uFlags.values()));
return newFlagsByUid;
}
@@ -713,7 +713,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
}
private Iterator<MessageMetaData> copy(Iterator<MailboxMessage> originalRows, MailboxSession session) throws MailboxException {
- final List<MessageMetaData> copiedRows = new ArrayList<MessageMetaData>();
+ final List<MessageMetaData> copiedRows = new ArrayList<>();
final MessageMapper messageMapper = mapperFactory.getMessageMapper(session);
QuotaChecker quotaChecker = new QuotaChecker(quotaManager, quotaRootResolver, mailbox);
@@ -728,8 +728,8 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
}
private MoveResult move(Iterator<MailboxMessage> originalRows, MailboxSession session) throws MailboxException {
- final List<MessageMetaData> movedRows = new ArrayList<MessageMetaData>();
- final List<MessageMetaData> originalRowsCopy = new ArrayList<MessageMetaData>();
+ final List<MessageMetaData> movedRows = new ArrayList<>();
+ final List<MessageMetaData> originalRowsCopy = new ArrayList<>();
final MessageMapper messageMapper = mapperFactory.getMessageMapper(session);
while (originalRows.hasNext()) {
@@ -744,7 +744,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
private SortedMap<MessageUid, MessageMetaData> copy(MessageRange set, StoreMessageManager to, MailboxSession session) throws MailboxException {
- IteratorWrapper<MailboxMessage> originalRows = new IteratorWrapper<MailboxMessage>(retrieveOriginalRows(set, session));
+ IteratorWrapper<MailboxMessage> originalRows = new IteratorWrapper<>(retrieveOriginalRows(set, session));
SortedMap<MessageUid, MessageMetaData> copiedUids = collectMetadata(to.copy(originalRows, session));
@@ -758,7 +758,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
}
private SortedMap<MessageUid, MessageMetaData> move(MessageRange set, StoreMessageManager to, MailboxSession session) throws MailboxException {
- IteratorWrapper<MailboxMessage> originalRows = new IteratorWrapper<MailboxMessage>(retrieveOriginalRows(set, session));
+ IteratorWrapper<MailboxMessage> originalRows = new IteratorWrapper<>(retrieveOriginalRows(set, session));
MoveResult moveResult = to.move(originalRows, session);
SortedMap<MessageUid, MessageMetaData> moveUids = collectMetadata(moveResult.getMovedMessages());
@@ -778,7 +778,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana
}
private SortedMap<MessageUid, MessageMetaData> collectMetadata(Iterator<MessageMetaData> ids) {
- final SortedMap<MessageUid, MessageMetaData> copiedMessages = new TreeMap<MessageUid, MessageMetaData>();
+ final SortedMap<MessageUid, MessageMetaData> copiedMessages = new TreeMap<>();
while (ids.hasNext()) {
MessageMetaData data = ids.next();
copiedMessages.put(data.getUid(), data);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxListenerRegistry.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxListenerRegistry.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxListenerRegistry.java
index 13f98a3..f68a7c8 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxListenerRegistry.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/MailboxListenerRegistry.java
@@ -37,7 +37,7 @@ public class MailboxListenerRegistry {
private final ConcurrentLinkedQueue<MailboxListener> globalListeners;
public MailboxListenerRegistry() {
- this.globalListeners = new ConcurrentLinkedQueue<MailboxListener>();
+ this.globalListeners = new ConcurrentLinkedQueue<>();
this.listeners = Multimaps.synchronizedMultimap(HashMultimap.<MailboxPath, MailboxListener>create());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegister.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegister.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegister.java
index be367aa..c770bb0 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegister.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/DistantMailboxPathRegister.java
@@ -19,14 +19,6 @@
package org.apache.james.mailbox.store.event.distributed;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableSet;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.store.publisher.Topic;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import java.util.Map;
import java.util.Set;
import java.util.Timer;
@@ -34,6 +26,16 @@ import java.util.TimerTask;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxPath;
+import org.apache.james.mailbox.store.publisher.Topic;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableSet;
+
public class DistantMailboxPathRegister implements MailboxPathRegister {
private static final int DEFAULT_MAX_RETRY = 1000;
private final ConcurrentHashMap<MailboxPath, Long> registeredMailboxPathCount;
@@ -50,7 +52,7 @@ public class DistantMailboxPathRegister implements MailboxPathRegister {
public DistantMailboxPathRegister(DistantMailboxPathRegisterMapper mapper, int maxRetry, long schedulerPeriodInS) {
this.maxRetry = maxRetry;
this.mapper = mapper;
- this.registeredMailboxPathCount = new ConcurrentHashMap<MailboxPath, Long>();
+ this.registeredMailboxPathCount = new ConcurrentHashMap<>();
this.topic = new Topic(UUID.randomUUID().toString());
this.timer = new Timer();
this.schedulerPeriodInS = schedulerPeriodInS;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
index c49c917..c61fb89 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
@@ -21,7 +21,6 @@ package org.apache.james.mailbox.store.extractor;
import java.io.InputStream;
import java.util.HashMap;
-import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.james.mailbox.extractor.ParsedContent;
@@ -37,9 +36,9 @@ public class DefaultTextExtractor implements TextExtractor {
@Override
public ParsedContent extractContent(InputStream inputStream, String contentType) throws Exception {
if(contentType != null && contentType.startsWith("text/") ) {
- return new ParsedContent(IOUtils.toString(inputStream), new HashMap<String, List<String>>());
+ return new ParsedContent(IOUtils.toString(inputStream), new HashMap<>());
} else {
- return new ParsedContent(null, new HashMap<String, List<String>>());
+ return new ParsedContent(null, new HashMap<>());
}
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java
index 6e47062..d1225b0 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/EventConverter.java
@@ -167,7 +167,7 @@ public class EventConverter {
MailboxDataTransferObject mailboxIntermediate,
List<MessageUid> uids,
MailboxListener.MetaDataHoldingEvent event) {
- HashMap<MessageUid, MessageMetaDataDataTransferObject> metaDataProxyMap = new HashMap<MessageUid, MessageMetaDataDataTransferObject>();
+ HashMap<MessageUid, MessageMetaDataDataTransferObject> metaDataProxyMap = new HashMap<>();
for(MessageUid uid : uids) {
metaDataProxyMap.put(uid, new MessageMetaDataDataTransferObject(
event.getMetaData(uid)
@@ -184,7 +184,7 @@ public class EventConverter {
private SortedMap<MessageUid, MessageMetaData> retrieveMetadata(Map<MessageUid, MessageMetaDataDataTransferObject> metaDataProxyMap) {
if(metaDataProxyMap != null) {
- TreeMap<MessageUid, MessageMetaData> result = new TreeMap<MessageUid, MessageMetaData>();
+ TreeMap<MessageUid, MessageMetaData> result = new TreeMap<>();
Set<Map.Entry<MessageUid, MessageMetaDataDataTransferObject>> entrySet = metaDataProxyMap.entrySet();
for (Map.Entry<MessageUid, MessageMetaDataDataTransferObject> entry : entrySet) {
result.put(entry.getKey(), entry.getValue().getMetadata());
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java
index 3598eaa..ec65a5d 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/json/event/dto/MailboxSessionDataTransferObject.java
@@ -56,7 +56,7 @@ public class MailboxSessionDataTransferObject {
public MailboxSessionDataTransferObject(MailboxSession session) {
username = session.getUser().getUserName();
- sharedSpaces = new ArrayList<String>(session.getSharedSpaces());
+ sharedSpaces = new ArrayList<>(session.getSharedSpaces());
otherUserSpace = session.getOtherUsersSpace();
separator = session.getPathDelimiter();
sessionType = extractSessionType(session);
@@ -81,7 +81,7 @@ public class MailboxSessionDataTransferObject {
if (locales != null) {
return Lists.transform(locales, LocaleDataTransferObject::getLocale);
} else {
- return new ArrayList<Locale>();
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
index 0cf6d8b..88dea75 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java
@@ -78,7 +78,7 @@ public abstract class AbstractMessageMapper extends TransactionalMapper implemen
@Override
public Iterator<UpdatedFlags> updateFlags(Mailbox mailbox, FlagsUpdateCalculator flagsUpdateCalculator, MessageRange set) throws MailboxException {
- final List<UpdatedFlags> updatedFlags = new ArrayList<UpdatedFlags>();
+ final List<UpdatedFlags> updatedFlags = new ArrayList<>();
Iterator<MailboxMessage> messages = findInMailbox(mailbox, set, FetchType.Metadata, -1);
long modSeq = -1;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
index 7d004c7..6667a37 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/PropertyBuilder.java
@@ -81,7 +81,7 @@ public class PropertyBuilder {
public PropertyBuilder() {
textualLineCount = null;
- properties = new ArrayList<SimpleProperty>(INITIAL_CAPACITY);
+ properties = new ArrayList<>(INITIAL_CAPACITY);
}
/**
@@ -466,7 +466,7 @@ public class PropertyBuilder {
* @return not null
*/
public List<Property> toProperties() {
- return new ArrayList<Property>(properties);
+ return new ArrayList<>(properties);
}
/**
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
index c3ec988..9ebee95 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java
@@ -52,7 +52,7 @@ import com.google.common.base.Preconditions;
public class LazyMessageSearchIndex extends ListeningMessageSearchIndex {
private final ListeningMessageSearchIndex index;
- private final ConcurrentHashMap<MailboxId, Object> indexed = new ConcurrentHashMap<MailboxId, Object>();
+ private final ConcurrentHashMap<MailboxId, Object> indexed = new ConcurrentHashMap<>();
public LazyMessageSearchIndex(ListeningMessageSearchIndex index) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
index 703385c..a51a7ff 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SearchUtil.java
@@ -475,7 +475,7 @@ public class SearchUtil {
public static Predicate<MessageId> distinct() {
return new Predicate<MessageId>() {
- private final Set<MessageId> set = new HashSet<MessageId>();
+ private final Set<MessageId> set = new HashSet<>();
@Override
public boolean apply(MessageId input) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
index 082d90c..60f98a8 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/SimpleMessageSearchIndex.java
@@ -119,7 +119,7 @@ public class SimpleMessageSearchIndex implements MessageSearchIndex {
}
MessageMapper mapper = messageMapperFactory.getMessageMapper(session);
- final SortedSet<MailboxMessage> hitSet = new TreeSet<MailboxMessage>();
+ final SortedSet<MailboxMessage> hitSet = new TreeSet<>();
UidCriterion uidCrit = findConjugatedUidCriterion(query.getCriterias());
if (uidCrit != null) {
@@ -157,7 +157,7 @@ public class SimpleMessageSearchIndex implements MessageSearchIndex {
if (searchQuery.getInMailboxes().isEmpty()) {
return getAsMessageIds(searchResults(session, filteredMailboxes, searchQuery.getSearchQuery()), limit);
}
- List<Mailbox> queriedMailboxes = new ArrayList<Mailbox>();
+ List<Mailbox> queriedMailboxes = new ArrayList<>();
for (Mailbox mailbox: filteredMailboxes) {
if (searchQuery.getInMailboxes().contains(mailbox.getMailboxId())) {
queriedMailboxes.add(mailbox);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
index 1216094..75b9484 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
@@ -238,7 +238,7 @@ public class PartContentBuilder {
if (empty) {
results = Collections.EMPTY_LIST;
} else {
- results = new ArrayList<MessageResult.Header>();
+ results = new ArrayList<>();
for (EntityState state = parser.getState(); state != EntityState.T_END_HEADER; state = parser
.next()) {
switch (state) {
@@ -276,7 +276,7 @@ public class PartContentBuilder {
if (empty) {
results = Collections.EMPTY_LIST;
} else {
- results = new ArrayList<MessageResult.Header>();
+ results = new ArrayList<>();
try {
advancedToMessage();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java
index 59ec33b..70858e7 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBuilder.java
@@ -38,7 +38,7 @@ public class MessageBuilder {
public int size = 8867;
public Flags flags = new Flags();
public byte[] body = {};
- public final Map<String, String> headers = new HashMap<String, String>();
+ public final Map<String, String> headers = new HashMap<>();
public int lineNumber = 0;
public MailboxMessage build() throws Exception {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
index 2934060..d9f6117 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
@@ -123,7 +123,7 @@ public class SearchUtilsMultipartMixedTest {
builder.header("Content-Type", "multipart/mixed;boundary=1729");
builder.body = Charset.forName("us-ascii").encode(BODY).array();
row = builder.build();
- recent = new ArrayList<MessageUid>();
+ recent = new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
index c21c730..8f8d9d3 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
@@ -54,7 +54,7 @@ public class SearchUtilsRFC822Test {
@Before
public void setUp() throws Exception {
- recent = new ArrayList<MessageUid>();
+ recent = new ArrayList<>();
MessageBuilder builder = new MessageBuilder();
builder.header("From", "Alex <alex@example.org");
builder.header("To", FROM_ADDRESS);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
index 181cfff..efb6b80 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
@@ -73,7 +73,7 @@ public class SearchUtilsTest {
}
@Before
public void setUp() throws Exception {
- recent = new ArrayList<MessageUid>();
+ recent = new ArrayList<>();
builder = new MessageBuilder();
builder.uid = MessageUid.of(1009);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
index d18501d..5d5ad03 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SimpleMailboxMembership.java
@@ -71,7 +71,7 @@ public class SimpleMailboxMembership implements MailboxMessage {
this.size = size;
this.body = body;
if (headers == null) {
- this.headers = new HashMap<String,String>();
+ this.headers = new HashMap<>();
} else {
this.headers = headers;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
index e21ea94..5feb68f 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java
@@ -57,7 +57,7 @@ public class StoreMailboxMessageResultIteratorTest {
private final class TestFetchGroup implements FetchGroup {
@Override
public Set<PartContentDescriptor> getPartContentDescriptors() {
- return new HashSet<PartContentDescriptor>();
+ return new HashSet<>();
}
@Override
@@ -103,7 +103,7 @@ public class StoreMailboxMessageResultIteratorTest {
org.apache.james.mailbox.store.mail.MessageMapper.FetchType type, int limit)
throws MailboxException {
- List<MailboxMessage> messages = new ArrayList<MailboxMessage>();
+ List<MailboxMessage> messages = new ArrayList<>();
for (MessageUid uid: Iterables.limit(set, limit)) {
if (messageRange.includes(uid)) {
messages.add(createMessage(uid));
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java
index bef60ea..cf0ee8a 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestMailboxSessionMapperFactory.java
@@ -73,7 +73,7 @@ public class TestMailboxSessionMapperFactory extends MailboxSessionMapperFactory
private final SimpleMailbox mailbox3;
private final SimpleMailbox mailbox4;
- private final List<MailboxMessage> messages = new ArrayList<MailboxMessage>();
+ private final List<MailboxMessage> messages = new ArrayList<>();
private final MailboxMapper mailboxMapper;
private final MessageIdMapper messageIdMapper;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java
index e360468..adadc2d 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/event/distributed/BroadcastDelegatingMailboxListenerIntegrationTest.java
@@ -28,7 +28,6 @@ import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageMetaData;
import org.apache.james.mailbox.model.TestId;
import org.apache.james.mailbox.model.TestMessageId;
import org.apache.james.mailbox.store.TestIdDeserializer;
@@ -118,7 +117,7 @@ public class BroadcastDelegatingMailboxListenerIntegrationTest {
public void mailboxEventListenersShouldBeTriggeredIfRegistered() throws Exception {
SimpleMailbox simpleMailbox = new SimpleMailbox(MAILBOX_PATH_1, 42);
simpleMailbox.setMailboxId(TestId.of(52));
- final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<MessageUid, MessageMetaData>(), simpleMailbox, EMPTY_MESSAGE_CACHE);
+ final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE);
broadcastDelegatingMailboxListener1.event(event);
@@ -131,7 +130,7 @@ public class BroadcastDelegatingMailboxListenerIntegrationTest {
public void onceEventListenersShouldBeTriggeredOnceAcrossTheCluster() {
SimpleMailbox simpleMailbox = new SimpleMailbox(MAILBOX_PATH_1, 42);
simpleMailbox.setMailboxId(TestId.of(52));
- final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<MessageUid, MessageMetaData>(), simpleMailbox, EMPTY_MESSAGE_CACHE);
+ final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE);
broadcastDelegatingMailboxListener1.event(event);
@@ -144,7 +143,7 @@ public class BroadcastDelegatingMailboxListenerIntegrationTest {
public void eachEventListenersShouldBeTriggeredOnEachNode() {
SimpleMailbox simpleMailbox = new SimpleMailbox(MAILBOX_PATH_1, 42);
simpleMailbox.setMailboxId(TestId.of(52));
- final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<MessageUid, MessageMetaData>(), simpleMailbox, EMPTY_MESSAGE_CACHE);
+ final MailboxListener.Event event = new EventFactory().added(mailboxSession, new TreeMap<>(), simpleMailbox, EMPTY_MESSAGE_CACHE);
broadcastDelegatingMailboxListener1.event(event);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java
index 76c1185..6202d25 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/EventSerializerTest.java
@@ -80,7 +80,7 @@ public abstract class EventSerializerTest {
@Test
public void addedEventShouldBeWellConverted() throws Exception {
- TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<MessageUid, MessageMetaData>();
+ TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>();
treeMap.put(UID, MESSAGE_META_DATA);
MailboxListener.Event event = eventFactory.added(mailboxSession, treeMap, mailbox, ImmutableMap.<MessageUid, MailboxMessage>of());
byte[] serializedEvent = serializer.serializeEvent(event);
@@ -96,7 +96,7 @@ public abstract class EventSerializerTest {
@Test
public void expungedEventShouldBeWellConverted() throws Exception {
- TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<MessageUid, MessageMetaData>();
+ TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>();
treeMap.put(UID, MESSAGE_META_DATA);
MailboxListener.Event event = eventFactory.expunged(mailboxSession, treeMap, mailbox);
byte[] serializedEvent = serializer.serializeEvent(event);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/SimpleMailboxACLJsonConverterTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/SimpleMailboxACLJsonConverterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/SimpleMailboxACLJsonConverterTest.java
index 13e4d50..7eb7bea 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/SimpleMailboxACLJsonConverterTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/SimpleMailboxACLJsonConverterTest.java
@@ -25,18 +25,19 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.HashMap;
import java.util.Map;
-import net.javacrumbs.jsonunit.core.Option;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.SimpleMailboxACL;
import org.junit.Test;
+import net.javacrumbs.jsonunit.core.Option;
+
public class SimpleMailboxACLJsonConverterTest {
public class ACLMapBuilder {
private final Map<SimpleMailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights> map;
public ACLMapBuilder() {
- map = new HashMap<SimpleMailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>();
+ map = new HashMap<>();
}
public ACLMapBuilder addSingleUserEntryToMap() {
@@ -61,7 +62,7 @@ public class SimpleMailboxACLJsonConverterTest {
}
public MailboxACL buildAsACL() {
- return new SimpleMailboxACL(new HashMap<SimpleMailboxACL.MailboxACLEntryKey, MailboxACL.MailboxACLRights>(map));
+ return new SimpleMailboxACL(new HashMap<>(map));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java
index 9fb3fc8..8b2b81c 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MetadataMapAssertTest.java
@@ -58,21 +58,21 @@ public class MetadataMapAssertTest {
@Test
public void metadataMapAssertShouldSucceedWhenContainingRightMetadata() {
- Map<MessageUid, MessageMetaData> metaDataMap = new HashMap<MessageUid, MessageMetaData>();
+ Map<MessageUid, MessageMetaData> metaDataMap = new HashMap<>();
metaDataMap.put(UID, new SimpleMessageMetaData(UID, MODSEQ, new Flags(), HEADER_STRING.length() + BODY_STRING.length(), DATE, MESSAGE_ID));
MetadataMapAssert.assertThat(metaDataMap).containsMetadataForMessages(message1);
}
@Test(expected = AssertionError.class)
public void metadataMapAssertShouldFailWhenUidMismatch() {
- Map<MessageUid, MessageMetaData> metaDataMap = new HashMap<MessageUid, MessageMetaData>();
+ Map<MessageUid, MessageMetaData> metaDataMap = new HashMap<>();
metaDataMap.put(UID, new SimpleMessageMetaData(UID.next(), MODSEQ, new Flags(), HEADER_STRING.length() + BODY_STRING.length(), DATE, MESSAGE_ID));
MetadataMapAssert.assertThat(metaDataMap).containsMetadataForMessages(message1);
}
@Test(expected = AssertionError.class)
public void metadataMapAssertShouldFailWhenDateMismatch() {
- Map<MessageUid, MessageMetaData> metaDataMap = new HashMap<MessageUid, MessageMetaData>();
+ Map<MessageUid, MessageMetaData> metaDataMap = new HashMap<>();
Date date = new Date();
date.setTime(DATE.getTime() + 100L);
metaDataMap.put(UID, new SimpleMessageMetaData(UID, MODSEQ, new Flags(), HEADER_STRING.length() + BODY_STRING.length(), date, MESSAGE_ID));
@@ -81,7 +81,7 @@ public class MetadataMapAssertTest {
@Test(expected = AssertionError.class)
public void metadataMapAssertShouldFailWhenSizeMismatch() {
- Map<MessageUid, MessageMetaData> metaDataMap = new HashMap<MessageUid, MessageMetaData>();
+ Map<MessageUid, MessageMetaData> metaDataMap = new HashMap<>();
metaDataMap.put(UID, new SimpleMessageMetaData(UID , MODSEQ, new Flags(), HEADER_STRING.length() + BODY_STRING.length() + 1, DATE, MESSAGE_ID));
MetadataMapAssert.assertThat(metaDataMap).containsMetadataForMessages(message1);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
----------------------------------------------------------------------
diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
index 9cab809..9c09cc9 100644
--- a/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
+++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
@@ -55,7 +55,7 @@ public class MailboxCopierImpl implements MailboxCopier {
@Override
public Set<PartContentDescriptor> getPartContentDescriptors() {
- return new HashSet<PartContentDescriptor>();
+ return new HashSet<>();
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org