http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java index abfea13..eec1716 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/registrations/GlobalRegistration.java @@ -19,11 +19,12 @@ package org.apache.james.mailbox.indexer.registrations; -import com.google.common.base.Optional; +import java.util.concurrent.ConcurrentHashMap; + import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.model.MailboxPath; -import java.util.concurrent.ConcurrentHashMap; +import com.google.common.base.Optional; public class GlobalRegistration implements MailboxListener { @@ -31,8 +32,8 @@ public class GlobalRegistration implements MailboxListener { private final ConcurrentHashMap<MailboxPath, MailboxPath> nameCorrespondence; public GlobalRegistration() { - this.isPathDeleted = new ConcurrentHashMap<MailboxPath, Boolean>(); - this.nameCorrespondence = new ConcurrentHashMap<MailboxPath, MailboxPath>(); + this.isPathDeleted = new ConcurrentHashMap<>(); + this.nameCorrespondence = new ConcurrentHashMap<>(); } public Optional<MailboxPath> getPathToIndex(MailboxPath mailboxPath) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java index 480d3f4..7c15da8 100644 --- a/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java +++ b/mailbox/tool/src/test/java/org/apache/james/mailbox/indexer/registrations/MailboxRegistrationTest.java @@ -73,7 +73,7 @@ public class MailboxRegistrationTest { @Test public void AddedEventsShouldNotBeReported() { - TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<MessageUid, MessageMetaData>(); + TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>(); treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId())); MailboxListener.Event event = eventFactory.added(session, treeMap, MAILBOX, ImmutableMap.<MessageUid, MailboxMessage> of()); mailboxRegistration.event(event); @@ -82,7 +82,7 @@ public class MailboxRegistrationTest { @Test public void ExpungedEventsShouldBeReported() { - TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<MessageUid, MessageMetaData>(); + TreeMap<MessageUid, MessageMetaData> treeMap = new TreeMap<>(); treeMap.put(UID, new SimpleMessageMetaData(UID, MOD_SEQ, new Flags(), SIZE, new Date(), new DefaultMessageId())); MailboxListener.Event event = eventFactory.expunged(session, treeMap, MAILBOX); mailboxRegistration.event(event); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java index f83c641..0d9d492 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalyzer.java @@ -105,10 +105,10 @@ public class BayesianAnalyzer { final static double DEFAULT_TOKEN_PROBABILITY = 0.4; /** Map of ham tokens and their occurrences. */ - private Map<String, Integer> hamTokenCounts = new HashMap<String, Integer>(); + private Map<String, Integer> hamTokenCounts = new HashMap<>(); /** Map of spam tokens and their occurrences. */ - private Map<String, Integer> spamTokenCounts = new HashMap<String, Integer>(); + private Map<String, Integer> spamTokenCounts = new HashMap<>(); /** Number of ham messages analyzed. */ private int hamMessageCount = 0; @@ -117,7 +117,7 @@ public class BayesianAnalyzer { private int spamMessageCount = 0; /** Final token/probability corpus. */ - private Map<String, Double> corpus = new HashMap<String, Double>(); + private Map<String, Double> corpus = new HashMap<>(); /** * Basic class constructor. @@ -235,10 +235,10 @@ public class BayesianAnalyzer { */ public void buildCorpus() { // Combine the known ham & spam tokens. - Set<String> set = new HashSet<String>(hamTokenCounts.size() + spamTokenCounts.size()); + Set<String> set = new HashSet<>(hamTokenCounts.size() + spamTokenCounts.size()); set.addAll(hamTokenCounts.keySet()); set.addAll(spamTokenCounts.keySet()); - Map<String, Double> tempCorpus = new HashMap<String, Double>(set.size()); + Map<String, Double> tempCorpus = new HashMap<>(set.size()); // Iterate through all the tokens and compute their new // individual probabilities. @@ -319,7 +319,7 @@ public class BayesianAnalyzer { * @return Set */ private Set<String> parse(Reader stream) throws java.io.IOException { - Set<String> tokens = new HashSet<String>(); + Set<String> tokens = new HashSet<>(); new TokenCollector(tokens).collect(stream); // Return the unique set of tokens encountered. return tokens; @@ -385,7 +385,7 @@ public class BayesianAnalyzer { */ private SortedSet<TokenProbabilityStrength> getTokenProbabilityStrengths(Set<String> tokens, Map<String, Double> workCorpus) { // Convert to a SortedSet of token probability strengths. - SortedSet<TokenProbabilityStrength> tokenProbabilityStrengths = new TreeSet<TokenProbabilityStrength>(); + SortedSet<TokenProbabilityStrength> tokenProbabilityStrengths = new TreeSet<>(); for (String token : tokens) { TokenProbabilityStrength tps = new TokenProbabilityStrength(); @@ -433,7 +433,7 @@ public class BayesianAnalyzer { } private Collection<String> buildDegenerated(String fullToken) { - ArrayList<String> tokens = new ArrayList<String>(); + ArrayList<String> tokens = new ArrayList<>(); String header; String token; String tokenLower; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java index e73f5d1..e019b3f 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java @@ -64,7 +64,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer implements Log { private String sqlFileName; /** Holds value of property sqlParameters. */ - private Map<String, String> sqlParameters = new HashMap<String, String>(); + private Map<String, String> sqlParameters = new HashMap<>(); /** Holds value of property lastDatabaseUpdateTime. */ private static long lastDatabaseUpdateTime; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java index c685c1c..42d05f3 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/SqlResources.java @@ -46,10 +46,10 @@ import org.w3c.dom.NodeList; */ class SqlResources { /** A map of statement types to SQL statements */ - private final Map<String, String> m_sql = new HashMap<String, String>(); + private final Map<String, String> m_sql = new HashMap<>(); /** A map of engine specific options */ - private final Map<String, String> m_dbOptions = new HashMap<String, String>(); + private final Map<String, String> m_dbOptions = new HashMap<>(); /** A set of all used String values */ static private final Map<String, String> stringTable = java.util.Collections.synchronizedMap(new HashMap<String, String>()); @@ -175,7 +175,7 @@ class SqlResources { // Get parameters defined within the file as defaults, // and use supplied parameters as overrides. - Map<String, String> parameters = new HashMap<String, String>(); + Map<String, String> parameters = new HashMap<>(); // First read from the <params> element, if it exists. Element parametersElement = (Element) (sectionElement.getElementsByTagName("parameters").item(0)); if (parametersElement != null) { @@ -194,8 +194,8 @@ class SqlResources { // 2 maps - one for storing default statements, // the other for statements with a "db" attribute matching this // connection. - Map<String, String> defaultSqlStatements = new HashMap<String, String>(); - Map<String, String> dbProductSqlStatements = new HashMap<String, String>(); + Map<String, String> defaultSqlStatements = new HashMap<>(); + Map<String, String> dbProductSqlStatements = new HashMap<>(); // Process each sql statement, replacing string parameters, // and adding to the appropriate map.. http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java index 641d90c..3edeb37 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java @@ -280,8 +280,8 @@ public abstract class GenericMailet implements Mailet, MailetConfig { return; } - Collection<String> allowed = new HashSet<String>(); - Collection<String> bad = new ArrayList<String>(); + Collection<String> allowed = new HashSet<>(); + Collection<String> bad = new ArrayList<>(); Collections.addAll(allowed, allowedArray); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java index c5b53d2..0676c13 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericRecipientMatcher.java @@ -49,7 +49,7 @@ public abstract class GenericRecipientMatcher extends GenericMatcher { * @return Collection the Collection of MailAddress objects that have been matched */ public final Collection<MailAddress> match(Mail mail) throws MessagingException { - Collection<MailAddress> matching = new ArrayList<MailAddress>(); + Collection<MailAddress> matching = new ArrayList<>(); for (MailAddress recipient : mail.getRecipients()) { if (matchRecipient(recipient)) { matching.add(recipient); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java index 767c198..2628fdf 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/MatcherInverter.java @@ -77,7 +77,7 @@ public class MatcherInverter implements Matcher { public Collection<MailAddress> match(Mail mail) throws MessagingException { // Create a new recipient Collection cause mail.getRecipients() give a reference to the internal // list of recipients. If we make changes there the original collection whould be corrupted - Collection<MailAddress> recipients = new ArrayList<MailAddress>(mail.getRecipients()); + Collection<MailAddress> recipients = new ArrayList<>(mail.getRecipients()); Collection<MailAddress> matchedRcpts = wrappedMatcher.match(mail); // check if a only a part of the recipients matched http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java index 703726e..f24507f 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/StringUtils.java @@ -46,7 +46,7 @@ public final class StringUtils { */ public static String[] split(String text, String pattern) { String[] array = text.split(pattern, -1); - ArrayList<String> list = new ArrayList<String>(); + ArrayList<String> list = new ArrayList<>(); for (int i = 0; i < array.length; i++) { boolean escaped = false; if (i > 0 && array[i - 1].endsWith("\\")) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java index 9a70622..38ffad6 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java @@ -68,7 +68,7 @@ public class FakeMailContext implements MailetContext { } private static ImmutableMap<String, Serializable> buildAttributesMap(Mail mail) { - Map<String, Serializable> result = new HashMap<String, Serializable>(); + Map<String, Serializable> result = new HashMap<>(); List<String> attributesNames = Lists.newArrayList(mail.getAttributeNames()); for (String attributeName: attributesNames) { result.put(attributeName, mail.getAttribute(attributeName)); @@ -110,7 +110,7 @@ public class FakeMailContext implements MailetContext { private MailAddress sender; private Optional<Collection<MailAddress>> recipients = Optional.absent(); private MimeMessage msg; - private Map<String, Serializable> attributes = new HashMap<String, Serializable>(); + private Map<String, Serializable> attributes = new HashMap<>(); private Optional<String> state = Optional.absent(); private Optional<Boolean> fromMailet = Optional.absent(); @@ -298,9 +298,9 @@ public class FakeMailContext implements MailetContext { private final MailAddress postmaster; private FakeMailContext(Optional<Logger> logger, MailAddress postmaster) { - attributes = new HashMap<String, Object>(); - sentMails = new ArrayList<SentMail>(); - bouncedMails = new ArrayList<BouncedMail>(); + attributes = new HashMap<>(); + sentMails = new ArrayList<>(); + bouncedMails = new ArrayList<>(); this.logger = logger; this.postmaster = postmaster; } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java index 55349d7..c71e51e 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/KeyStoreHolder.java @@ -131,7 +131,7 @@ public class KeyStoreHolder { .build(); SignerInformationStore siginfo = signed.getSignerInfos(); Collection<SignerInformation> sigCol = siginfo.getSigners(); - List<SMIMESignerInfo> result = new ArrayList<SMIMESignerInfo>(sigCol.size()); + List<SMIMESignerInfo> result = new ArrayList<>(sigCol.size()); // I iterate over the signer collection // checking if the signatures put // on the message are valid. http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java index e8b2374..74ff5dc 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/SMIMEKeyHolder.java @@ -164,7 +164,7 @@ public class SMIMEKeyHolder implements KeyHolder{ throw new KeyStoreException("The \"" + keyAlias + "\" X509Certificate alias was not found in keystore."); } java.security.cert.Certificate[] certificateChain = keyStore.getCertificateChain(keyAlias); - ArrayList<java.security.cert.Certificate> certList = new ArrayList<java.security.cert.Certificate>(); + ArrayList<java.security.cert.Certificate> certList = new ArrayList<>(); if (certificateChain == null) { certList.add(this.certificate); } else { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java index 887329b..f9e5aba 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMECheckSignature.java @@ -34,9 +34,9 @@ import javax.mail.internet.MimeMultipart; import org.apache.james.transport.KeyStoreHolder; import org.apache.james.transport.SMIMESignerInfo; -import org.apache.mailet.base.GenericMailet; import org.apache.mailet.Mail; import org.apache.mailet.MailetConfig; +import org.apache.mailet.base.GenericMailet; import org.bouncycastle.cms.CMSException; import org.bouncycastle.mail.smime.SMIMEException; import org.bouncycastle.mail.smime.SMIMESigned; @@ -189,7 +189,7 @@ public class SMIMECheckSignature extends GenericMailet { // If at least one mail signer is found // the mail attributes are set. if (signers != null) { - ArrayList<X509Certificate> signerinfolist = new ArrayList<X509Certificate>(); + ArrayList<X509Certificate> signerinfolist = new ArrayList<>(); for (SMIMESignerInfo info : signers) { if (info.isSignValid() http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java index 215ce34..a6a628a 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMEDecrypt.java @@ -158,7 +158,7 @@ public class SMIMEDecrypt extends GenericMailet { // behavior of the SMIMEVerifySignature mailet. In that way // it is possible to reuse the same matchers to analyze // the result of the operation. - ArrayList<X509Certificate> list = new ArrayList<X509Certificate>(1); + ArrayList<X509Certificate> list = new ArrayList<>(1); list.add(keyHolder.getCertificate()); mail.setAttribute(mailAttribute, list); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java index 9f1da32..0c7d075 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java @@ -55,7 +55,7 @@ public class DefaultDescriptorsExtractor { private final List<MailetMatcherDescriptor> descriptors; public DefaultDescriptorsExtractor() { - descriptors = new ArrayList<MailetMatcherDescriptor> (); + descriptors = new ArrayList<>(); } /** @@ -298,7 +298,7 @@ public class DefaultDescriptorsExtractor { private List<JavaClass> getAllInterfacesQdox(JavaClass javaClass) { - List<JavaClass> res = new LinkedList<JavaClass>(); + List<JavaClass> res = new LinkedList<>(); if (javaClass.getImplementedInterfaces() != null) { JavaClass[] interfaces = javaClass.getImplementedInterfaces(); Collections.addAll(res, interfaces); @@ -310,7 +310,7 @@ public class DefaultDescriptorsExtractor { } private List<Class<?>> getAllInterfaces(Class<?> klass) { - List<Class<?>> res = new LinkedList<Class<?>>(); + List<Class<?>> res = new LinkedList<>(); if (klass.getInterfaces() != null) { Class<?>[] interfaces = klass.getInterfaces(); for (Class<?> anInterface : interfaces) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java index 5d3fc8e..8be918b 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java @@ -527,7 +527,7 @@ public class ClamAVScan extends GenericMailet { InetAddress address; - Set<InetAddress> usedAddresses = new HashSet<InetAddress>(getAddressesCount()); + Set<InetAddress> usedAddresses = new HashSet<>(getAddressesCount()); for (; ; ) { // this do-while loop is needed because other threads could in the meantime // calling getNextAddress(), and because of that the current thread may skip http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java index 241e243..0057ea0 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java @@ -162,7 +162,7 @@ public class HeadersToHTTP extends GenericMailet { // reply to // subject - HashSet<NameValuePair> pairs = new HashSet<NameValuePair>(); + HashSet<NameValuePair> pairs = new HashSet<>(); if (message!=null) { if (message.getSender()!=null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java index fffc6c0..3fc4f53 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/OnlyText.java @@ -19,18 +19,19 @@ package org.apache.james.transport.mailets; -import org.apache.mailet.Experimental; -import org.apache.mailet.Mail; -import org.apache.mailet.MailetException; -import org.apache.mailet.base.GenericMailet; +import java.io.IOException; +import java.util.HashMap; import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.Multipart; import javax.mail.Part; import javax.mail.internet.ContentType; -import java.io.IOException; -import java.util.HashMap; + +import org.apache.mailet.Experimental; +import org.apache.mailet.Mail; +import org.apache.mailet.MailetException; +import org.apache.mailet.base.GenericMailet; /** * Keep only the text part of a message. @@ -45,7 +46,7 @@ public class OnlyText extends GenericMailet { private static final String PARAMETER_NAME_NOTEXT_PROCESSOR = "NoTextProcessor"; private String optionsNotextProcessor = null; - private final HashMap<String, String> charMap = new HashMap<String, String>(); + private final HashMap<String, String> charMap = new HashMap<>(); /** * returns a String describing this mailet. http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java index a419f95..6f822db 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PostmasterAlias.java @@ -21,14 +21,15 @@ package org.apache.james.transport.mailets; -import org.apache.mailet.base.GenericMailet; +import java.util.Collection; +import java.util.Vector; + +import javax.mail.MessagingException; + import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.MailetContext; - -import javax.mail.MessagingException; -import java.util.Collection; -import java.util.Vector; +import org.apache.mailet.base.GenericMailet; /** * Rewrites recipient addresses to make sure email for the postmaster is @@ -59,7 +60,7 @@ public class PostmasterAlias extends GenericMailet { //Should remove this address... we want to replace it with // the server's postmaster address if (recipientsToRemove == null) { - recipientsToRemove = new Vector<MailAddress>(); + recipientsToRemove = new Vector<>(); } recipientsToRemove.add(addr); //Flag this as having found the postmaster http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java index 58b7304..dd20ed4 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java @@ -342,7 +342,7 @@ public class StripAttachment extends GenericMailet { @SuppressWarnings("unchecked") List<String> attributeValues = (List<String>) mail.getAttribute(attributeName); if (attributeValues == null) { - attributeValues = new ArrayList<String>(); + attributeValues = new ArrayList<>(); mail.setAttribute(attributeName, (Serializable) attributeValues); } attributeValues.add(filename); @@ -358,7 +358,7 @@ public class StripAttachment extends GenericMailet { @SuppressWarnings("unchecked") Map<String, byte[]> fileNamesToPartContent = (Map<String, byte[]>) mail.getAttribute(attributeName); if (fileNamesToPartContent == null) { - fileNamesToPartContent = new LinkedHashMap<String, byte[]>(); + fileNamesToPartContent = new LinkedHashMap<>(); mail.setAttribute(attributeName, (Serializable) fileNamesToPartContent); } ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java index ba41e1b..7b7de31 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java @@ -21,14 +21,15 @@ package org.apache.james.transport.matchers; -import java.util.Collection; import java.util.ArrayList; +import java.util.Collection; + import javax.mail.MessagingException; import org.apache.mailet.Experimental; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.MailAddress; import org.apache.mailet.Mail; +import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericMatcher; /** * <P>Abstract matcher checking whether a recipient has exceeded a maximum allowed quota.</P> @@ -53,7 +54,7 @@ abstract public class AbstractQuotaMatcher extends GenericMatcher { public final Collection<MailAddress> match(Mail mail) throws MessagingException { Collection<MailAddress> matching = null; if (isSenderChecked(mail.getSender())) { - matching = new ArrayList<MailAddress>(); + matching = new ArrayList<>(); for (MailAddress recipient : mail.getRecipients()) { if (isRecipientChecked(recipient) && isOverQuota(recipient, mail)) { matching.add(recipient); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java index e35a10e..ea9ec07 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java @@ -21,23 +21,24 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.Experimental; -import org.apache.mailet.base.GenericMatcher; -import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; - -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; -import javax.mail.internet.MimeMessage; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collection; -import java.util.StringTokenizer; import java.util.Locale; -import java.util.zip.ZipInputStream; +import java.util.StringTokenizer; import java.util.zip.ZipEntry; -import java.io.UnsupportedEncodingException; +import java.util.zip.ZipInputStream; + +import javax.mail.MessagingException; +import javax.mail.Multipart; +import javax.mail.Part; +import javax.mail.internet.MimeMessage; + +import org.apache.mailet.Experimental; +import org.apache.mailet.Mail; +import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericMatcher; /** @@ -97,7 +98,7 @@ public class AttachmentFileNameIs extends GenericMatcher { /* sets up fileNameMasks variable by parsing the condition */ StringTokenizer st = new StringTokenizer(getCondition(), ", ", false); - ArrayList<Mask> theMasks = new ArrayList<Mask>(20); + ArrayList<Mask> theMasks = new ArrayList<>(20); while (st.hasMoreTokens()) { String fileName = st.nextToken(); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java index 409745a..2600007 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/HostIs.java @@ -21,14 +21,14 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.mailet.MailAddress; - import java.util.Collection; import java.util.Locale; import java.util.StringTokenizer; import java.util.Vector; +import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericRecipientMatcher; + /** * Matches mail to given hosts. */ @@ -42,7 +42,7 @@ public class HostIs extends GenericRecipientMatcher { */ public void init() { StringTokenizer st = new StringTokenizer(getCondition(), ", ", false); - hosts = new Vector<String>(); + hosts = new Vector<>(); while (st.hasMoreTokens()) { hosts.add(st.nextToken().toLowerCase(Locale.US)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java index d7eda39..cc3fc52 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/SMTPAuthUserIs.java @@ -24,9 +24,9 @@ package org.apache.james.transport.matchers; import java.util.Collection; import java.util.StringTokenizer; -import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericMatcher; /** * <P>Matches mails that are sent by an SMTP authenticated user present in a supplied list.</P> @@ -48,7 +48,7 @@ public class SMTPAuthUserIs extends GenericMatcher { public void init() throws javax.mail.MessagingException { StringTokenizer st = new StringTokenizer(getCondition(), ", \t", false); - users = new java.util.HashSet<String>(); + users = new java.util.HashSet<>(); while (st.hasMoreTokens()) { users.add(st.nextToken()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java ---------------------------------------------------------------------- diff --git a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java index 353e2c3..673350a 100644 --- a/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java +++ b/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java @@ -59,7 +59,7 @@ public class MailProtocolTestTask extends Task implements Monitor { private String host = "127.0.0.1"; private boolean skip = false; private String shabang = null; - private final Collection<AddUser> users = new ArrayList<AddUser>(); + private final Collection<AddUser> users = new ArrayList<>(); private String errorProperty; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java index 8488db5..f9e94fd 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java @@ -146,7 +146,7 @@ public class FileProtocolSessionBuilder extends ProtocolSessionBuilder { session.REINIT(sessionNumber); } else if (next.startsWith(OPEN_UNORDERED_BLOCK_TAG)) { - List<String> unorderedLines = new ArrayList<String>(5); + List<String> unorderedLines = new ArrayList<>(5); next = reader.readLine(); if (next == null) http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java index 21ee26c..874319e 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java @@ -53,7 +53,7 @@ public class ProtocolSession implements ProtocolInteractor { private int maxSessionNumber; - protected List<ProtocolElement> testElements = new ArrayList<ProtocolElement>(); + protected List<ProtocolElement> testElements = new ArrayList<>(); private Iterator<ProtocolElement> elementsIterator; @@ -63,7 +63,7 @@ public class ProtocolSession implements ProtocolInteractor { private boolean continueAfterFailure = false; - private Map<String, Stopwatch> timers = new HashMap<String, Stopwatch>(); + private Map<String, Stopwatch> timers = new HashMap<>(); public final boolean isContinueAfterFailure() { return continueAfterFailure; @@ -392,7 +392,7 @@ public class ProtocolSession implements ProtocolInteractor { * non-specified order. */ private class ServerUnorderedBlockResponse extends ServerResponse { - private List<String> expectedLines = new ArrayList<String>(); + private List<String> expectedLines = new ArrayList<>(); /** * Sets up a ServerUnorderedBlockResponse with the list of expected @@ -439,7 +439,7 @@ public class ProtocolSession implements ProtocolInteractor { * expected lines. */ protected void checkResponse(Session session, boolean continueAfterFailure) throws Exception { - List<String> testLines = new ArrayList<String>(expectedLines); + List<String> testLines = new ArrayList<>(expectedLines); while (testLines.size() > 0) { String actualLine = readLine(session); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java index ccf50ed..eb58a60 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java @@ -200,7 +200,7 @@ public class ProtocolSessionBuilder { } session.SL(sessionNumber, serverMsg, location, lastClientMsg); } else if (line.startsWith(OPEN_UNORDERED_BLOCK_TAG)) { - List<String> unorderedLines = new ArrayList<String>(5); + List<String> unorderedLines = new ArrayList<>(5); line = reader.readLine(); while (!line.startsWith(CLOSE_UNORDERED_BLOCK_TAG)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java index 8f0bc0f..64a562f 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/script/GenericSimpleScriptedTestProtocol.java @@ -72,7 +72,7 @@ public class GenericSimpleScriptedTestProtocol<T extends HostSystem, SELF extend this.scriptDirectory = scriptDirectory; this.hostSystem = hostSystem; this.locale = Locale.getDefault(); - this.prepareCommands = new ArrayList<PrepareCommand<? super T>>(); + this.prepareCommands = new ArrayList<>(); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java index f1cb19b..c459572 100644 --- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java +++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java @@ -66,8 +66,8 @@ public class DiscardProtocol { public DiscardProtocol() { super(); - queue = new LinkedList<Server>(); - runningServers = new LinkedList<Server>(); + queue = new LinkedList<>(); + runningServers = new LinkedList<>(); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java index e5eb9c4..b477ddf 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/host/JamesImapHostSystem.java @@ -59,7 +59,7 @@ public abstract class JamesImapHostSystem implements ImapHostSystem { public JamesImapHostSystem() { super(); - users = new HashSet<User>(); + users = new HashSet<>(); memoryUsersRepository = MemoryUsersRepository.withoutVirtualHosting(); try { memoryUsersRepository.configure(userRepositoryConfiguration()); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java index 7703913..e726307 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/session/ImapSessionImpl.java @@ -38,7 +38,7 @@ public class ImapSessionImpl implements ImapSession { private final Logger log; public ImapSessionImpl(Logger log) { - this.attributesByKey = new ConcurrentHashMap<String, Object>(); + this.attributesByKey = new ConcurrentHashMap<>(); this.log = log; } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java index 20b5211..6fda45e 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/InMemoryMailboxUserManager.java @@ -35,7 +35,7 @@ public class InMemoryMailboxUserManager implements SubscriptionManager { private final Map<String, MailboxUser> users; public InMemoryMailboxUserManager() { - this.users = new HashMap<String, MailboxUser>(); + this.users = new HashMap<>(); } public boolean isAuthentic(String userid, CharSequence password) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java index 0a40125..05f9c89 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/user/MailboxUser.java @@ -33,7 +33,7 @@ class MailboxUser { public MailboxUser(String userName) { this.userName = userName; - this.subscriptions = new HashSet<String>(); + this.subscriptions = new HashSet<>(); } public String getUserName() { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java index 0bb351e..5d5dd3f 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java @@ -41,7 +41,7 @@ public abstract class AbstractProtocolTransport implements ProtocolTransport{ // TODO: Should we limit the size ? - private final Queue<Response> responses = new LinkedBlockingQueue<Response>(); + private final Queue<Response> responses = new LinkedBlockingQueue<>(); private volatile boolean isAsync = false; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java index 48c2e05..81706ea 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/AbstractResponse.java @@ -31,7 +31,7 @@ public abstract class AbstractResponse implements Response{ private String retCode = null; - protected final List<CharSequence> lines = new LinkedList<CharSequence>(); + protected final List<CharSequence> lines = new LinkedList<>(); private boolean endSession = false; protected AbstractResponse() { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java index 8a38bfc..227f005 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java @@ -24,8 +24,6 @@ import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; - -import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.api.handler.LineHandler; import org.apache.james.protocols.api.logger.ContextualLogger; import org.apache.james.protocols.api.logger.Logger; @@ -49,8 +47,8 @@ public class ProtocolSessionImpl implements ProtocolSession { public ProtocolSessionImpl(Logger logger, ProtocolTransport transport, ProtocolConfiguration config) { this.transport = transport; this.pLog = new ContextualLogger(this, logger); - this.connectionState = new HashMap<String, Object>(); - this.sessionState = new HashMap<String, Object>(); + this.connectionState = new HashMap<>(); + this.sessionState = new HashMap<>(); this.config = config; } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java index 8987f82..1716d25 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java @@ -70,7 +70,7 @@ public class FutureResponseImpl implements FutureResponse{ listener.onResponse(this); } else { if (listeners == null) { - listeners = new ArrayList<ResponseListener>(); + listeners = new ArrayList<>(); } listeners.add(listener); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java index 22b8b09..0d296b0 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java @@ -48,9 +48,9 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten /** * The list of available command handlers */ - private final HashMap<String, List<CommandHandler<Session>>> commandHandlerMap = new HashMap<String, List<CommandHandler<Session>>>(); + private final HashMap<String, List<CommandHandler<Session>>> commandHandlerMap = new HashMap<>(); - private final List<ProtocolHandlerResultHandler<Response, Session>> rHandlers = new ArrayList<ProtocolHandlerResultHandler<Response, Session>>(); + private final List<ProtocolHandlerResultHandler<Response, Session>> rHandlers = new ArrayList<>(); private final Collection<String> mandatoryCommands; @@ -81,7 +81,7 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten protected void addToMap(String commandName, CommandHandler<Session> cmdHandler) { List<CommandHandler<Session>> handlers = commandHandlerMap.get(commandName); if(handlers == null) { - handlers = new ArrayList<CommandHandler<Session>>(); + handlers = new ArrayList<>(); commandHandlerMap.put(commandName, handlers); } handlers.add(cmdHandler); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java index 78e1556..2315f7c 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/MultiLineHandler.java @@ -46,7 +46,7 @@ public abstract class MultiLineHandler<S extends ProtocolSession> implements Lin public Response onLine(S session, ByteBuffer line) { Collection<ByteBuffer> lines = (List<ByteBuffer>) session.getAttachment(BUFFERED_LINES, State.Transaction); if (lines == null) { - lines = new ArrayList<ByteBuffer>(); + lines = new ArrayList<>(); session.setAttachment(BUFFERED_LINES, lines, State.Transaction); } lines.add(line); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java index 4eb4f8f..531e840 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChainImpl.java @@ -36,7 +36,7 @@ import java.util.ListIterator; */ public class ProtocolHandlerChainImpl extends AbstractProtocolHandlerChain implements List<ProtocolHandler> { - private final List<ProtocolHandler> handlers = new ArrayList<ProtocolHandler>(); + private final List<ProtocolHandler> handlers = new ArrayList<>(); private volatile boolean readyOnly = false; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java index e19db8b..e89f379 100644 --- a/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java +++ b/protocols/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java @@ -57,7 +57,7 @@ public class AbstractProtocolTransportTest { @Test public void testWriteOrderFutureResponseAllReady() throws InterruptedException, UnsupportedEncodingException { - final List<Response> messages = new ArrayList<Response>(); + final List<Response> messages = new ArrayList<>(); for (int i = 0; i < 2000; i++) { FutureResponseImpl r = new FutureResponseImpl(); r.setResponse(new TestResponse()); @@ -91,7 +91,7 @@ public class AbstractProtocolTransportTest { @Test public void testWriteOrderMixedResponse() throws InterruptedException, UnsupportedEncodingException { - final List<Response> messages = new ArrayList<Response>(); + final List<Response> messages = new ArrayList<>(); for (int i = 0; i < 2000; i++) { if (i % 2 == 0) { messages.add(new TestResponse()); @@ -127,7 +127,7 @@ public class AbstractProtocolTransportTest { }).start(); } private void checkWrittenResponses(List<Response> messages) throws InterruptedException, UnsupportedEncodingException { - final List<byte[]> writtenMessages = new ArrayList<byte[]>(); + final List<byte[]> writtenMessages = new ArrayList<>(); final CountDownLatch latch = new CountDownLatch(messages.size()); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java b/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java index cb377e2..49bfe08 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/display/CharsetUtil.java @@ -43,8 +43,8 @@ public class CharsetUtil { // build the sets which holds the charsets and names static { - Set<String>cNames = new HashSet<String>(); - Set<Charset> sets = new HashSet<Charset>(); + Set<String>cNames = new HashSet<>(); + Set<Charset> sets = new HashSet<>(); for (Charset charset : Charset.availableCharsets().values()) { final Set<String> aliases = charset.aliases(); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/api/message/FetchData.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/FetchData.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/FetchData.java index 670224e..5b91c2f 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/FetchData.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/FetchData.java @@ -39,7 +39,7 @@ public class FetchData { private boolean setSeen = false; - private final Set<BodyFetchElement> bodyElements = new HashSet<BodyFetchElement>(); + private final Set<BodyFetchElement> bodyElements = new HashSet<>(); private boolean modSeq; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java index 154bc95..347b05d 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/IdRange.java @@ -130,7 +130,7 @@ public final class IdRange implements Iterable<Long>, Comparable<IdRange>{ * @return mergedRanges */ public static List<IdRange> mergeRanges(List<IdRange> ranges) { - List<IdRange> copy = new ArrayList<IdRange>(ranges); + List<IdRange> copy = new ArrayList<>(ranges); Collections.sort(copy); boolean lastUid = false; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java index 2a890c0..0c28c6c 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/MessageFlags.java @@ -79,7 +79,7 @@ public class MessageFlags { * flags. */ public static Collection<String> names(Flags flags) { - final Collection<String> results = new ArrayList<String>(); + final Collection<String> results = new ArrayList<>(); if (flags.contains(Flags.Flag.ANSWERED)) { results.add(ANSWERED_OUTPUT_CAPITALISED); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/api/message/UidRange.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/UidRange.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/UidRange.java index d972442..e499cda 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/UidRange.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/UidRange.java @@ -53,7 +53,7 @@ public final class UidRange implements Iterable<MessageUid> { } private static LinkedList<Range<MessageUid>> mergeContiguousRanges(RangeSet<MessageUid> rangeSet) { - LinkedList<Range<MessageUid>> mergedRanges = new LinkedList<Range<MessageUid>>(); + LinkedList<Range<MessageUid>> mergedRanges = new LinkedList<>(); for (Range<MessageUid> range: rangeSet.asRanges()) { Range<MessageUid> previous = mergedRanges.peekLast(); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java index 67fc626..232c500 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/message/request/SearchKey.java @@ -300,14 +300,14 @@ public final class SearchKey { // NOT public static SearchKey buildNot(SearchKey key) { - final List<SearchKey> keys = new ArrayList<SearchKey>(); + final List<SearchKey> keys = new ArrayList<>(); keys.add(key); return new SearchKey(TYPE_NOT, null, keys, 0, null, null, null, null, -1, -1); } // OR public static SearchKey buildOr(SearchKey keyOne, SearchKey keyTwo) { - final List<SearchKey> keys = new ArrayList<SearchKey>(); + final List<SearchKey> keys = new ArrayList<>(); keys.add(keyOne); keys.add(keyTwo); return new SearchKey(TYPE_OR, null, keys, 0, null, null, null, null, -1, -1); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java index 516f23f..3cbac01 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/FetchPartPathDecoder.java @@ -335,7 +335,7 @@ public class FetchPartPathDecoder { } private void readHeaderNames(int at, CharSequence sectionSpecification) throws DecodingException { - names = new ArrayList<String>(); + names = new ArrayList<>(); int firstWordStart = skipSpaces(at, sectionSpecification); readHeaderNames(firstWordStart, firstWordStart, sectionSpecification); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java index a0e1f0f..89875bd 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java @@ -668,7 +668,7 @@ public abstract class ImapRequestLineReader { return new IdRange[] { parseRange(nextWord) }; } - ArrayList<IdRange> rangeList = new ArrayList<IdRange>(); + ArrayList<IdRange> rangeList = new ArrayList<>(); int pos = 0; while (commaPos != -1) { String range = nextWord.substring(pos, commaPos); @@ -701,7 +701,7 @@ public abstract class ImapRequestLineReader { return new UidRange[] { parseUidRange(nextWord) }; } - ArrayList<UidRange> rangeList = new ArrayList<UidRange>(); + ArrayList<UidRange> rangeList = new ArrayList<>(); int pos = 0; while (commaPos != -1) { String range = nextWord.substring(pos, commaPos); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java index bf486e1..7b747af 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/EnableCommandParser.java @@ -39,7 +39,7 @@ public class EnableCommandParser extends AbstractImapCommandParser { @Override protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, ImapSession session) throws DecodingException { - List<String> caps = new ArrayList<String>(); + List<String> caps = new ArrayList<>(); String cap = request.astring(); caps.add(cap.toUpperCase(Locale.US)); while (request.nextChar() == ' ') { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java index 15c65ac..8dc36be 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java @@ -41,7 +41,7 @@ public class ImapParserFactory implements ImapCommandParserFactory { public ImapParserFactory(StatusResponseFactory statusResponseFactory) { this.statusResponseFactory = statusResponseFactory; - _imapCommands = new HashMap<String, Class<?>>(); + _imapCommands = new HashMap<>(); // Commands valid in any state // CAPABILITY, NOOP, and LOGOUT http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java index 00b668b..875b2cd 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/SearchCommandParser.java @@ -150,7 +150,7 @@ public class SearchCommandParser extends AbstractUidCommandParser { private SearchKey paren(ImapSession session, ImapRequestLineReader request, Charset charset) throws DecodingException { request.consume(); - List<SearchKey> keys = new ArrayList<SearchKey>(); + List<SearchKey> keys = new ArrayList<>(); addUntilParen(session, request, keys, charset); return SearchKey.buildAnd(keys); } @@ -884,7 +884,7 @@ public class SearchCommandParser extends AbstractUidCommandParser { final SearchKey firstKey = searchKey(session, request, null, true); final SearchKey result; if (request.nextChar() == ' ') { - List<SearchKey> keys = new ArrayList<SearchKey>(); + List<SearchKey> keys = new ArrayList<>(); keys.add(firstKey); while (request.nextChar() == ' ') { request.nextWordChar(); @@ -909,7 +909,7 @@ public class SearchCommandParser extends AbstractUidCommandParser { * Parse the {@link SearchResultOption}'s which are used for ESEARCH */ private List<SearchResultOption> parseOptions(ImapRequestLineReader reader) throws DecodingException { - List<SearchResultOption> options = new ArrayList<SearchResultOption>(); + List<SearchResultOption> options = new ArrayList<>(); reader.consumeChar('('); reader.nextWordChar(); @@ -1017,7 +1017,7 @@ public class SearchCommandParser extends AbstractUidCommandParser { if (options == null) { - options = new ArrayList<SearchResultOption>(); + options = new ArrayList<>(); } return new SearchRequest(command, new SearchOperation(finalKey, options), useUids, tag); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java index f66efc2..b31f7ad 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ContinuationResponseEncoder.java @@ -21,7 +21,6 @@ package org.apache.james.imap.encode; import java.io.IOException; import java.util.ArrayList; -import java.util.Locale; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.display.HumanReadableText; @@ -49,7 +48,7 @@ public class ContinuationResponseEncoder extends AbstractChainedImapEncoder { private String asString(HumanReadableText text, ImapSession session) { // TODO: calculate locales - return localizer.localize(text, new Locales(new ArrayList<Locale>(), null)); + return localizer.localize(text, new Locales(new ArrayList<>(), null)); } protected boolean isAcceptable(ImapMessage message) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java index 81c8975..53e5910 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java @@ -196,7 +196,7 @@ public class FetchResponseEncoder extends AbstractChainedImapEncoder { } else { composer.openParen(); final Set<String> keySet = params.keySet(); - final Collection<String> names = new TreeSet<String>(keySet); + final Collection<String> names = new TreeSet<>(keySet); for (String name : names) { final String value = params.get(name); if (value == null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java index c24dba1..81b7309 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/ListingEncodingUtils.java @@ -61,7 +61,7 @@ public class ListingEncodingUtils { private static List<String> getNameAttributes(AbstractListingResponse response) { final List<String> attributes; if (response.isNameAttributed()) { - attributes = new ArrayList<String>(); + attributes = new ArrayList<>(); if (response.isNoInferiors()) { attributes.add(ImapConstants.NAME_ATTRIBUTE_NOINFERIORS); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java index e01de28..90b6789 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/StatusResponseEncoder.java @@ -22,7 +22,6 @@ package org.apache.james.imap.encode; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.Locale; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapMessage; @@ -102,7 +101,7 @@ public class StatusResponseEncoder extends AbstractChainedImapEncoder { private String asString(HumanReadableText text, ImapSession session) { // TODO: calculate locales - return localizer.localize(text, new Locales(new ArrayList<Locale>(), null)); + return localizer.localize(text, new Locales(new ArrayList<>(), null)); } private String asString(StatusResponse.ResponseCode code) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java index b39f33c..1af01a9 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/message/request/SetQuotaRequest.java @@ -19,11 +19,11 @@ package org.apache.james.imap.message.request; -import org.apache.james.imap.api.ImapCommand; - import java.util.ArrayList; import java.util.List; +import org.apache.james.imap.api.ImapCommand; + /** * SETQUOTA request */ @@ -53,7 +53,7 @@ public class SetQuotaRequest extends AbstractImapRequest { public SetQuotaRequest(String tag, ImapCommand command, String quotaRoot) { super(tag, command); this.quotaRoot = quotaRoot; - this.resourceLimits = new ArrayList<ResourceLimit>(); + this.resourceLimits = new ArrayList<>(); } public void addResourceLimit(String resource, long limit) { @@ -61,7 +61,7 @@ public class SetQuotaRequest extends AbstractImapRequest { } public List<ResourceLimit> getResourceLimits() { - return new ArrayList<ResourceLimit>(resourceLimits); + return new ArrayList<>(resourceLimits); } public String getQuotaRoot() { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java index 66e828f..3c2fa43 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java @@ -558,7 +558,7 @@ abstract public class AbstractMailboxProcessor<M extends ImapRequest> extends Ab if (metaData.getHighestModSeq() > changedSince) { SearchQuery searchQuery = new SearchQuery(); SearchQuery.UidRange[] nRanges = new SearchQuery.UidRange[ranges.size()]; - Set<MessageUid> vanishedUids = new HashSet<MessageUid>(); + Set<MessageUid> vanishedUids = new HashSet<>(); for (int i = 0; i < ranges.size(); i++) { MessageRange r = ranges.get(i); SearchQuery.UidRange nr; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java index 8663bb4..1d3ff26 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMessageRangeProcessor.java @@ -76,7 +76,7 @@ public abstract class AbstractMessageRangeProcessor<M extends AbstractMessageRan final MessageManager mailbox = mailboxManager.getMailbox(targetMailbox, mailboxSession); - List<IdRange> resultRanges = new ArrayList<IdRange>(); + List<IdRange> resultRanges = new ArrayList<>(); for (IdRange range : idSet) { MessageRange messageSet = messageRange(currentMailbox, range, useUids); if (messageSet != null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java index 4a80611..18f5e0b 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java @@ -217,7 +217,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ if (knownSequences != null && knownUids != null) { // Add all uids which are contained in the knownuidsset to a List so we can later access them via the index - List<MessageUid> knownUidsList = new ArrayList<MessageUid>(); + List<MessageUid> knownUidsList = new ArrayList<>(); for (UidRange range : knownUids) { for (MessageUid uid : range) { knownUidsList.add(uid); @@ -258,7 +258,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ firstUid = firstUid.next(); // Ok now its time to filter out the IdRanges which we are not interested in - List<UidRange> filteredUidSet = new ArrayList<UidRange>(); + List<UidRange> filteredUidSet = new ArrayList<>(); for (UidRange r : uidSet) { if (r.getLowVal().compareTo(firstUid) < 0) { if (r.getHighVal().compareTo(firstUid) > 0) { @@ -277,7 +277,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ } - List<MessageRange> ranges = new ArrayList<MessageRange>(); + List<MessageRange> ranges = new ArrayList<>(); for (UidRange range : uidSet) { MessageRange messageSet = range.toMessageRange(); if (messageSet != null) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java index a26d74d..f50ace2 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java @@ -148,7 +148,7 @@ public class AuthenticateProcessor extends AbstractAuthProcessor<AuthenticateReq * #getImplementedCapabilities(org.apache.james.imap.api.process.ImapSession) */ public List<String> getImplementedCapabilities(ImapSession session) { - List<String> caps = new ArrayList<String>(); + List<String> caps = new ArrayList<>(); // Only ounce AUTH=PLAIN if the session does allow plain auth or TLS is active. // See IMAP-304 if (session.isPlainAuthDisallowed() == false || session.isTLSActive()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java index 828c442..f9f3048 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java @@ -48,7 +48,7 @@ public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequ private final static List<String> CAPS; static { - List<String> caps = new ArrayList<String>(); + List<String> caps = new ArrayList<>(); caps.add(VERSION); caps.add(SUPPORTS_LITERAL_PLUS); caps.add(SUPPORTS_RFC3348); @@ -61,8 +61,8 @@ public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequ CAPS = Collections.unmodifiableList(caps); } - private final List<CapabilityImplementingProcessor> capabilities = new ArrayList<CapabilityImplementingProcessor>(); - private final Set<String> disabledCaps = new HashSet<String>(); + private final List<CapabilityImplementingProcessor> capabilities = new ArrayList<>(); + private final Set<String> disabledCaps = new HashSet<>(); public CapabilityProcessor(ImapProcessor next, MailboxManager mailboxManager, StatusResponseFactory factory, List<CapabilityImplementingProcessor> capabilities, MetricFactory metricFactory) { @@ -132,7 +132,7 @@ public class CapabilityProcessor extends AbstractMailboxProcessor<CapabilityRequ * @return supported */ public Set<String> getSupportedCapabilities(ImapSession session) { - Set<String> caps = new HashSet<String>(); + Set<String> caps = new HashSet<>(); for (CapabilityImplementingProcessor capability : capabilities) { caps.addAll(capability.getImplementedCapabilities(session)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java index b07af73..50ddb9e 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java @@ -43,7 +43,7 @@ import org.apache.james.metrics.api.MetricFactory; public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> implements CapabilityImplementingProcessor { - private final static List<PermitEnableCapabilityProcessor> capabilities = new ArrayList<PermitEnableCapabilityProcessor>(); + private final static List<PermitEnableCapabilityProcessor> capabilities = new ArrayList<>(); public final static String ENABLED_CAPABILITIES = "ENABLED_CAPABILITIES"; private final static List<String> CAPS = Collections.unmodifiableList(Arrays.asList(SUPPORTS_ENABLE)); private final CapabilityProcessor capabilityProcessor; @@ -86,7 +86,7 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp } public Set<String> enable(ImapRequest request, Responder responder, ImapSession session, Iterator<String> caps) throws EnableException { - Set<String> enabledCaps = new HashSet<String>(); + Set<String> enabledCaps = new HashSet<>(); while(caps.hasNext()) { String cap = caps.next(); // Check if the CAPABILITY is supported at all @@ -123,7 +123,7 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp Set<String> caps = (Set<String>) session.getAttribute(ENABLED_CAPABILITIES); if (caps == null) { - caps = new HashSet<String>(); + caps = new HashSet<>(); session.setAttribute(ENABLED_CAPABILITIES, caps); } return caps; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org