You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/16 09:45:47 UTC
[14/18] james-project git commit: JAMES-2107 Run IntelliJ inspection:
"Explicit type parameter can be removed"
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
index 813401e..3808835 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
@@ -22,16 +22,14 @@
package org.apache.james.protocols.smtp.core.fastfail;
+import static junit.framework.Assert.assertEquals;
+
import java.util.HashMap;
import java.util.Map;
-
-import static junit.framework.Assert.*;
-
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.MailAddressException;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.protocols.smtp.core.fastfail.MaxRcptHandler;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.junit.Test;
@@ -42,7 +40,7 @@ public class MaxRcptHandlerTest {
private SMTPSession setupMockedSession(final int rcptCount) {
return new BaseFakeSMTPSession() {
- HashMap<String,Object> state = new HashMap<String,Object>();
+ HashMap<String,Object> state = new HashMap<>();
public Map<String,Object> getState() {
return state;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
index 27e1774..0df0aeb 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxUnknownCmdHandlerTest.java
@@ -20,25 +20,24 @@
package org.apache.james.protocols.smtp.core.fastfail;
+import static junit.framework.Assert.assertEquals;
+
import java.util.HashMap;
import java.util.Map;
-
import org.apache.james.protocols.smtp.MailAddressException;
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.junit.Test;
-import static junit.framework.Assert.*;
-
public class MaxUnknownCmdHandlerTest {
@Test
public void testRejectAndClose() throws MailAddressException {
SMTPSession session = new BaseFakeSMTPSession() {
- private final HashMap<String,Object> map = new HashMap<String,Object>();
+ private final HashMap<String,Object> map = new HashMap<>();
public Map<String,Object> getState() {
return map;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
index 94ede21..782ce18 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
@@ -21,19 +21,19 @@
package org.apache.james.protocols.smtp.core.fastfail;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
-
-import static junit.framework.Assert.*;
-
import org.apache.james.protocols.api.ProtocolSession.State;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.MailAddressException;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.junit.Test;
@@ -50,8 +50,8 @@ public class ResolvableEhloHeloHandlerTest {
return new BaseFakeSMTPSession() {
- HashMap<String,Object> connectionMap = new HashMap<String,Object>();
- HashMap<String,Object> map = new HashMap<String,Object>();
+ HashMap<String,Object> connectionMap = new HashMap<>();
+ HashMap<String,Object> map = new HashMap<>();
public boolean isAuthSupported() {
return authRequired;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
index f4c6c8c..d339a98 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
@@ -20,19 +20,19 @@
package org.apache.james.protocols.smtp.core.fastfail;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+
import java.net.InetSocketAddress;
import java.util.ArrayList;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.MailAddressException;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.protocols.smtp.core.fastfail.SpamTrapHandler;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.junit.Test;
-import static junit.framework.Assert.*;
-
public class SpamTrapHandlerTest {
private static final String SPAM_TRAP_RECIP1 = "spamtrap1@localhost";
private static final String RECIP1 = "recip@localhost";
@@ -57,7 +57,7 @@ public class SpamTrapHandlerTest {
String ip2 = "192.168.100.2";
long blockTime = 2000;
- ArrayList<String> rcpts = new ArrayList<String>();
+ ArrayList<String> rcpts = new ArrayList<>();
rcpts.add(SPAM_TRAP_RECIP1);
SpamTrapHandler handler = new SpamTrapHandler();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
index ec5ba2b..436528b 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
@@ -61,7 +61,7 @@ public class ValidSenderDomainHandlerTest {
private SMTPSession setupMockedSession(final MailAddress sender) {
return new BaseFakeSMTPSession() {
- HashMap<String,Object> map = new HashMap<String,Object>();
+ HashMap<String,Object> map = new HashMap<>();
public Map<String,Object> getState() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
index 0623356..f8ba661 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/TestMessageHook.java
@@ -31,7 +31,7 @@ import org.apache.james.protocols.smtp.hook.MessageHook;
public class TestMessageHook implements MessageHook {
- private final CopyOnWriteArrayList<MailEnvelope> queued = new CopyOnWriteArrayList<MailEnvelope>();
+ private final CopyOnWriteArrayList<MailEnvelope> queued = new CopyOnWriteArrayList<>();
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
queued.add(mail);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java
----------------------------------------------------------------------
diff --git a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java
index f8281b2..9609f54 100644
--- a/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java
+++ b/server/container/cli/src/test/java/org/apache/james/cli/ServerCmdTest.java
@@ -41,7 +41,6 @@ import org.apache.james.mailbox.store.probe.MailboxProbe;
import org.apache.james.mailbox.store.probe.QuotaProbe;
import org.apache.james.mailbox.store.probe.SieveProbe;
import org.apache.james.probe.DataProbe;
-import org.apache.james.rrt.lib.Mappings;
import org.apache.james.rrt.lib.MappingsImpl;
import org.easymock.IMocksControl;
import org.junit.Before;
@@ -172,7 +171,7 @@ public class ServerCmdTest {
String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.LISTMAPPINGS.getCommand()};
CommandLine commandLine = ServerCmd.parseCommandLine(arguments);
- expect(dataProbe.listMappings()).andReturn(new HashMap<String, Mappings>());
+ expect(dataProbe.listMappings()).andReturn(new HashMap<>());
control.replay();
testee.executeCommandLine(commandLine);
@@ -356,7 +355,7 @@ public class ServerCmdTest {
String[] arguments = { "-h", "127.0.0.1", "-p", "9999", CmdType.LISTUSERMAILBOXES.getCommand(), user};
CommandLine commandLine = ServerCmd.parseCommandLine(arguments);
- expect(mailboxProbe.listUserMailboxes(user)).andReturn(new ArrayList<String>());
+ expect(mailboxProbe.listUserMailboxes(user)).andReturn(new ArrayList<>());
control.replay();
testee.executeCommandLine(commandLine);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/core/src/main/java/org/apache/james/core/MailImpl.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/core/MailImpl.java b/server/container/core/src/main/java/org/apache/james/core/MailImpl.java
index c0cbdeb..857302a 100644
--- a/server/container/core/src/main/java/org/apache/james/core/MailImpl.java
+++ b/server/container/core/src/main/java/org/apache/james/core/MailImpl.java
@@ -19,19 +19,6 @@
package org.apache.james.core;
-import org.apache.james.lifecycle.api.Disposable;
-import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.PerRecipientHeaders;
-import org.apache.mailet.PerRecipientHeaders.Header;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.ParseException;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -49,6 +36,19 @@ import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.ParseException;
+
+import org.apache.james.lifecycle.api.Disposable;
+import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.PerRecipientHeaders;
+import org.apache.mailet.PerRecipientHeaders.Header;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <p>
* Wraps a MimeMessage adding routing information (from SMTP) and some simple
@@ -127,7 +127,7 @@ public class MailImpl implements Disposable, Mail {
*/
public MailImpl() {
setState(Mail.DEFAULT);
- attributes = new HashMap<String, Object>();
+ attributes = new HashMap<>();
perRecipientSpecificHeaders = new PerRecipientHeaders();
}
@@ -147,7 +147,7 @@ public class MailImpl implements Disposable, Mail {
// Copy the recipient list
if (recipients != null) {
- this.recipients = new ArrayList<MailAddress>();
+ this.recipients = new ArrayList<>();
this.recipients.addAll(recipients);
}
}
@@ -177,7 +177,7 @@ public class MailImpl implements Disposable, Mail {
if (mail instanceof MailImpl) {
setAttributesRaw((HashMap<String, Object>) cloneSerializableObject(((MailImpl) mail).getAttributesRaw()));
} else {
- HashMap<String, Object> attribs = new HashMap<String, Object>();
+ HashMap<String, Object> attribs = new HashMap<>();
for (Iterator<String> i = mail.getAttributeNames(); i.hasNext(); ) {
String hashKey = i.next();
attribs.put(hashKey, cloneSerializableObject(mail.getAttribute(hashKey)));
@@ -186,10 +186,10 @@ public class MailImpl implements Disposable, Mail {
}
} catch (IOException e) {
LOGGER.error("Error while deserializing attributes", e);
- setAttributesRaw(new HashMap<String, Object>());
+ setAttributesRaw(new HashMap<>());
} catch (ClassNotFoundException e) {
LOGGER.error("Error while deserializing attributes", e);
- setAttributesRaw(new HashMap<String, Object>());
+ setAttributesRaw(new HashMap<>());
}
}
@@ -520,7 +520,7 @@ public class MailImpl implements Disposable, Mail {
attributes = (HashMap<String, Object>) in.readObject();
} catch (OptionalDataException ode) {
if (ode.eof) {
- attributes = new HashMap<String, Object>();
+ attributes = new HashMap<>();
} else {
throw ode;
}
@@ -582,7 +582,7 @@ public class MailImpl implements Disposable, Mail {
* @since 2.2.0
*/
public void setAttributesRaw(HashMap<String, Object> attr) {
- this.attributes = (attr == null) ? new HashMap<String, Object>() : attr;
+ this.attributes = (attr == null) ? new HashMap<>() : attr;
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java b/server/container/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
index 531529a..46d1afd 100644
--- a/server/container/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
+++ b/server/container/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
@@ -42,7 +42,7 @@ import org.apache.james.lifecycle.api.Disposable;
*/
public class MimeMessageInputStreamSource extends MimeMessageSource implements Disposable {
- private final List<InputStream> streams = new ArrayList<InputStream>();
+ private final List<InputStream> streams = new ArrayList<>();
/**
* A temporary file used to hold the message stream
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java b/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java
index 57a8ae1..aa82d0b 100644
--- a/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java
+++ b/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java
@@ -18,17 +18,22 @@
****************************************************************/
package org.apache.james.core;
-import org.apache.mailet.base.test.MailUtil;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.Mail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import static org.junit.Assert.*;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+import org.apache.mailet.base.test.MailUtil;
import org.junit.Test;
public class MailImplTest extends MailTestAllImplementations {
@@ -53,7 +58,7 @@ public class MailImplTest extends MailTestAllImplementations {
@Test
public void testConstr2() throws MessagingException {
- ArrayList<MailAddress> recepients = new ArrayList<MailAddress>();
+ ArrayList<MailAddress> recepients = new ArrayList<>();
String name = MailUtil.newId();
String sender = "sender@localhost";
MailAddress senderMailAddress = new MailAddress(sender);
@@ -71,7 +76,7 @@ public class MailImplTest extends MailTestAllImplementations {
@Test
public void testConstr3() throws MessagingException {
- ArrayList<MailAddress> recepients = new ArrayList<MailAddress>();
+ ArrayList<MailAddress> recepients = new ArrayList<>();
String name = MailUtil.newId();
String sender = "sender@localhost";
MailAddress senderMailAddress = new MailAddress(sender);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
----------------------------------------------------------------------
diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
index c9c2e42..36c678b 100644
--- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
+++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
@@ -18,6 +18,14 @@
****************************************************************/
package org.apache.james.core;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.ArrayList;
import java.util.Properties;
@@ -29,7 +37,6 @@ import javax.mail.util.SharedByteArrayInputStream;
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
-import static org.junit.Assert.*;
import org.junit.Test;
public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
@@ -48,7 +55,7 @@ public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
@Test
public void testMessageCloning1() throws Exception {
- ArrayList<MailAddress> r = new ArrayList<MailAddress>();
+ ArrayList<MailAddress> r = new ArrayList<>();
r.add(new MailAddress("recipient@test.com"));
MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(
content + sep + body);
@@ -74,7 +81,7 @@ public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
@Test
public void testMessageCloning2() throws Exception {
- ArrayList<MailAddress> r = new ArrayList<MailAddress>();
+ ArrayList<MailAddress> r = new ArrayList<>();
r.add(new MailAddress("recipient@test.com"));
MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(
content + sep + body);
@@ -124,7 +131,7 @@ public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
*/
@Test
public void testMessageAvoidCloning() throws Exception {
- ArrayList<MailAddress> r = new ArrayList<MailAddress>();
+ ArrayList<MailAddress> r = new ArrayList<>();
r.add(new MailAddress("recipient@test.com"));
MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(
content + sep + body);
@@ -160,7 +167,7 @@ public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
*/
@Test
public void testMessageCloning3() throws Exception {
- ArrayList<MailAddress> r = new ArrayList<MailAddress>();
+ ArrayList<MailAddress> r = new ArrayList<>();
r.add(new MailAddress("recipient@test.com"));
MimeMessage m = new MimeMessage(Session.getDefaultInstance(new Properties(null)));
m.setText("CIPS");
@@ -181,7 +188,7 @@ public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
@Test
public void testMessageDisposing() throws Exception {
- ArrayList<MailAddress> r = new ArrayList<MailAddress>();
+ ArrayList<MailAddress> r = new ArrayList<>();
r.add(new MailAddress("recipient@test.com"));
MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources(
content + sep + body);
@@ -203,7 +210,7 @@ public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
@Test
public void testNPE1() throws MessagingException, InterruptedException {
- ArrayList<MailAddress> recipients = new ArrayList<MailAddress>();
+ ArrayList<MailAddress> recipients = new ArrayList<>();
recipients.add(new MailAddress("recipient@test.com"));
MimeMessageCopyOnWriteProxy mw = new MimeMessageCopyOnWriteProxy(new MimeMessageInputStreamSource("test",
new SharedByteArrayInputStream(("Return-path: return@test.com\r\n" + "Content-Transfer-Encoding: plain\r\n" + "Subject: test\r\n\r\n" + "Body Text testNPE1\r\n").
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
index 83c147f..228ffe6 100644
--- a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
+++ b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
@@ -123,7 +123,7 @@ public class JPAMailboxModule extends AbstractModule {
@Provides
@Singleton
public EntityManagerFactory provideEntityManagerFactory(JPAConfiguration jpaConfiguration) {
- HashMap<String, String> properties = new HashMap<String, String>();
+ HashMap<String, String> properties = new HashMap<>();
properties.put("openjpa.ConnectionDriverName", jpaConfiguration.getDriverName());
properties.put("openjpa.ConnectionURL", jpaConfiguration.getDriverURL());
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java
index 982f767..b0b204a 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/DefaultStager.java
@@ -55,7 +55,7 @@ public class DefaultStager<A extends Annotation> implements DisposingStager<A> {
Queue<Stageable> localStageables;
switch (mode) {
case FIRST_IN_FIRST_OUT: {
- localStageables = new ArrayDeque<Stageable>();
+ localStageables = new ArrayDeque<>();
break;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/PreDestroyModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/PreDestroyModule.java b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/PreDestroyModule.java
index 09bcd8d..98861e3 100644
--- a/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/PreDestroyModule.java
+++ b/server/container/guice/onami/src/main/java/org/apache/james/onami/lifecycle/PreDestroyModule.java
@@ -32,7 +32,7 @@ import com.google.inject.TypeLiteral;
*/
public class PreDestroyModule extends LifeCycleStageModule {
- private final DisposingStager<PreDestroy> stager = new DefaultStager<PreDestroy>(PreDestroy.class, DefaultStager.Order.FIRST_IN_LAST_OUT);
+ private final DisposingStager<PreDestroy> stager = new DefaultStager<>(PreDestroy.class, DefaultStager.Order.FIRST_IN_LAST_OUT);
@Override
protected void configureBindings() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/DefaultStagerTestCase.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/DefaultStagerTestCase.java b/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/DefaultStagerTestCase.java
index 156c5f1..856231b 100644
--- a/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/DefaultStagerTestCase.java
+++ b/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/DefaultStagerTestCase.java
@@ -28,7 +28,7 @@ public class DefaultStagerTestCase {
@Test
public void stagerShouldStageObjectsRegisteredWhileStaging() {
- final Stager<TestAnnotationA> stager = new DefaultStager<TestAnnotationA>(TestAnnotationA.class);
+ final Stager<TestAnnotationA> stager = new DefaultStager<>(TestAnnotationA.class);
final AtomicBoolean staged = new AtomicBoolean();
stager.register(stageHandler1 -> stager
.register(stageHandler2 ->
@@ -48,7 +48,7 @@ public class DefaultStagerTestCase {
@Test
public void stagerShouldNotDeadlockWhileStagingObjectChains() {
final AtomicBoolean staged = new AtomicBoolean();
- final Stager<TestAnnotationA> stager = new DefaultStager<TestAnnotationA>(TestAnnotationA.class);
+ final Stager<TestAnnotationA> stager = new DefaultStager<>(TestAnnotationA.class);
stager.register(stageHandler1 -> {
Thread thread = new Thread(
() -> stager.register(stageHandler2 -> staged.set(true)));
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/StagingOrderTestCase.java
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/StagingOrderTestCase.java b/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/StagingOrderTestCase.java
index 3f4201d..5b0788d 100644
--- a/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/StagingOrderTestCase.java
+++ b/server/container/guice/onami/src/test/java/org/apache/james/onami/lifecycle/StagingOrderTestCase.java
@@ -50,7 +50,7 @@ public class StagingOrderTestCase {
Stageable stageable2 = stageHandler -> order.add(2);
Stageable stageable3 = stageHandler -> order.add(3);
- DefaultStager<TestAnnotationA> stager = new DefaultStager<TestAnnotationA>(TestAnnotationA.class, stagingOrder);
+ DefaultStager<TestAnnotationA> stager = new DefaultStager<>(TestAnnotationA.class, stagingOrder);
stager.register(stageable1);
stager.register(stageable2);
stager.register(stageable3);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
index c4e61b3..7be2847 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxCopierManagement.java
@@ -60,7 +60,7 @@ public class MailboxCopierManagement implements MailboxCopierManagementMBean {
* #getMailboxManagerBeans()
*/
public Map<String, String> getMailboxManagerBeans() {
- Map<String, String> bMap = new HashMap<String, String>();
+ Map<String, String> bMap = new HashMap<>();
Map<String, MailboxManager> beans = resolver.getMailboxManagerBeans();
for (Map.Entry<String, MailboxManager> entry : beans.entrySet()) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
index 8afca6a..29415cf 100644
--- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
+++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
@@ -101,7 +101,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxMa
@Override
public List<String> listMailboxes(String username) {
checkString(username, "Username");
- List<String> boxes = new ArrayList<String>();
+ List<String> boxes = new ArrayList<>();
MailboxSession session = null;
try {
session = mailboxManager.createSystemSession(username, log);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
index 3ef99be..e809afe 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
@@ -18,6 +18,13 @@
****************************************************************/
package org.apache.james.container.spring.bean.factory.mailrepositorystore;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
import org.apache.commons.collections.map.ReferenceMap;
import org.apache.commons.configuration.CombinedConfiguration;
import org.apache.commons.configuration.ConfigurationException;
@@ -31,13 +38,6 @@ import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.slf4j.Logger;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import javax.annotation.PostConstruct;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* Provides a registry of mail repositories. A mail repository is uniquely
* identified by its destinationURL, type and model.
@@ -83,8 +83,8 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
getLogger().info("JamesMailStore init...");
repositories = new ReferenceMap();
- classes = new HashMap<String, String>();
- defaultConfigs = new HashMap<String, HierarchicalConfiguration>();
+ classes = new HashMap<>();
+ defaultConfigs = new HashMap<>();
List<HierarchicalConfiguration> registeredClasses = configuration.configurationsAt("mailrepositories.mailrepository");
for (HierarchicalConfiguration registeredClass : registeredClasses) {
registerRepository(registeredClass);
@@ -227,7 +227,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
* @see org.apache.james.mailrepository.api.MailRepositoryStore#getUrls()
*/
public synchronized List<String> getUrls() {
- return new ArrayList<String>(repositories.keySet());
+ return new ArrayList<>(repositories.keySet());
}
public void setLog(Logger logger) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
index 65060f8..7ee950a 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
@@ -39,7 +39,7 @@ public class ConfigurationProviderImpl implements ConfigurationProvider, Resourc
/**
* A map of loaded configuration per bean.
*/
- private final Map<String, HierarchicalConfiguration> configurations = new HashMap<String, HierarchicalConfiguration>();
+ private final Map<String, HierarchicalConfiguration> configurations = new HashMap<>();
/**
* Mappings for bean names associated with their related
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
index 6a9690d..cdd60dd 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
@@ -34,7 +34,7 @@ import org.springframework.beans.factory.InitializingBean;
*/
public class LogProviderImpl implements LogProvider, InitializingBean, LogProviderManagementMBean {
- private final ConcurrentHashMap<String, Logger> logMap = new ConcurrentHashMap<String, Logger>();
+ private final ConcurrentHashMap<String, Logger> logMap = new ConcurrentHashMap<>();
private Map<String, String> logs;
private final static String PREFIX = "james.";
@@ -93,7 +93,7 @@ public class LogProviderImpl implements LogProvider, InitializingBean, LogProvid
* @see LogProviderManagementMBean#getLogLevels()
*/
public Map<String, String> getLogLevels() {
- TreeMap<String, String> levels = new TreeMap<String, String>();
+ TreeMap<String, String> levels = new TreeMap<>();
for (String name : logMap.keySet()) {
String level = getLogLevel(name);
if (level != null)
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java
index 24f27d2..a81b09a 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/mailbox/MaxQuotaConfigurationReader.java
@@ -19,6 +19,10 @@
package org.apache.james.container.spring.mailbox;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.lifecycle.api.Configurable;
@@ -26,10 +30,6 @@ import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.quota.MaxQuotaManager;
import org.apache.james.mailbox.quota.QuotaRootResolver;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
public class MaxQuotaConfigurationReader implements Configurable {
private final MaxQuotaManager maxQuotaManager;
@@ -56,7 +56,7 @@ public class MaxQuotaConfigurationReader implements Configurable {
private Map<String, Long> parseMaxMessageConfiguration(HierarchicalConfiguration config, String entry) {
List<HierarchicalConfiguration> maxMessageConfiguration = config.configurationAt("maxQuotaManager").configurationsAt(entry);
- Map<String, Long> result = new HashMap<String, Long>();
+ Map<String, Long> result = new HashMap<>();
for (HierarchicalConfiguration conf : maxMessageConfiguration) {
result.put(conf.getString("quotaRoot"), conf.getLong("value"));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/main/java/org/apache/james/util/IteratorWrapper.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/IteratorWrapper.java b/server/container/util/src/main/java/org/apache/james/util/IteratorWrapper.java
index 486e796..4dcd8b0 100644
--- a/server/container/util/src/main/java/org/apache/james/util/IteratorWrapper.java
+++ b/server/container/util/src/main/java/org/apache/james/util/IteratorWrapper.java
@@ -34,7 +34,7 @@ public class IteratorWrapper<U> implements Iterator<U> {
public IteratorWrapper(Iterator<U> underlying) {
Preconditions.checkNotNull(underlying);
this.underlying = underlying;
- this.entriesSeen = new ArrayList<U>();
+ this.entriesSeen = new ArrayList<>();
}
public List<U> getEntriesSeen() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java b/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
index f0f706d..4dcee20 100644
--- a/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
+++ b/server/container/util/src/main/java/org/apache/james/util/RestrictingRMISocketFactory.java
@@ -34,7 +34,7 @@ public class RestrictingRMISocketFactory extends RMISocketFactory {
private final String address;
- private final List<ServerSocket> sockets = new ArrayList<ServerSocket>();
+ private final List<ServerSocket> sockets = new ArrayList<>();
public RestrictingRMISocketFactory(String address) {
this.address = address;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/main/java/org/apache/james/util/TimeConverter.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/TimeConverter.java b/server/container/util/src/main/java/org/apache/james/util/TimeConverter.java
index 162fef5..dbc68fe 100644
--- a/server/container/util/src/main/java/org/apache/james/util/TimeConverter.java
+++ b/server/container/util/src/main/java/org/apache/james/util/TimeConverter.java
@@ -25,7 +25,7 @@ import java.util.regex.Pattern;
public class TimeConverter {
- private static final HashMap<String, Integer> multipliers = new HashMap<String, Integer>(10);
+ private static final HashMap<String, Integer> multipliers = new HashMap<>(10);
private static final String PATTERN_STRING = "\\s*([0-9]+)\\s*([a-z,A-Z]*)\\s*";
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java b/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
index d775a75..4f1f5d6 100644
--- a/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
+++ b/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java
@@ -111,12 +111,12 @@ public class BayesianAnalyzer {
/**
* 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.
@@ -131,7 +131,7 @@ public class BayesianAnalyzer {
/**
* Final token/probability corpus.
*/
- private Map<String, Double> corpus = new HashMap<String, Double>();
+ private Map<String, Double> corpus = new HashMap<>();
/**
* Inner class for managing Token Probability Strengths during the
@@ -295,10 +295,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.
@@ -408,7 +408,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<>();
String token;
String header = "";
@@ -573,7 +573,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();
@@ -621,7 +621,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/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
index 0987b73..34530b5 100644
--- a/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
+++ b/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java
@@ -19,21 +19,19 @@
package org.apache.james.util.bayesian;
-import org.apache.james.util.sql.JDBCUtil;
-import org.apache.james.util.sql.SqlResources;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-
import java.io.File;
-
import java.sql.Connection;
+import java.sql.DatabaseMetaData;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.DatabaseMetaData;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.james.util.sql.JDBCUtil;
+import org.apache.james.util.sql.SqlResources;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Manages the persistence of the spam bayesian analysis corpus using a JDBC
@@ -79,7 +77,7 @@ abstract public class JDBCBayesianAnalyzer extends BayesianAnalyzer {
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/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java b/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java
index ff50490..134c069 100644
--- a/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java
+++ b/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java
@@ -86,7 +86,7 @@ public class ConcurrentTestRunner {
this.countDownLatch = new CountDownLatch(threadCount);
this.biConsumer = biConsumer;
this.executorService = Executors.newFixedThreadPool(threadCount);
- this.futures = new ArrayList<Future<?>>();
+ this.futures = new ArrayList<>();
}
public ConcurrentTestRunner run() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
index 3c94bf7..2940290 100644
--- a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
+++ b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java
@@ -36,7 +36,7 @@ public class JMXEnabledScheduledThreadPoolExecutor extends ScheduledThreadPoolEx
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/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
index b023078..e4110ba 100644
--- a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
+++ b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
@@ -38,7 +38,7 @@ public class JMXEnabledThreadPoolExecutor extends ThreadPoolExecutor implements
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;
@@ -163,7 +163,7 @@ public class JMXEnabledThreadPoolExecutor extends ThreadPoolExecutor implements
*
*/
public static JMXEnabledThreadPoolExecutor newCachedThreadPool(String jmxPath, String name) {
- return new JMXEnabledThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), new NamedThreadFactory(name), jmxPath);
+ return new JMXEnabledThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>(), new NamedThreadFactory(name), jmxPath);
}
@@ -176,11 +176,11 @@ public class JMXEnabledThreadPoolExecutor extends ThreadPoolExecutor implements
* @return pool
*/
public static JMXEnabledThreadPoolExecutor newCachedThreadPool(String jmxPath, NamedThreadFactory factory) {
- return new JMXEnabledThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), factory, jmxPath);
+ return new JMXEnabledThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>(), factory, jmxPath);
}
public static JMXEnabledThreadPoolExecutor newFixedThreadPool(String jmxPath, int nThreads, NamedThreadFactory threadFactory) {
- return new JMXEnabledThreadPoolExecutor(nThreads, nThreads, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), threadFactory, jmxPath);
+ return new JMXEnabledThreadPoolExecutor(nThreads, nThreads, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), threadFactory, jmxPath);
}
public static JMXEnabledThreadPoolExecutor newFixedThreadPool(String jmxPath, String name, int nThreads) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java b/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
index f006acd..6ea131a 100644
--- a/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
+++ b/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java
@@ -19,21 +19,21 @@
package org.apache.james.util.scanner;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
-import com.google.common.io.Closeables;
-
-import java.net.Socket;
-import java.net.UnknownHostException;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.net.Socket;
+import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
+import com.google.common.io.Closeables;
+
/**
* Sends the message through daemonized SpamAssassin (spamd), visit <a
* href="SpamAssassin.org">SpamAssassin.org</a> for info on configuration.
@@ -54,7 +54,7 @@ public class SpamAssassinInvoker {
private String required = "?";
- private final Map<String, String> headers = new HashMap<String, String>();
+ private final Map<String, String> headers = new HashMap<>();
/**
* Init the spamassassin invoker
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java b/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java
index 7af213e..519b7d8 100644
--- a/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java
+++ b/server/container/util/src/main/java/org/apache/james/util/sql/SqlResources.java
@@ -19,14 +19,6 @@
package org.apache.james.util.sql;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import java.io.File;
import java.io.InputStream;
import java.sql.Connection;
@@ -35,6 +27,15 @@ import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+
/**
* Provides a set of SQL String resources (eg SQL Strings) to use for a database
* connection.<br>
@@ -45,10 +46,10 @@ import java.util.regex.Pattern;
*/
public 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>());
@@ -170,7 +171,7 @@ public 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) {
@@ -189,8 +190,8 @@ public 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/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java b/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java
index 61d7f2d..aa29e92 100644
--- a/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/IteratorWrapperTest.java
@@ -35,7 +35,7 @@ public class IteratorWrapperTest {
@Test
public void getEntriesSeenShouldReturnEmptyWhenNotConsumed() {
ImmutableList<Integer> originalData = ImmutableList.of(1, 2, 3);
- IteratorWrapper<Integer> integerIteratorWrapper = new IteratorWrapper<Integer>(originalData.iterator());
+ IteratorWrapper<Integer> integerIteratorWrapper = new IteratorWrapper<>(originalData.iterator());
assertThat(integerIteratorWrapper.getEntriesSeen()).isEmpty();
}
@@ -43,7 +43,7 @@ public class IteratorWrapperTest {
@Test
public void getEntriesSeenShouldReturnViewOfConsumedData() {
ImmutableList<Integer> originalData = ImmutableList.of(1, 2, 3);
- IteratorWrapper<Integer> integerIteratorWrapper = new IteratorWrapper<Integer>(originalData.iterator());
+ IteratorWrapper<Integer> integerIteratorWrapper = new IteratorWrapper<>(originalData.iterator());
consume(integerIteratorWrapper);
@@ -54,7 +54,7 @@ public class IteratorWrapperTest {
@Test
public void getEntriesSeenShouldReturnViewOfConsumedDataWhenPartiallyConsumed() {
ImmutableList<Integer> originalData = ImmutableList.of(1, 2, 3);
- IteratorWrapper<Integer> integerIteratorWrapper = new IteratorWrapper<Integer>(originalData.iterator());
+ IteratorWrapper<Integer> integerIteratorWrapper = new IteratorWrapper<>(originalData.iterator());
integerIteratorWrapper.next();
integerIteratorWrapper.next();
@@ -66,7 +66,7 @@ public class IteratorWrapperTest {
@Test
public void getEntriesSeenShouldReturnEmptyWhenSuppliedEmpty() {
ImmutableList<Integer> originalData = ImmutableList.of();
- IteratorWrapper<Integer> integerIteratorWrapper = new IteratorWrapper<Integer>(originalData.iterator());
+ IteratorWrapper<Integer> integerIteratorWrapper = new IteratorWrapper<>(originalData.iterator());
consume(integerIteratorWrapper);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java b/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java
index 8934b56..b0d2e0d 100644
--- a/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/concurrency/ConcurrentTestRunnerTest.java
@@ -110,7 +110,7 @@ public class ConcurrentTestRunnerTest {
public void runShouldPerformAllOperations() throws Exception {
int operationCount = 2;
int threadCount = 2;
- final ConcurrentLinkedQueue<String> queue = new ConcurrentLinkedQueue<String>();
+ final ConcurrentLinkedQueue<String> queue = new ConcurrentLinkedQueue<>();
ConcurrentTestRunner concurrentTestRunner = new ConcurrentTestRunner(threadCount, operationCount,
(threadNumber, step) -> queue.add(threadNumber + ":" + step))
@@ -167,7 +167,7 @@ public class ConcurrentTestRunnerTest {
public void runShouldPerformAllOperationsEvenOnExceptions() throws Exception {
int operationCount = 2;
int threadCount = 2;
- final ConcurrentLinkedQueue<String> queue = new ConcurrentLinkedQueue<String>();
+ final ConcurrentLinkedQueue<String> queue = new ConcurrentLinkedQueue<>();
ConcurrentTestRunner concurrentTestRunner = new ConcurrentTestRunner(threadCount, operationCount,
(threadNumber, step) -> {
@@ -184,7 +184,7 @@ public class ConcurrentTestRunnerTest {
public void runShouldPerformAllOperationsEvenOnOccasionalExceptions() throws Exception {
int operationCount = 2;
int threadCount = 2;
- final ConcurrentLinkedQueue<String> queue = new ConcurrentLinkedQueue<String>();
+ final ConcurrentLinkedQueue<String> queue = new ConcurrentLinkedQueue<>();
ConcurrentTestRunner concurrentTestRunner = new ConcurrentTestRunner(threadCount, operationCount,
(threadNumber, step) -> {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
index fb3fc5a..6dad10b 100644
--- a/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/retry/ExceptionRetryHandlerTest.java
@@ -19,14 +19,17 @@
*/
package org.apache.james.util.retry;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.List;
+
import javax.naming.Context;
import org.apache.james.util.retry.api.ExceptionRetryingProxy;
import org.apache.james.util.retry.api.RetryHandler;
import org.apache.james.util.retry.api.RetrySchedule;
-import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
@@ -133,7 +136,7 @@ public class ExceptionRetryHandlerTest {
*/
@Test
public final void testPostFailure() {
- final List<Exception> results = new ArrayList<Exception>();
+ final List<Exception> results = new ArrayList<>();
RetryHandler handler = new ExceptionRetryHandler(
_exceptionClasses, _proxy, _schedule, 7) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java b/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
index 634e79e..1d2966e 100644
--- a/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
+++ b/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
@@ -39,7 +39,7 @@ import org.apache.james.lifecycle.api.Configurable;
@Singleton
public class XMLDomainList extends AbstractDomainList implements Configurable {
- private final List<String> domainNames = new ArrayList<String>();
+ private final List<String> domainNames = new ArrayList<>();
private boolean isConfigured = false;
@Inject
@@ -55,7 +55,7 @@ public class XMLDomainList extends AbstractDomainList implements Configurable {
@Override
protected List<String> getDomainListInternal() {
- return new ArrayList<String>(domainNames);
+ return new ArrayList<>(domainNames);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
index d92b20e..1b8a04f 100644
--- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
@@ -111,11 +111,11 @@ public class FileMailRepository extends AbstractMailRepository {
keys = Collections.synchronizedSet(new HashSet<String>());
// Finds non-matching pairs and deletes the extra files
- HashSet<String> streamKeys = new HashSet<String>();
+ HashSet<String> streamKeys = new HashSet<>();
for (Iterator<String> i = streamRepository.list(); i.hasNext(); ) {
streamKeys.add(i.next());
}
- HashSet<String> objectKeys = new HashSet<String>();
+ HashSet<String> objectKeys = new HashSet<>();
for (Iterator<String> i = objectRepository.list(); i.hasNext(); ) {
objectKeys.add(i.next());
}
@@ -264,10 +264,10 @@ public class FileMailRepository extends AbstractMailRepository {
final ArrayList<String> clone;
if (keys != null)
synchronized (lock) {
- clone = new ArrayList<String>(keys);
+ clone = new ArrayList<>(keys);
}
else {
- clone = new ArrayList<String>();
+ clone = new ArrayList<>();
for (Iterator<String> i = objectRepository.list(); i.hasNext(); ) {
clone.add(i.next());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
index a8f2ae3..39f096b 100755
--- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
@@ -500,7 +500,7 @@ public class MBoxMailRepository implements MailRepository, LogEnabled, Configura
if (initialCapacity > Integer.MAX_VALUE) {
initialCapacity = Integer.MAX_VALUE - 1;
}
- this.mList = new Hashtable<String, Long>((int) initialCapacity);
+ this.mList = new Hashtable<>((int) initialCapacity);
this.parseMboxFile(ins, new MessageAction() {
public boolean isComplete() {
return false;
@@ -523,7 +523,7 @@ public class MBoxMailRepository implements MailRepository, LogEnabled, Configura
// System.out.println("Done Load keys!");
} catch (FileNotFoundException e) {
getLogger().error("Unable to save(open) file (File not found) " + mboxFile, e);
- this.mList = new Hashtable<String, Long>((int) DEFAULTMLISTCAPACITY);
+ this.mList = new Hashtable<>((int) DEFAULTMLISTCAPACITY);
} catch (IOException e) {
getLogger().error("Unable to write file (General I/O problem) " + mboxFile, e);
} finally {
@@ -585,7 +585,7 @@ public class MBoxMailRepository implements MailRepository, LogEnabled, Configura
*/
public Iterator<String> list() {
loadKeys();
- ArrayList<String> keys = new ArrayList<String>(mList.keySet());
+ ArrayList<String> keys = new ArrayList<>(mList.keySet());
if (!keys.isEmpty()) {
// find the first message. This is a trick to make sure that if
@@ -632,7 +632,7 @@ public class MBoxMailRepository implements MailRepository, LogEnabled, Configura
* @see org.apache.james.mailrepository.api.MailRepository#remove(Mail)
*/
public void remove(Mail mail) {
- ArrayList<Mail> remArray = new ArrayList<Mail>();
+ ArrayList<Mail> remArray = new ArrayList<>();
remArray.add(mail);
remove(remArray);
}
@@ -779,7 +779,7 @@ public class MBoxMailRepository implements MailRepository, LogEnabled, Configura
getLogger().error("Lock failed!", e);
return; // No lock, so exit
}
- ArrayList<Mail> keys = new ArrayList<Mail>();
+ ArrayList<Mail> keys = new ArrayList<>();
keys.add(retrieve(key));
this.remove(keys);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java b/server/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java
index 29184b0..6132f3f 100644
--- a/server/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java
+++ b/server/data/data-file/src/main/java/org/apache/james/rrt/file/XMLRecipientRewriteTable.java
@@ -80,7 +80,7 @@ public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
@Override
protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException {
if (mappings != null && mappings.size() > 0) {
- Map<String, Mappings> mappingsNew = new HashMap<String, Mappings>();
+ Map<String, Mappings> mappingsNew = new HashMap<>();
for (String key : mappings.keySet()) {
mappingsNew.put(key, MappingsImpl.fromRawString(mappings.get(key)));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
index c6d315e..19274ee 100644
--- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java
@@ -211,7 +211,7 @@ public class SieveFileRepository implements SieveRepository {
public List<ScriptSummary> listScripts(String user) throws StorageException {
File[] files = getUserDirectory(user).listFiles();
- List<ScriptSummary> summaries = new ArrayList<ScriptSummary>(files.length);
+ List<ScriptSummary> summaries = new ArrayList<>(files.length);
File activeFile = null;
try {
activeFile = getActiveFile(user);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java b/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
index 448579b..1940e3b 100644
--- a/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
@@ -80,7 +80,7 @@ public class XMLDomainListTest {
// See https://issues.apache.org/jira/browse/JAMES-998
@Test
public void testNoConfiguredDomains() throws Exception {
- List<String> domains = new ArrayList<String>();
+ List<String> domains = new ArrayList<>();
XMLDomainList dom = new XMLDomainList(setUpDNSServer("localhost"));
dom.setLog(LoggerFactory.getLogger("MockLog"));
dom.configure(setUpConfiguration(false, false, domains));
@@ -90,7 +90,7 @@ public class XMLDomainListTest {
@Test
public void testGetDomains() throws Exception {
- List<String> domains = new ArrayList<String>();
+ List<String> domains = new ArrayList<>();
domains.add("domain1.");
domains.add("domain2.");
@@ -103,7 +103,7 @@ public class XMLDomainListTest {
@Test
public void testGetDomainsAutoDetectNotLocalHost() throws Exception {
- List<String> domains = new ArrayList<String>();
+ List<String> domains = new ArrayList<>();
domains.add("domain1.");
XMLDomainList dom = new XMLDomainList(setUpDNSServer("local"));
@@ -115,7 +115,7 @@ public class XMLDomainListTest {
@Test
public void testGetDomainsAutoDetectLocalHost() throws Exception {
- List<String> domains = new ArrayList<String>();
+ List<String> domains = new ArrayList<>();
domains.add("domain1.");
XMLDomainList dom = new XMLDomainList(setUpDNSServer("localhost"));
@@ -130,7 +130,7 @@ public class XMLDomainListTest {
public void addDomainShouldFailWhenAlreadyConfigured() throws Exception {
expectedException.expect(DomainListException.class);
- List<String> domains = new ArrayList<String>();
+ List<String> domains = new ArrayList<>();
domains.add("domain1");
XMLDomainList testee = new XMLDomainList(setUpDNSServer("hostname"));
@@ -144,7 +144,7 @@ public class XMLDomainListTest {
public void removeDomainShouldFailWhenAlreadyConfigured() throws Exception {
expectedException.expect(DomainListException.class);
- List<String> domains = new ArrayList<String>();
+ List<String> domains = new ArrayList<>();
domains.add("domain1");
XMLDomainList testee = new XMLDomainList(setUpDNSServer("localhost"));
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
index e0d71d4..4d3aba6 100644
--- a/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
+++ b/server/data/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
@@ -128,7 +128,7 @@ public class XMLRecipientRewriteTableTest extends AbstractRecipientRewriteTableT
}
private void removeMappingsFromConfig(String user, String domain, Mappings mappings) {
- List<String> stored = new ArrayList<String>();
+ List<String> stored = new ArrayList<>();
for (String c : defaultConfiguration.getStringArray("mapping")) {
String mapping = user + "@" + domain + "=" + mappings.serialize();
if (!c.equalsIgnoreCase(mapping)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
index c09dd6d..e1289b8 100644
--- a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
+++ b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java
@@ -141,7 +141,7 @@ public class HBaseDomainList extends AbstractDomainList {
*/
@Override
protected List<String> getDomainListInternal() throws DomainListException {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
HTableInterface table = null;
ResultScanner resultScanner = null;
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
index 008b8f9..387af04 100644
--- a/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
+++ b/server/data/data-hbase/src/main/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTable.java
@@ -130,7 +130,7 @@ public class HBaseRecipientRewriteTable extends AbstractRecipientRewriteTable {
for (KeyValue keyValue : keyValues) {
String email = Bytes.toString(keyValue.getRow());
if (map == null) {
- map = new HashMap<String, Mappings>();
+ map = new HashMap<>();
}
Mappings mappings =
MappingsImpl.from(
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java b/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
index b93b0e8..ac6f888 100644
--- a/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
+++ b/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java
@@ -186,7 +186,7 @@ public class HBaseUsersRepository extends AbstractUsersRepository {
*/
@Override
public Iterator<String> list() throws UsersRepositoryException {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
HTableInterface table = null;
ResultScanner resultScanner = null;
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
index ed25df5..dae56e9 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
@@ -119,7 +119,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
try {
Session session = login();
try {
- Collection<String> keys = new ArrayList<String>();
+ Collection<String> keys = new ArrayList<>();
QueryManager manager = session.getWorkspace().getQueryManager();
@SuppressWarnings("deprecation")
Query query = manager.createQuery("/jcr:root/" + MAIL_PATH + "//element(*,james:mail)", Query.XPATH);
@@ -435,7 +435,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
private Collection<MailAddress> getRecipients(Node node) throws MessagingException, RepositoryException {
try {
Value[] values = node.getProperty("james:recipients").getValues();
- Collection<MailAddress> recipients = new ArrayList<MailAddress>(values.length);
+ Collection<MailAddress> recipients = new ArrayList<>(values.length);
for (Value value : values) {
recipients.add(new MailAddress(value.getString()));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
index 665c02b..e45df56 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
@@ -328,7 +328,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
* @throws UsersRepositoryException
*/
public Iterator<String> list() throws UsersRepositoryException {
- final Collection<String> userNames = new ArrayList<String>();
+ final Collection<String> userNames = new ArrayList<>();
try {
final Session session = login();
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
index eea1d57..20065b1 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
@@ -172,7 +172,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
// Parse the DestinationURL for the name of the datasource,
// the table to use, and the (optional) repository Key.
// Split on "/", starting after "db://"
- List<String> urlParams = new ArrayList<String>();
+ List<String> urlParams = new ArrayList<>();
int start = 5;
if (destination.startsWith("dbfile")) {
// this is dbfile:// instead of db://
@@ -295,7 +295,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
}
// Build the statement parameters
- Map<String, String> sqlParameters = new HashMap<String, String>();
+ Map<String, String> sqlParameters = new HashMap<>();
if (tableName != null) {
sqlParameters.put("table", tableName);
}
@@ -493,7 +493,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
if (mc instanceof MailImpl) {
oos.writeObject(((MailImpl) mc).getAttributesRaw());
} else {
- HashMap<String, Serializable> temp = new HashMap<String, Serializable>();
+ HashMap<String, Serializable> temp = new HashMap<>();
for (Iterator<String> i = mc.getAttributeNames(); i.hasNext();) {
String hashKey = i.next();
temp.put(hashKey, mc.getAttribute(hashKey));
@@ -575,7 +575,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
if (mc instanceof MailImpl) {
oos.writeObject(((MailImpl) mc).getAttributesRaw());
} else {
- HashMap<String, Serializable> temp = new HashMap<String, Serializable>();
+ HashMap<String, Serializable> temp = new HashMap<>();
for (Iterator<String> i = mc.getAttributeNames(); i.hasNext();) {
String hashKey = i.next();
temp.put(hashKey, mc.getAttribute(hashKey));
@@ -706,7 +706,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
mc.setSender(new MailAddress(sender));
}
StringTokenizer st = new StringTokenizer(rsMessage.getString(4), "\r\n", false);
- Set<MailAddress> recipients = new HashSet<MailAddress>();
+ Set<MailAddress> recipients = new HashSet<>();
while (st.hasMoreTokens()) {
recipients.add(new MailAddress(st.nextToken()));
}
@@ -771,7 +771,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
listMessages.setString(1, repositoryName);
rsListMessages = listMessages.executeQuery();
- List<String> messageList = new ArrayList<String>();
+ List<String> messageList = new ArrayList<>();
while (rsListMessages.next() && !Thread.currentThread().isInterrupted()) {
messageList.add(rsListMessages.getString(1));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org