http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java index 231c69a..9c6296f 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java @@ -315,7 +315,7 @@ class Account implements Comparable<Account> { * @return List */ protected List<String> computeDeferredRecipientNotFoundMessageIDs() { - return new ArrayList<String>(DEFAULT_INITIAL_SIZE_OF_DEFERRED_RECIPIENT_ARRAY); + return new ArrayList<>(DEFAULT_INITIAL_SIZE_OF_DEFERRED_RECIPIENT_ARRAY); } /**
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java index 7eafc44..54cd9b2 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java @@ -19,6 +19,18 @@ package org.apache.james.fetchmail; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.mail.MessagingException; +import javax.mail.Session; + import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; @@ -32,17 +44,6 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.slf4j.Logger; -import javax.mail.MessagingException; -import javax.mail.Session; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; - /** * <p> * Class <code>FetchMail</code> is an Avalon task that is periodically triggered @@ -474,7 +475,7 @@ public class FetchMail implements Runnable, LogEnabled, Configurable { // sort the accounts so they are in the order // they were entered in config.xml updateDynamicAccounts(); - ArrayList<Account> mergedAccounts = new ArrayList<Account>(getDynamicAccounts().size() + getStaticAccounts().size()); + ArrayList<Account> mergedAccounts = new ArrayList<>(getDynamicAccounts().size() + getStaticAccounts().size()); mergedAccounts.addAll(getDynamicAccounts().values()); mergedAccounts.addAll(getStaticAccounts()); Collections.sort(mergedAccounts); @@ -646,14 +647,14 @@ public class FetchMail implements Runnable, LogEnabled, Configurable { * Computes the staticAccounts. */ protected List<Account> computeStaticAccounts() { - return new ArrayList<Account>(); + return new ArrayList<>(); } /** * Computes the ParsedDynamicAccountParameters. */ protected List<ParsedDynamicAccountParameters> computeParsedDynamicAccountParameters() { - return new ArrayList<ParsedDynamicAccountParameters>(); + return new ArrayList<>(); } /** @@ -662,13 +663,13 @@ public class FetchMail implements Runnable, LogEnabled, Configurable { protected Map<DynamicAccountKey, DynamicAccount> computeDynamicAccounts() throws ConfigurationException { Map<DynamicAccountKey, DynamicAccount> newAccounts; try { - newAccounts = new HashMap<DynamicAccountKey, DynamicAccount>(getLocalUsers().countUsers() * getParsedDynamicAccountParameters().size()); + newAccounts = new HashMap<>(getLocalUsers().countUsers() * getParsedDynamicAccountParameters().size()); } catch (UsersRepositoryException e) { throw new ConfigurationException("Unable to acces UsersRepository", e); } Map<DynamicAccountKey, DynamicAccount> oldAccounts = getDynamicAccountsBasic(); if (null == oldAccounts) - oldAccounts = new HashMap<DynamicAccountKey, DynamicAccount>(0); + oldAccounts = new HashMap<>(0); // Process each ParsedDynamicParameters for (ParsedDynamicAccountParameters parsedDynamicAccountParameters : getParsedDynamicAccountParameters()) { @@ -732,7 +733,7 @@ public class FetchMail implements Runnable, LogEnabled, Configurable { Map<DynamicAccountKey, DynamicAccount> accounts; Iterator<String> usersIterator; try { - accounts = new HashMap<DynamicAccountKey, DynamicAccount>(getLocalUsers().countUsers()); + accounts = new HashMap<>(getLocalUsers().countUsers()); usersIterator = getLocalUsers().list(); } catch (UsersRepositoryException e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java index 01772ee..2565394 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java @@ -56,7 +56,7 @@ public class FetchScheduler implements FetchSchedulerMBean, LogEnabled, Configur */ private volatile boolean enabled = false; - private final List<ScheduledFuture<?>> schedulers = new ArrayList<ScheduledFuture<?>>(); + private final List<ScheduledFuture<?>> schedulers = new ArrayList<>(); private DNSService dns; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java index c272284..a5f3472 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java @@ -19,12 +19,11 @@ package org.apache.james.fetchmail; -import org.apache.james.core.MailImpl; -import org.apache.james.domainlist.api.DomainListException; -import org.apache.james.user.api.UsersRepositoryException; -import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; -import org.apache.mailet.base.RFC2822Headers; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.StringTokenizer; import javax.mail.Address; import javax.mail.Flags; @@ -33,11 +32,12 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.ParseException; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Enumeration; -import java.util.StringTokenizer; +import org.apache.james.core.MailImpl; +import org.apache.james.domainlist.api.DomainListException; +import org.apache.james.user.api.UsersRepositoryException; +import org.apache.mailet.Mail; +import org.apache.mailet.MailAddress; +import org.apache.mailet.base.RFC2822Headers; /** * <p> @@ -591,7 +591,7 @@ public class MessageProcessor extends ProcessorAbstract { * @throws MessagingException */ protected Mail createMail(MimeMessage message, MailAddress recipient) throws MessagingException, UnknownHostException { - Collection<MailAddress> recipients = new ArrayList<MailAddress>(1); + Collection<MailAddress> recipients = new ArrayList<>(1); recipients.add(recipient); MailImpl mail = new MailImpl(MailImpl.getId(), getSender(), recipients, message); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java index 37e6996..80abcd3 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java @@ -626,7 +626,7 @@ class ParsedConfiguration { */ protected void setBlacklist(String blacklistValue) throws ConfigurationException { StringTokenizer st = new StringTokenizer(blacklistValue, ", \t", false); - Set<MailAddress> blacklist = new HashSet<MailAddress>(); + Set<MailAddress> blacklist = new HashSet<>(); String token = null; while (st.hasMoreTokens()) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java index a4d6190..3fdf41e 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/MultipleClassesDeserializer.java @@ -34,7 +34,7 @@ import com.google.common.base.Throwables; public class MultipleClassesDeserializer extends StdDeserializer<Object> { - private final Map<String, Class<?>> registry = new HashMap<String, Class<?>>(); + private final Map<String, Class<?>> registry = new HashMap<>(); MultipleClassesDeserializer() { super(Object.class); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailSpoolTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailSpoolTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailSpoolTest.java index d6edfbd..69b25d9 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailSpoolTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailSpoolTest.java @@ -62,7 +62,7 @@ public class MailSpoolTest { private ConcurrentLinkedQueue<Mail> queue; public MyQueue() { - queue = new ConcurrentLinkedQueue<Mail>(); + queue = new ConcurrentLinkedQueue<>(); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java index 351dac3..1778609 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServerFactory.java @@ -56,7 +56,7 @@ public class IMAPServerFactory extends AbstractServerFactory { @Override protected List<AbstractConfigurableAsyncServer> createServers(Logger log, HierarchicalConfiguration config) throws Exception { - List<AbstractConfigurableAsyncServer> servers = new ArrayList<AbstractConfigurableAsyncServer>(); + List<AbstractConfigurableAsyncServer> servers = new ArrayList<>(); List<HierarchicalConfiguration> configs = config.configurationsAt("imapserver"); for (HierarchicalConfiguration serverConfig: configs) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java index dab3d16..c8c23bb 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java @@ -39,5 +39,5 @@ public interface NettyConstants { String EXECUTION_HANDLER = "executionHandler"; String HEARTBEAT_HANDLER = "heartbeatHandler"; - ChannelLocal<Object> attributes = new ChannelLocal<Object>(); + ChannelLocal<Object> attributes = new ChannelLocal<>(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java index 5d0c558..3c7bafd 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java @@ -42,7 +42,7 @@ public class NettyImapSession implements ImapSession, NettyConstants { private ImapSessionState state = ImapSessionState.NON_AUTHENTICATED; private SelectedMailbox selectedMailbox; - private final Map<String, Object> attributesByKey = new HashMap<String, Object>(); + private final Map<String, Object> attributesByKey = new HashMap<>(); private final SSLContext sslContext; private final String[] enabledCipherSuites; private final boolean compress; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java index c491586..364e94e 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/ProtocolHandlerChainImpl.java @@ -41,7 +41,7 @@ public class ProtocolHandlerChainImpl implements ProtocolHandlerChain { private final String jmxName; private final String coreHandlersPackage; private final String jmxHandlersPackage; - private final List<Object> handlers = new LinkedList<Object>(); + private final List<Object> handlers = new LinkedList<>(); public ProtocolHandlerChainImpl(ProtocolHandlerLoader loader, HierarchicalConfiguration handlerchainConfig, String jmxName, Class<? extends HandlersPackage> coreHandlersPackage, Class<? extends HandlersPackage> jmxHandlersPackage) { this.loader = loader; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java index 64b7d2b..422eed8 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java @@ -27,14 +27,18 @@ import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Response; -import org.apache.james.protocols.api.handler.*; +import org.apache.james.protocols.api.handler.CommandHandler; +import org.apache.james.protocols.api.handler.ExtensibleHandler; +import org.apache.james.protocols.api.handler.ProtocolHandler; +import org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler; +import org.apache.james.protocols.api.handler.WiringException; /** * Expose JMX statistics for {@link CommandHandler} */ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolSession> implements ProtocolHandlerResultHandler<Response, S>, ExtensibleHandler, ProtocolHandler { - private final Map<String, AbstractCommandHandlerStats> cStats = new HashMap<String, AbstractCommandHandlerStats>(); + private final Map<String, AbstractCommandHandlerStats> cStats = new HashMap<>(); private String jmxName; /** @@ -60,7 +64,7 @@ public abstract class AbstractCommandHandlerResultJMXMonitor<S extends ProtocolS * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() */ public List<Class<?>> getMarkerInterfaces() { - List<Class<?>> marker = new ArrayList<Class<?>>(); + List<Class<?>> marker = new ArrayList<>(); marker.add(CommandHandler.class); return marker; } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java index ea64bb1..d9551e8 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java @@ -25,13 +25,13 @@ import java.util.Map; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; +import org.apache.james.protocols.api.ProtocolSession; +import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.ConnectHandler; import org.apache.james.protocols.api.handler.ExtensibleHandler; import org.apache.james.protocols.api.handler.ProtocolHandler; import org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler; import org.apache.james.protocols.api.handler.WiringException; -import org.apache.james.protocols.api.ProtocolSession; -import org.apache.james.protocols.api.Response; /** * Handler which will gather statistics for {@link ConnectHandler}'s @@ -40,7 +40,7 @@ import org.apache.james.protocols.api.Response; */ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R,S>, ExtensibleHandler, ProtocolHandler { - private final Map<String, ConnectHandlerStats> cStats = new HashMap<String, ConnectHandlerStats>(); + private final Map<String, ConnectHandlerStats> cStats = new HashMap<>(); private String jmxName; @Override @@ -75,7 +75,7 @@ public abstract class AbstractConnectHandlerResultJMXMonitor<R extends Response, * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() */ public List<Class<?>> getMarkerInterfaces() { - List<Class<?>> marker = new ArrayList<Class<?>>(); + List<Class<?>> marker = new ArrayList<>(); marker.add(ConnectHandler.class); return marker; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java index 4787dad..5a6cd17 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java @@ -27,7 +27,11 @@ import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.Response; -import org.apache.james.protocols.api.handler.*; +import org.apache.james.protocols.api.handler.ExtensibleHandler; +import org.apache.james.protocols.api.handler.LineHandler; +import org.apache.james.protocols.api.handler.ProtocolHandler; +import org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler; +import org.apache.james.protocols.api.handler.WiringException; /** * Handler which will gather statistics for {@link LineHandler}'s @@ -36,7 +40,7 @@ import org.apache.james.protocols.api.handler.*; */ public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S extends ProtocolSession> implements ProtocolHandlerResultHandler<R, S>, ExtensibleHandler, ProtocolHandler { - private final Map<String, LineHandlerStats> lStats = new HashMap<String, LineHandlerStats>(); + private final Map<String, LineHandlerStats> lStats = new HashMap<>(); private String jmxName; /** @@ -57,7 +61,7 @@ public abstract class AbstractLineHandlerResultJMXMonitor<R extends Response, S * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() */ public List<Class<?>> getMarkerInterfaces() { - List<Class<?>> marker = new ArrayList<Class<?>>(); + List<Class<?>> marker = new ArrayList<>(); marker.add(LineHandler.class); return marker; } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java index d72d53e..e4784ec 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java @@ -169,7 +169,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe } String listen[] = config.getString("bind", "0.0.0.0:" + getDefaultPort()).split(","); - List<InetSocketAddress> bindAddresses = new ArrayList<InetSocketAddress>(); + List<InetSocketAddress> bindAddresses = new ArrayList<>(); for (String aListen : listen) { String bind[] = aListen.split(":"); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java index 547e0fb..8c7295a 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java @@ -37,7 +37,7 @@ public class JMXEnabledOrderedMemoryAwareThreadPoolExecutor extends OrderedMemor private final String jmxPath; private final List<Runnable> inProgress = Collections.synchronizedList(new ArrayList<Runnable>()); - private final ThreadLocal<Long> startTime = new ThreadLocal<Long>(); + private final ThreadLocal<Long> startTime = new ThreadLocal<>(); private long totalTime; private int totalTasks; private MBeanServer mbeanServer; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java index 4ec0cc6..9adaf84 100644 --- a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java +++ b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java @@ -37,8 +37,8 @@ public class MockProtocolHandlerLoader implements ProtocolHandlerLoader{ } } - private final Map<String, Object> servicesByName = new HashMap<String, Object>(); - private final Map<Class<?>, Object> servicesByType = new HashMap<Class<?>, Object>(); + private final Map<String, Object> servicesByName = new HashMap<>(); + private final Map<Class<?>, Object> servicesByType = new HashMap<>(); public Object get(String name) { return servicesByName.get(name); @@ -53,7 +53,7 @@ public class MockProtocolHandlerLoader implements ProtocolHandlerLoader{ servicesByType.put(serviceType, instance); } - private final List<Object> loaderRegistry = new ArrayList<Object>(); + private final List<Object> loaderRegistry = new ArrayList<>(); protected ProtocolHandler create(String className) throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java index 7c3bebe..66fce45 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java @@ -50,7 +50,7 @@ import org.apache.james.smtpserver.fastfail.ValidRcptHandler; */ public class CoreCmdHandlerLoader implements HandlersPackage { - private final List<String> commands = new LinkedList<String>(); + private final List<String> commands = new LinkedList<>(); public CoreCmdHandlerLoader() { // Insert the base commands in the Map http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java index 3794d54..98e885a 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/DataLineLMTPHandler.java @@ -18,6 +18,12 @@ ****************************************************************/ package org.apache.james.lmtpserver; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.WiringException; import org.apache.james.protocols.lmtp.LMTPMultiResponse; @@ -32,18 +38,12 @@ import org.apache.james.protocols.smtp.dsn.DSNStatus; import org.apache.james.smtpserver.DataLineJamesMessageHookHandler; import org.apache.mailet.Mail; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * Handler which takes care of deliver the mail to the recipients INBOX */ public class DataLineLMTPHandler extends DataLineJamesMessageHookHandler { - private final List<DeliverToRecipientHook> handlers = new ArrayList<DeliverToRecipientHook>(); + private final List<DeliverToRecipientHook> handlers = new ArrayList<>(); @Override @@ -83,7 +83,7 @@ public class DataLineLMTPHandler extends DataLineJamesMessageHookHandler { @Override public List<Class<?>> getMarkerInterfaces() { - List<Class<?>> markers = new ArrayList<Class<?>>(); + List<Class<?>> markers = new ArrayList<>(); markers.add(DeliverToRecipientHook.class); return markers; } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java index 05576cf..5001404 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java @@ -27,7 +27,7 @@ import org.apache.james.protocols.lib.handler.HandlersPackage; public class JMXHandlersLoader implements HandlersPackage { - private final List<String> handlers = new ArrayList<String>(); + private final List<String> handlers = new ArrayList<>(); public JMXHandlersLoader() { handlers.add(ConnectHandlerResultJMXMonitor.class.getName()); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java index 88160d0..7e2e0d9 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java @@ -50,7 +50,7 @@ public class LMTPServerFactory extends AbstractServerFactory{ @Override protected List<AbstractConfigurableAsyncServer> createServers(Logger log, HierarchicalConfiguration config) throws Exception{ - List<AbstractConfigurableAsyncServer> servers = new ArrayList<AbstractConfigurableAsyncServer>(); + List<AbstractConfigurableAsyncServer> servers = new ArrayList<>(); List<HierarchicalConfiguration> configs = config.configurationsAt("lmtpserver"); for (HierarchicalConfiguration serverConfig: configs) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java index a603161..89e6e5c 100644 --- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java +++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java @@ -19,6 +19,10 @@ package org.apache.james.managesieveserver.netty; +import java.net.InetSocketAddress; + +import javax.net.ssl.SSLContext; + import org.apache.james.managesieve.api.Session; import org.apache.james.managesieve.api.SessionTerminatedException; import org.apache.james.managesieve.transcode.ManageSieveProcessor; @@ -39,9 +43,6 @@ import org.jboss.netty.handler.codec.frame.TooLongFrameException; import org.jboss.netty.handler.ssl.SslHandler; import org.slf4j.Logger; -import javax.net.ssl.SSLContext; -import java.net.InetSocketAddress; - @SuppressWarnings("deprecation") public class ManageSieveChannelUpstreamHandler extends SimpleChannelUpstreamHandler { @@ -57,7 +58,7 @@ public class ManageSieveChannelUpstreamHandler extends SimpleChannelUpstreamHand public ManageSieveChannelUpstreamHandler(ManageSieveProcessor manageSieveProcessor, SSLContext sslContext, String[] enabledCipherSuites, boolean sslServer, Logger logger) { this.logger = logger; - this.attributes = new ChannelLocal<Session>(); + this.attributes = new ChannelLocal<>(); this.manageSieveProcessor = manageSieveProcessor; this.sslContext = sslContext; this.enabledCipherSuites = enabledCipherSuites; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java index bd1be70..a2d2561 100644 --- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java +++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServerFactory.java @@ -73,7 +73,7 @@ public class ManageSieveServerFactory extends AbstractServerFactory { @Override protected List<AbstractConfigurableAsyncServer> createServers(Logger log, HierarchicalConfiguration config) throws Exception { - List<AbstractConfigurableAsyncServer> servers = new ArrayList<AbstractConfigurableAsyncServer>(); + List<AbstractConfigurableAsyncServer> servers = new ArrayList<>(); List<HierarchicalConfiguration> configs = config.configurationsAt("managesieveserver"); for (HierarchicalConfiguration serverConfig: configs) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java index 30662af..45ab614 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java @@ -66,7 +66,7 @@ public class CoreCmdHandlerLoader implements HandlersPackage { private final static String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName(); - private final List<String> commands = new LinkedList<String>(); + private final List<String> commands = new LinkedList<>(); public CoreCmdHandlerLoader() { // Insert the base commands in the Map http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java index ba41df7..f5182c1 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java @@ -27,7 +27,7 @@ import org.apache.james.protocols.lib.handler.HandlersPackage; public class JMXHandlersLoader implements HandlersPackage { - private final List<String> handlers = new ArrayList<String>(); + private final List<String> handlers = new ArrayList<>(); public JMXHandlersLoader() { handlers.add(ConnectHandlerResultJMXMonitor.class.getName()); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java index 321628e..c4cf74b 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java @@ -48,7 +48,7 @@ public class MailboxAdapter implements Mailbox { private static abstract class POP3FetchGroup implements FetchGroup { @Override public Set<PartContentDescriptor> getPartContentDescriptors() { - return new HashSet<PartContentDescriptor>(); + return new HashSet<>(); } } @@ -154,7 +154,7 @@ public class MailboxAdapter implements Mailbox { try { mailboxManager.startProcessingRequest(session); Iterator<MessageResult> results = manager.getMessages(MessageRange.all(), METADATA_GROUP, session); - List<MessageMetaData> mList = new ArrayList<MessageMetaData>(); + List<MessageMetaData> mList = new ArrayList<>(); while (results.hasNext()) { MessageResult result = results.next(); MessageMetaData metaData = new MessageMetaData(String.valueOf(result.getUid().asLong()), result.getSize()); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java index 1e56966..6028de1 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java @@ -34,7 +34,7 @@ public class POP3ServerFactory extends AbstractServerFactory{ @Override protected List<AbstractConfigurableAsyncServer> createServers(Logger log, HierarchicalConfiguration config) throws Exception{ - List<AbstractConfigurableAsyncServer> servers = new ArrayList<AbstractConfigurableAsyncServer>(); + List<AbstractConfigurableAsyncServer> servers = new ArrayList<>(); List<HierarchicalConfiguration> configs = config.configurationsAt("pop3server"); for (HierarchicalConfiguration serverConfig: configs) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java index b85c1b6..1fe5a34 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java @@ -48,7 +48,7 @@ import org.apache.james.protocols.smtp.core.log.HookResultLogger; */ public class CoreCmdHandlerLoader implements HandlersPackage { - private final List<String> commands = new LinkedList<String>(); + private final List<String> commands = new LinkedList<>(); public CoreCmdHandlerLoader() { // Insert the base commands in the Map http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java index 970d0b3..882bc21 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java @@ -19,6 +19,17 @@ package org.apache.james.smtpserver; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import javax.mail.MessagingException; +import javax.mail.internet.AddressException; + import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.core.MailImpl; @@ -47,17 +58,6 @@ import org.apache.james.smtpserver.model.MailetMailAddressAdapter; import org.apache.james.smtpserver.model.ProtocolMailAddressAdapter; import org.apache.mailet.Mail; -import javax.mail.MessagingException; -import javax.mail.internet.AddressException; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - /** * Handles the calling of JamesMessageHooks */ @@ -99,7 +99,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib List<MailAddress> recipientCollection = (List<MailAddress>) session.getAttachment(SMTPSession.RCPT_LIST, State.Transaction); MailAddress mailAddress = (MailAddress) session.getAttachment(SMTPSession.SENDER, State.Transaction); - List<org.apache.mailet.MailAddress> rcpts = new ArrayList<org.apache.mailet.MailAddress>(); + List<org.apache.mailet.MailAddress> rcpts = new ArrayList<>(); for (MailAddress address : recipientCollection) { rcpts.add(new MailetMailAddressAdapter(address)); } @@ -238,7 +238,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib @Override public List<Class<?>> getMarkerInterfaces() { - List<Class<?>> classes = new LinkedList<Class<?>>(); + List<Class<?>> classes = new LinkedList<>(); classes.add(JamesMessageHook.class); classes.add(MessageHook.class); classes.add(HookResultHook.class); @@ -271,7 +271,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib @Override public List<MailAddress> getRecipients() { //TODO: not sure this MailAddress transformation code does the right thing - List<MailAddress> mailAddressList = new ArrayList<MailAddress>(); + List<MailAddress> mailAddressList = new ArrayList<>(); for (org.apache.mailet.MailAddress address : mail.getRecipients()) { try { mailAddressList.add(new MailAddress(address.getLocalPart(), address.getDomain())); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java index ff86a83..864c737 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java @@ -43,7 +43,7 @@ import org.apache.mailet.MailAddress; */ public class MailPriorityHandler implements JamesMessageHook, ProtocolHandler { - private final Map<String, Integer> prioMap = new HashMap<String, Integer>(); + private final Map<String, Integer> prioMap = new HashMap<>(); /** * @see http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java index 1c12b43..f780975 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java @@ -87,7 +87,7 @@ public class TLDLookup { * @return a HashSet containing all known two-part TLDs */ static private HashSet<String> initTwoPartTLDs() { - HashSet<String> set = new HashSet<String>(900); + HashSet<String> set = new HashSet<>(900); for (String multiPartTLD : multiPartTLDs) { try { if (multiPartTLD.matches("^" + tld2 + "$")) { @@ -107,7 +107,7 @@ public class TLDLookup { * @return a HashSet containing all known three-part TLDs */ static private HashSet<String> initThreePartTLDs() { - HashSet<String> set = new HashSet<String>(); + HashSet<String> set = new HashSet<>(); for (String multiPartTLD : multiPartTLDs) { try { if (multiPartTLD.matches("^" + tld3 + "$")) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java index ed2a962..9c95452 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.java @@ -36,7 +36,7 @@ public class DNSRBLHandler extends org.apache.james.protocols.smtp.core.fastfail private DNSService dns; @Inject - public void setDNSService(DNSService dns) { + public void setDNSService(DNSService dns) { this.dns = dns; } @@ -44,7 +44,7 @@ public class DNSRBLHandler extends org.apache.james.protocols.smtp.core.fastfail public void init(Configuration config) throws ConfigurationException { boolean validConfig = false; HierarchicalConfiguration handlerConfiguration = (HierarchicalConfiguration) config; - ArrayList<String> rblserverCollection = new ArrayList<String>(); + ArrayList<String> rblserverCollection = new ArrayList<>(); Collections.addAll(rblserverCollection, handlerConfiguration.getStringArray("rblservers.whitelist")); if (rblserverCollection.size() > 0) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java index 0457354..f213c05 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java @@ -89,7 +89,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot private String sqlFileUrl; /** Holds value of property sqlParameters. */ - private final Map<String, String> sqlParameters = new HashMap<String, String>(); + private final Map<String, String> sqlParameters = new HashMap<>(); private DNSService dnsService; @@ -182,7 +182,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot * java.lang.String, java.lang.String) */ protected Iterator<String> getGreyListData(String ipAddress, String sender, String recip) throws SQLException { - Collection<String> data = new ArrayList<String>(2); + Collection<String> data = new ArrayList<>(2); PreparedStatement mappingStmt = null; Connection conn = datasource.getConnection(); try { @@ -420,7 +420,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot String nets = handlerConfiguration.getString("whitelistedNetworks"); if (nets != null) { String[] whitelistArray = nets.split(","); - List<String> wList = new ArrayList<String>(whitelistArray.length); + List<String> wList = new ArrayList<>(whitelistArray.length); for (String aWhitelistArray : whitelistArray) { wList.add(aWhitelistArray.trim()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java index 26a9ea8..241ae12 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java @@ -156,7 +156,7 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler { * extracted */ private HashSet<String> scanMailForDomains(MimePart part, SMTPSession session) throws MessagingException, IOException { - HashSet<String> domains = new HashSet<String>(); + HashSet<String> domains = new HashSet<>(); session.getLogger().debug("mime type is: \"" + part.getContentType() + "\""); if (part.isMimeType("text/plain") || part.isMimeType("text/html")) { @@ -234,7 +234,7 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler { @Override public void init(Configuration config) throws ConfigurationException { String[] servers = config.getStringArray("uriRblServers.server"); - Collection<String> serverCollection = new ArrayList<String>(); + Collection<String> serverCollection = new ArrayList<>(); for (String rblServerName : servers) { serverCollection.add(rblServerName); if (serviceLog.isInfoEnabled()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java index 01e1100..04c450e 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java @@ -205,7 +205,7 @@ public class URIScanner { * @return a HashSet containing host strings */ static protected HashSet<String> scanContentForHosts(CharSequence content) { - HashSet<String> set = new HashSet<String>(); + HashSet<String> set = new HashSet<>(); // look for URIs Matcher mat = uriPattern.matcher(content); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java index 60b0b1e..2d8c353 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java @@ -39,7 +39,7 @@ import org.apache.james.protocols.smtp.hook.HookResultHook; */ public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler, ProtocolHandler { - private final Map<String, HookStats> hookStats = new HashMap<String, HookStats>(); + private final Map<String, HookStats> hookStats = new HashMap<>(); private String jmxPath; /** @@ -63,7 +63,7 @@ public class HookResultJMXMonitor implements HookResultHook, ExtensibleHandler, * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() */ public List<Class<?>> getMarkerInterfaces() { - List<Class<?>> marker = new ArrayList<Class<?>>(); + List<Class<?>> marker = new ArrayList<>(); marker.add(Hook.class); return marker; } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java index 4548ae3..49984f5 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java @@ -27,7 +27,7 @@ import org.apache.james.protocols.lib.handler.HandlersPackage; public class JMXHandlersLoader implements HandlersPackage { - private final List<String> handlers = new ArrayList<String>(); + private final List<String> handlers = new ArrayList<>(); public JMXHandlersLoader() { handlers.add(ConnectHandlerResultJMXMonitor.class.getName()); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java index 32316c0..db3bbe9 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java @@ -105,7 +105,7 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe super.preInit(); if (authorizedAddresses != null) { java.util.StringTokenizer st = new java.util.StringTokenizer(authorizedAddresses, ", ", false); - java.util.Collection<String> networks = new java.util.ArrayList<String>(); + java.util.Collection<String> networks = new java.util.ArrayList<>(); while (st.hasMoreTokens()) { String addr = st.nextToken(); networks.add(addr); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java index d85d81f..ebb9a35 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java @@ -55,7 +55,7 @@ public class SMTPServerFactory extends AbstractServerFactory { @Override protected List<AbstractConfigurableAsyncServer> createServers(Logger log, HierarchicalConfiguration config) throws Exception{ - List<AbstractConfigurableAsyncServer> servers = new ArrayList<AbstractConfigurableAsyncServer>(); + List<AbstractConfigurableAsyncServer> servers = new ArrayList<>(); List<HierarchicalConfiguration> configs = config.configurationsAt("smtpserver"); for (HierarchicalConfiguration serverConfig: configs) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java index e0af73b..1df03c5 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java @@ -42,7 +42,6 @@ import java.util.Map; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import com.google.common.collect.ImmutableList; import org.apache.commons.net.ProtocolCommandEvent; import org.apache.commons.net.ProtocolCommandListener; import org.apache.commons.net.smtp.SMTPClient; @@ -78,6 +77,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.ImmutableList; + @SuppressWarnings("deprecation") public class SMTPServerTest { @@ -87,7 +88,7 @@ public class SMTPServerTest { @Override public Collection<String> findMXRecords(String hostname) { - List<String> res = new ArrayList<String>(); + List<String> res = new ArrayList<>(); if (hostname == null) { return res; } @@ -136,7 +137,7 @@ public class SMTPServerTest { @Override public Collection<String> findTXTRecords(String hostname) { - List<String> res = new ArrayList<String>(); + List<String> res = new ArrayList<>(); if (hostname == null) { return res; } @@ -449,7 +450,7 @@ public class SMTPServerTest { smtpProtocol.sendCommand("EHLO " + InetAddress.getLocalHost()); String[] capabilityRes = smtpProtocol.getReplyStrings(); - List<String> capabilitieslist = new ArrayList<String>(); + List<String> capabilitieslist = new ArrayList<>(); for (int i = 1; i < capabilityRes.length; i++) { capabilitieslist.add(capabilityRes[i].substring(4)); } @@ -565,7 +566,7 @@ public class SMTPServerTest { smtpProtocol.sendCommand("EHLO " + InetAddress.getLocalHost()); String[] capabilityRes = smtpProtocol.getReplyStrings(); - List<String> capabilitieslist = new ArrayList<String>(); + List<String> capabilitieslist = new ArrayList<>(); for (int i = 1; i < capabilityRes.length; i++) { capabilitieslist.add(capabilityRes[i].substring(4)); } @@ -1313,7 +1314,7 @@ public class SMTPServerTest { smtpProtocol.sendCommand("ehlo", InetAddress.getLocalHost().toString()); String[] capabilityRes = smtpProtocol.getReplyStrings(); - List<String> capabilitieslist = new ArrayList<String>(); + List<String> capabilitieslist = new ArrayList<>(); for (int i = 1; i < capabilityRes.length; i++) { capabilitieslist.add(capabilityRes[i].substring(4)); } @@ -1598,7 +1599,7 @@ public class SMTPServerTest { smtpProtocol.sendCommand("ehlo", InetAddress.getLocalHost().toString()); String[] capabilityRes = smtpProtocol.getReplyStrings(); - List<String> capabilitieslist = new ArrayList<String>(); + List<String> capabilitieslist = new ArrayList<>(); for (int i = 1; i < capabilityRes.length; i++) { capabilitieslist.add(capabilityRes[i].substring(4)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java index 8286199..3018bee 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java @@ -18,9 +18,12 @@ ****************************************************************/ package org.apache.james.smtpserver; +import static org.junit.Assert.assertEquals; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; + import org.apache.james.jspf.core.DNSRequest; import org.apache.james.jspf.core.DNSService; import org.apache.james.jspf.core.exceptions.TimeoutException; @@ -29,7 +32,6 @@ import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; import org.apache.james.smtpserver.fastfail.SPFHandler; -import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; @@ -88,7 +90,7 @@ public class SPFHandlerTest { switch (req.getRecordType()) { case DNSRequest.TXT: case DNSRequest.SPF: - List<String> l = new ArrayList<String>(); + List<String> l = new ArrayList<>(); if (req.getHostname().equals("spf1.james.apache.org")) { // pass l.add("v=spf1 +all"); @@ -124,8 +126,8 @@ public class SPFHandlerTest { private void setupMockedSMTPSession(String ip, final String helo) { mockedSMTPSession = new BaseFakeSMTPSession() { - private final HashMap<String, Object> sstate = new HashMap<String, Object>(); - private final HashMap<String, Object> connectionState = new HashMap<String, Object>(); + private final HashMap<String, Object> sstate = new HashMap<>(); + private final HashMap<String, Object> connectionState = new HashMap<>(); @Override public Object setAttachment(String key, Object value, State state) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java index 8a32e62..d9c7dea 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java @@ -18,10 +18,15 @@ ****************************************************************/ package org.apache.james.smtpserver; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.io.IOException; import java.util.HashMap; + import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; + import org.apache.james.protocols.lib.PortUtil; import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookResult; @@ -33,7 +38,6 @@ import org.apache.james.smtpserver.mock.mailet.MockMail; import org.apache.james.smtpserver.mock.util.MockSpamd; import org.apache.james.util.scanner.SpamAssassinInvoker; import org.apache.mailet.Mail; -import static org.junit.Assert.*; import org.junit.Test; public class SpamAssassinHandlerTest { @@ -46,8 +50,8 @@ public class SpamAssassinHandlerTest { return new BaseFakeSMTPSession() { - private final HashMap<String, Object> sstate = new HashMap<String, Object>(); - private final HashMap<String, Object> connectionState = new HashMap<String, Object>(); + private final HashMap<String, Object> sstate = new HashMap<>(); + private final HashMap<String, Object> connectionState = new HashMap<>(); private boolean relayingAllowed; @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java index e12433b..7d138f9 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.smtpserver; +import static org.junit.Assert.assertEquals; + import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; @@ -25,12 +27,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; + import javax.mail.BodyPart; import javax.mail.MessagingException; import javax.mail.Multipart; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; + import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.james.protocols.smtp.SMTPSession; @@ -41,7 +45,6 @@ import org.apache.james.smtpserver.fastfail.URIRBLHandler; import org.apache.james.smtpserver.mock.MockMimeMessage; import org.apache.james.smtpserver.mock.mailet.MockMail; import org.apache.mailet.Mail; -import static org.junit.Assert.assertEquals; import org.junit.Test; public class URIRBLHandlerTest { @@ -59,8 +62,8 @@ public class URIRBLHandlerTest { private boolean relayingAllowed; - private final HashMap<String, Object> sstate = new HashMap<String, Object>(); - private final HashMap<String, Object> connectionState = new HashMap<String, Object>(); + private final HashMap<String, Object> sstate = new HashMap<>(); + private final HashMap<String, Object> connectionState = new HashMap<>(); @Override public Object setAttachment(String key, Object value, State state) { @@ -142,7 +145,7 @@ public class URIRBLHandlerTest { @Override public Collection<String> findTXTRecords(String hostname) { - List<String> res = new ArrayList<String>(); + List<String> res = new ArrayList<>(); if (hostname == null) { return res; } @@ -170,7 +173,7 @@ public class URIRBLHandlerTest { @Test public void testNotBlocked() throws IOException, MessagingException { - ArrayList<String> servers = new ArrayList<String>(); + ArrayList<String> servers = new ArrayList<>(); servers.add(URISERVER); SMTPSession session = setupMockedSMTPSession(setupMockedMail(setupMockedMimeMessage( @@ -188,7 +191,7 @@ public class URIRBLHandlerTest { @Test public void testBlocked() throws IOException, MessagingException { - ArrayList<String> servers = new ArrayList<String>(); + ArrayList<String> servers = new ArrayList<>(); servers.add(URISERVER); SMTPSession session = setupMockedSMTPSession(setupMockedMail(setupMockedMimeMessage( @@ -206,7 +209,7 @@ public class URIRBLHandlerTest { @Test public void testBlockedMultiPart() throws IOException, MessagingException { - ArrayList<String> servers = new ArrayList<String>(); + ArrayList<String> servers = new ArrayList<>(); servers.add(URISERVER); SMTPSession session = setupMockedSMTPSession(setupMockedMail(setupMockedMimeMessageMP( http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java index 562bc59..79a8589 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java @@ -80,8 +80,8 @@ public class ValidRcptHandlerTest { public boolean isRelayingAllowed() { return relayingAllowed; } - private final HashMap<String, Object> sstate = new HashMap<String, Object>(); - private final HashMap<String, Object> connectionState = new HashMap<String, Object>(); + private final HashMap<String, Object> sstate = new HashMap<>(); + private final HashMap<String, Object> connectionState = new HashMap<>(); @Override public Object setAttachment(String key, Object value, State state) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java index 84a18f5..523dc9c 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java @@ -18,12 +18,16 @@ ****************************************************************/ package org.apache.james.smtpserver; +import static org.junit.Assert.assertEquals; + import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; + import javax.mail.internet.ParseException; + import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.james.protocols.smtp.MailAddress; @@ -32,7 +36,6 @@ import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession; import org.apache.james.smtpserver.fastfail.ValidRcptMX; -import static org.junit.Assert.assertEquals; import org.junit.Test; public class ValidRcptMXTest { @@ -44,8 +47,8 @@ public class ValidRcptMXTest { private SMTPSession setupMockedSMTPSession(MailAddress rcpt) { return new BaseFakeSMTPSession() { - private final HashMap<String, Object> sstate = new HashMap<String, Object>(); - private final HashMap<String, Object> connectionState = new HashMap<String, Object>(); + private final HashMap<String, Object> sstate = new HashMap<>(); + private final HashMap<String, Object> connectionState = new HashMap<>(); @Override public Object setAttachment(String key, Object value, State state) { @@ -79,7 +82,7 @@ public class ValidRcptMXTest { @Override public Collection<String> findMXRecords(String hostname) { - Collection<String> mx = new ArrayList<String>(); + Collection<String> mx = new ArrayList<>(); if (hostname.equals(INVALID_HOST)) { mx.add(INVALID_MX); @@ -101,7 +104,7 @@ public class ValidRcptMXTest { @Test public void testRejectLoopbackMX() throws ParseException, MailAddressException { - Collection<String> bNetworks = new ArrayList<String>(); + Collection<String> bNetworks = new ArrayList<>(); bNetworks.add("127.0.0.1"); DNSService dns = setupMockedDNSServer(); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java index 2cd567e..fe68393 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java @@ -48,12 +48,12 @@ import com.github.steveash.guavate.Guavate; public class MockMimeMessage extends MimeMessage { - private final List<Address> fromAddresses = new ArrayList<Address>(); + private final List<Address> fromAddresses = new ArrayList<>(); private Address senderAddress; - private final List<Address> toRecepients = new ArrayList<Address>(); - private final List<Address> ccRecepients = new ArrayList<Address>(); - private final List<Address> bccRecepients = new ArrayList<Address>(); - private final List<Address> replyToAddresses = new ArrayList<Address>(); + private final List<Address> toRecepients = new ArrayList<>(); + private final List<Address> ccRecepients = new ArrayList<>(); + private final List<Address> bccRecepients = new ArrayList<>(); + private final List<Address> replyToAddresses = new ArrayList<>(); private String subject; private int messageNumber; private boolean isExpunged; @@ -62,7 +62,7 @@ public class MockMimeMessage extends MimeMessage { private String[] contentLanguage; private String fileName; private DataHandler dataHandler; - private final HashMap<String, String> contentHeaders = new HashMap<String, String>(); + private final HashMap<String, String> contentHeaders = new HashMap<>(); private final Flags setFlags = new Flags(); private boolean doMatch; @@ -132,7 +132,7 @@ public class MockMimeMessage extends MimeMessage { @Override public Address[] getAllRecipients() throws MessagingException { - List<Address> allRecipients = new ArrayList<Address>(); + List<Address> allRecipients = new ArrayList<>(); allRecipients.addAll(toRecepients); allRecipients.addAll(ccRecepients); allRecipients.addAll(bccRecepients); @@ -418,7 +418,7 @@ public class MockMimeMessage extends MimeMessage { @Override public Enumeration<String> getMatchingHeaders(String[] names) throws MessagingException { - ArrayList<String> matchingHeaders = new ArrayList<String>(); + ArrayList<String> matchingHeaders = new ArrayList<>(); for (String name : names) { String value = getHeader(name, null); if (value == null) { @@ -433,7 +433,7 @@ public class MockMimeMessage extends MimeMessage { public Enumeration<String> getNonMatchingHeaders(String[] names) throws MessagingException { List<String> existingHeaders = Arrays.asList(names); - ArrayList<String> nonMatchingHeaders = new ArrayList<String>(); + ArrayList<String> nonMatchingHeaders = new ArrayList<>(); for (String name : contentHeaders.keySet()) { if (existingHeaders.contains(name)) { @@ -472,7 +472,7 @@ public class MockMimeMessage extends MimeMessage { @Override public Enumeration<String> getMatchingHeaderLines(String[] names) throws MessagingException { - ArrayList<String> matchingHeaders = new ArrayList<String>(); + ArrayList<String> matchingHeaders = new ArrayList<>(); for (String name : names) { String value = getHeader(name, null); if (value == null) { @@ -487,7 +487,7 @@ public class MockMimeMessage extends MimeMessage { public Enumeration<String> getNonMatchingHeaderLines(String[] names) throws MessagingException { List<String> existingHeaders = names != null ? Arrays.asList(names) : null; - ArrayList<String> nonMatchingHeaders = new ArrayList<String>(); + ArrayList<String> nonMatchingHeaders = new ArrayList<>(); for (String name : contentHeaders.keySet()) { if (existingHeaders != null && existingHeaders.contains(name)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java index 07a8574..6f1aac2 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java @@ -19,7 +19,11 @@ package org.apache.james.smtpserver.mock.mailet; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; @@ -33,13 +37,13 @@ import org.apache.mailet.PerRecipientHeaders.Header; public class MockMail implements Mail { private MimeMessage msg = null; - private Collection<MailAddress> recipients = new ArrayList<MailAddress>(); + private Collection<MailAddress> recipients = new ArrayList<>(); private String name = null; private final MailAddress sender = null; private String state = null; private String errorMessage; private Date lastUpdated; - private final HashMap<String, Serializable> attributes = new HashMap<String, Serializable>(); + private final HashMap<String, Serializable> attributes = new HashMap<>(); private static final long serialVersionUID = 1L; private long size = 0; private String remoteAddr = "127.0.0.1"; http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java index bfeb03c..2686fd8 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; @SuppressWarnings("deprecation") public class MockMailContext implements MailetContext { - final HashMap<String, Object> attributes = new HashMap<String, Object>(); + final HashMap<String, Object> attributes = new HashMap<>(); @Override public void bounce(Mail mail, String message) throws MessagingException { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java index 3551fbb..4f9d3ce 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java @@ -41,7 +41,7 @@ public class MockMailQueue implements MailQueue { private static final Logger log = LoggerFactory.getLogger(MockMailQueue.class.getName()); - private final LinkedBlockingQueue<Mail> queue = new LinkedBlockingQueue<Mail>(); + private final LinkedBlockingQueue<Mail> queue = new LinkedBlockingQueue<>(); private boolean throwException; private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java index 22fd374..1cf77db 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueueFactory.java @@ -26,7 +26,7 @@ import org.apache.james.queue.api.MailQueueFactory; public class MockMailQueueFactory implements MailQueueFactory { - private final Map<String, MailQueue> queues = new HashMap<String, MailQueue>(); + private final Map<String, MailQueue> queues = new HashMap<>(); @Override public synchronized MailQueue getQueue(String name) { http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java index f5fd47c..5251c9e 100644 --- a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java +++ b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java @@ -59,8 +59,8 @@ import org.slf4j.Logger; */ public class FileMailQueue implements ManageableMailQueue { - private final ConcurrentHashMap<String, FileItem> keyMappings = new ConcurrentHashMap<String, FileMailQueue.FileItem>(); - private final BlockingQueue<String> inmemoryQueue = new LinkedBlockingQueue<String>(); + private final ConcurrentHashMap<String, FileItem> keyMappings = new ConcurrentHashMap<>(); + private final BlockingQueue<String> inmemoryQueue = new LinkedBlockingQueue<>(); private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); private final static AtomicLong COUNTER = new AtomicLong(); private final String queueDirName; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
