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:46 UTC
[13/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/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
index 88fba47..7c29393 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
@@ -108,7 +108,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
}
// 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);
}
@@ -165,7 +165,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
// 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;
int end = destination.indexOf('/', start);
@@ -282,7 +282,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException {
Connection conn = null;
PreparedStatement mappingStmt = null;
- Map<String, Mappings> mapping = new HashMap<String, Mappings>();
+ Map<String, Mappings> mapping = new HashMap<>();
try {
conn = dataSource.getConnection();
mappingStmt = conn.prepareStatement(sqlQueries.getSqlString("selectAllMappings", true));
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
index f37fbf5..d0dfc9d 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
@@ -377,7 +377,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
destUrl += "/";
}
// Split on "/", starting after "db://"
- List<String> urlParams = new ArrayList<String>();
+ List<String> urlParams = new ArrayList<>();
int start = 5;
int end = destUrl.indexOf('/', start);
while (end > -1) {
@@ -387,7 +387,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
}
// Build SqlParameters and get datasource name from URL parameters
- m_sqlParameters = new HashMap<String, String>();
+ m_sqlParameters = new HashMap<>();
switch (urlParams.size()) {
case 3:
m_sqlParameters.put("key", urlParams.get(2));
@@ -427,7 +427,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
*/
protected List<String> listUserNames() throws UsersRepositoryException {
Collection<User> users = getAllUsers();
- List<String> userNames = new ArrayList<String>(users.size());
+ List<String> userNames = new ArrayList<>(users.size());
for (User user : users) {
userNames.add(user.getUserName());
}
@@ -451,7 +451,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
* @throws UsersRepositoryException
*/
private Collection<User> getAllUsers() throws UsersRepositoryException {
- List<User> userList = new ArrayList<User>(); // Build the users into
+ List<User> userList = new ArrayList<>(); // Build the users into
// this list.
Connection conn = null;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
index c6a3565..8d102eb 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
@@ -75,7 +75,7 @@ public class JPADomainList extends AbstractDomainList {
@SuppressWarnings("unchecked")
@Override
protected List<String> getDomainListInternal() throws DomainListException {
- List<String> domains = new ArrayList<String>();
+ List<String> domains = new ArrayList<>();
EntityManager entityManager = entityManagerFactory.createEntityManager();
final EntityTransaction transaction = entityManager.getTransaction();
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
index 936e804..9ed56e0 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
@@ -144,7 +144,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable {
protected Map<String, Mappings> getAllMappingsInternal() throws RecipientRewriteTableException {
EntityManager entityManager = entityManagerFactory.createEntityManager();
final EntityTransaction transaction = entityManager.getTransaction();
- Map<String, Mappings> mapping = new HashMap<String, Mappings>();
+ Map<String, Mappings> mapping = new HashMap<>();
try {
transaction.begin();
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java
index ac13d21..1c30138 100644
--- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java
+++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyLDAPGroupRestriction.java
@@ -18,13 +18,6 @@
****************************************************************/
package org.apache.james.user.ldap;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.ldap.LdapContext;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -32,6 +25,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.ldap.LdapContext;
+
+import org.apache.commons.configuration.HierarchicalConfiguration;
+
/**
* <p>
* Encapsulates the information required to restrict users to LDAP groups or
@@ -71,7 +72,7 @@ public class ReadOnlyLDAPGroupRestriction {
* element.
*/
public ReadOnlyLDAPGroupRestriction(HierarchicalConfiguration configuration) {
- groupDNs = new ArrayList<String>();
+ groupDNs = new ArrayList<>();
if (configuration != null) {
memberAttribute = configuration.getString("[@memberAttribute]");
@@ -113,7 +114,7 @@ public class ReadOnlyLDAPGroupRestriction {
* @throws NamingException Propagated from underlying LDAP communication layer.
*/
protected Map<String, Collection<String>> getGroupMembershipLists(LdapContext ldapContext) throws NamingException {
- Map<String, Collection<String>> result = new HashMap<String, Collection<String>>();
+ Map<String, Collection<String>> result = new HashMap<>();
for (String groupDN : groupDNs) {
result.put(groupDN, extractMembers(ldapContext.getAttributes(groupDN)));
@@ -134,7 +135,7 @@ public class ReadOnlyLDAPGroupRestriction {
* @throws NamingException Propagated from underlying LDAP communication layer.
*/
private Collection<String> extractMembers(Attributes groupAttributes) throws NamingException {
- Collection<String> result = new ArrayList<String>();
+ Collection<String> result = new ArrayList<>();
Attribute members = groupAttributes.get(memberAttribute);
NamingEnumeration<?> memberDNs = members.getAll();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
index f7f48ef..8991c41 100644
--- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
+++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java
@@ -523,7 +523,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
* Propagated from the LDAP communication layer.
*/
private Set<String> getAllUsersFromLDAP() throws NamingException {
- Set<String> result = new HashSet<String>();
+ Set<String> result = new HashSet<>();
SearchControls sc = new SearchControls();
sc.setSearchScope(SearchControls.SUBTREE_SCOPE);
@@ -554,7 +554,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
*/
private Collection<ReadOnlyLDAPUser> buildUserCollection(Collection<String> userDNs)
throws NamingException {
- List<ReadOnlyLDAPUser> results = new ArrayList<ReadOnlyLDAPUser>();
+ List<ReadOnlyLDAPUser> results = new ArrayList<>();
for (String userDN : userDNs) {
ReadOnlyLDAPUser user = buildUser(userDN);
@@ -736,7 +736,7 @@ public class ReadOnlyUsersLDAPRepository implements UsersRepository, Configurabl
if (restriction.isActivated()) {
Map<String, Collection<String>> groupMembershipList = restriction
.getGroupMembershipLists(ldapContext);
- validUserDNs = new ArrayList<String>();
+ validUserDNs = new ArrayList<>();
Iterator<String> userDNIterator = userDNs.iterator();
String userDN;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
index 8c0a6e1..35fdfdb 100644
--- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
+++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java
@@ -165,7 +165,7 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf
List<String> domains = getDomainListInternal();
// create mutable copy, some subclasses return ImmutableList
- ArrayList<String> mutableDomains = new ArrayList<String>(domains);
+ ArrayList<String> mutableDomains = new ArrayList<>(domains);
List<String> detectedDomains = detectDomains();
mutableDomains.addAll(detectedDomains);
mutableDomains.addAll(detectIps(mutableDomains));
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
index fc1c16a..9a0ab33 100644
--- a/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
+++ b/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
@@ -28,7 +28,7 @@ public class Lock {
/**
* An internal hash table of keys to locks
*/
- private final Hashtable<Object, Object> locks = new Hashtable<Object, Object>();
+ private final Hashtable<Object, Object> locks = new Hashtable<>();
/**
* Check to see if the object is locked
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
index bfa0e49..2bcf21e 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
@@ -53,7 +53,7 @@ public class MappingsImpl implements Mappings, Serializable {
}
private static ArrayList<String> mappingToCollection(String rawMapping) {
- ArrayList<String> map = new ArrayList<String>();
+ ArrayList<String> map = new ArrayList<>();
StringTokenizer tokenizer = new StringTokenizer(rawMapping, RecipientRewriteTableUtil.getSeparator(rawMapping));
while (tokenizer.hasMoreTokens()) {
final String raw = tokenizer.nextToken().trim();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java
index 8506664..91e5830 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java
@@ -75,7 +75,7 @@ public class RecipientRewriteTableUtil {
Matcher match = pattern.matcher(address.toString());
if (match.matches()) {
- Map<String, String> parameters = new HashMap<String, String>(match.groupCount());
+ Map<String, String> parameters = new HashMap<>(match.groupCount());
for (int i = 1; i < match.groupCount(); i++) {
parameters.put(Integer.toString(i), match.group(i));
}
@@ -196,7 +196,7 @@ public class RecipientRewriteTableUtil {
* @return Map which contains the mappings
*/
public static Map<String, String> getXMLMappings(String mapping) {
- Map<String, String> mappings = new HashMap<String, String>();
+ Map<String, String> mappings = new HashMap<>();
StringTokenizer tokenizer = new StringTokenizer(mapping, ",");
while (tokenizer.hasMoreTokens()) {
String mappingItem = tokenizer.nextToken();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
index a1b821d..697bdc7 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
@@ -182,7 +182,7 @@ public abstract class AbstractJamesUsersRepository extends AbstractUsersReposito
* @see org.apache.james.rrt.api.RecipientRewriteTable#getAllMappings()
*/
public Map<String, Mappings> getAllMappings() throws RecipientRewriteTableException {
- Map<String, Mappings> mappings = new HashMap<String, Mappings>();
+ Map<String, Mappings> mappings = new HashMap<>();
if (enableAliases || enableForwarding) {
try {
Iterator<String> users = list();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
index 7e55b6b..d9131cc 100644
--- a/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
+++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
@@ -18,19 +18,20 @@
****************************************************************/
package org.apache.james.user.lib;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.management.NotCompliantMBeanException;
+import javax.management.StandardMBean;
+
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.api.UsersRepositoryManagementMBean;
import org.apache.james.user.api.model.JamesUser;
import org.apache.james.user.api.model.User;
-import javax.inject.Inject;
-import javax.management.NotCompliantMBeanException;
-import javax.management.StandardMBean;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
@SuppressWarnings("deprecation")
public class UsersRepositoryManagement extends StandardMBean implements UsersRepositoryManagementMBean {
@@ -96,7 +97,7 @@ public class UsersRepositoryManagement extends StandardMBean implements UsersRep
@Override
public String[] listAllUsers() throws Exception {
- List<String> userNames = new ArrayList<String>();
+ List<String> userNames = new ArrayList<>();
try {
for (Iterator<String> it = usersRepository.list(); it.hasNext(); ) {
userNames.add(it.next());
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java b/server/data/data-library/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
index 195d68e..f85c2e3 100644
--- a/server/data/data-library/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
+++ b/server/data/data-library/src/test/java/org/apache/james/domainlist/api/mock/SimpleDomainList.java
@@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableList;
*/
public class SimpleDomainList implements DomainList {
- private final List<String> domains = new LinkedList<String>();
+ private final List<String> domains = new LinkedList<>();
@Override
public boolean containsDomain(String domain) throws DomainListException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
index 8619229..56e3979 100644
--- a/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
@@ -18,13 +18,21 @@
****************************************************************/
package org.apache.james.mailrepository;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.util.SharedByteArrayInputStream;
+
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
@@ -33,7 +41,6 @@ import org.apache.james.mailrepository.api.MailRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.junit.After;
-import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
@@ -56,7 +63,7 @@ public abstract class AbstractMailRepositoryTest {
MimeMessageInputStreamSource mmis = new MimeMessageInputStreamSource("test",
new SharedByteArrayInputStream((content + sep + body).getBytes()));
mimeMessage = new MimeMessageCopyOnWriteProxy(mmis);
- Collection<MailAddress> recipients = new ArrayList<MailAddress>();
+ Collection<MailAddress> recipients = new ArrayList<>();
recipients.add(new MailAddress("rec1", "domain.com"));
recipients.add(new MailAddress("rec2", "domain.com"));
mail = new MailImpl("mail1", new MailAddress("sender", "domain.com"), recipients, mimeMessage);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java b/server/data/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
index 89e6fde..707a2c9 100644
--- a/server/data/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
+++ b/server/data/data-library/src/test/java/org/apache/james/mailrepository/mock/MockMailRepositoryStore.java
@@ -29,7 +29,7 @@ import org.apache.james.mailrepository.api.MailRepositoryStore;
public class MockMailRepositoryStore implements MailRepositoryStore {
- final Map<String, MailRepository> m_storedObjectMap = new HashMap<String, MailRepository>();
+ final Map<String, MailRepository> m_storedObjectMap = new HashMap<>();
public void add(String url, MailRepository obj) {
m_storedObjectMap.put(url, obj);
@@ -47,7 +47,7 @@ public class MockMailRepositoryStore implements MailRepositoryStore {
@Override
public List<String> getUrls() {
- return new ArrayList<String>(m_storedObjectMap.keySet());
+ return new ArrayList<>(m_storedObjectMap.keySet());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
index 2007354..eb0b548 100644
--- a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
@@ -94,7 +94,7 @@ public abstract class AbstractUsersRepositoryTest {
@Test
public void countUsersShouldReturnNumberOfUsersWhenNotEmptyRepository() throws UsersRepositoryException {
//Given
- ArrayList<String> keys = new ArrayList<String>(3);
+ ArrayList<String> keys = new ArrayList<>(3);
keys.add(user1);
keys.add(user2);
keys.add(user3);
@@ -118,7 +118,7 @@ public abstract class AbstractUsersRepositoryTest {
@Test
public void listShouldReturnExactlyUsersInRepository() throws UsersRepositoryException {
//Given
- ArrayList<String> keys = new ArrayList<String>(3);
+ ArrayList<String> keys = new ArrayList<>(3);
keys.add(user1);
keys.add(user2);
keys.add(user3);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java
index e910028..e8d1433 100644
--- a/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java
+++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/mock/InMemoryUsersRepository.java
@@ -33,7 +33,7 @@ import org.apache.james.user.lib.model.DefaultUser;
@SuppressWarnings("deprecation")
public class InMemoryUsersRepository extends AbstractJamesUsersRepository {
- private final HashMap<String, User> m_users = new HashMap<String, User>();
+ private final HashMap<String, User> m_users = new HashMap<>();
/**
* force the repository to hold implementations of JamesUser interface,
* instead of User JamesUser is _not_ required as of the UsersRepository
@@ -104,7 +104,7 @@ public class InMemoryUsersRepository extends AbstractJamesUsersRepository {
protected List<String> listUserNames() {
Iterator<User> users = m_users.values().iterator();
- List<String> userNames = new LinkedList<String>();
+ List<String> userNames = new LinkedList<>();
while (users.hasNext()) {
User user = users.next();
userNames.add(user.getUserName());
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java b/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
index adfd48f..1f387d2 100644
--- a/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
+++ b/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
@@ -38,7 +38,7 @@ public class MemoryDomainList extends AbstractDomainList {
@Inject
public MemoryDomainList(DNSService dns) {
super(dns);
- this.domains = new ArrayList<String>();
+ this.domains = new ArrayList<>();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-memory/src/main/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/main/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTable.java b/server/data/data-memory/src/main/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTable.java
index d14e975..70890a3 100644
--- a/server/data/data-memory/src/main/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTable.java
+++ b/server/data/data-memory/src/main/java/org/apache/james/rrt/memory/MemoryRecipientRewriteTable.java
@@ -87,7 +87,7 @@ public class MemoryRecipientRewriteTable extends AbstractRecipientRewriteTable {
private final List<InMemoryMappingEntry> mappingEntries;
public MemoryRecipientRewriteTable() {
- mappingEntries = new ArrayList<InMemoryMappingEntry>();
+ mappingEntries = new ArrayList<>();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
index 613fe3b..97380fa 100644
--- a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
+++ b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java
@@ -48,7 +48,7 @@ public class MemoryUsersRepository extends AbstractUsersRepository {
private String algo;
private MemoryUsersRepository(boolean supportVirtualHosting) {
- this.userByName = new HashMap<String, User>();
+ this.userByName = new HashMap<>();
this.algo = "MD5";
this.supportVirtualHosting = supportVirtualHosting;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
index ff0cf09..d7e35b5 100644
--- a/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
+++ b/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
@@ -18,7 +18,18 @@
****************************************************************/
package org.apache.james.dnsservice.dnsjava;
-import com.google.common.collect.ImmutableList;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.dnsservice.api.DNSService;
@@ -46,17 +57,7 @@ import org.xbill.DNS.TXTRecord;
import org.xbill.DNS.TextParseException;
import org.xbill.DNS.Type;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import com.google.common.collect.ImmutableList;
/**
* Provides DNS client functionality to services running inside James
@@ -88,7 +89,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
/**
* The DNS servers to be used by this service
*/
- private final List<String> dnsServers = new ArrayList<String>();
+ private final List<String> dnsServers = new ArrayList<>();
private final MetricFactory metricFactory;
@@ -130,7 +131,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
boolean autodiscover = configuration.getBoolean("autodiscover", true);
- List<Name> sPaths = new ArrayList<Name>();
+ List<Name> sPaths = new ArrayList<>();
if (autodiscover) {
logger.info("Autodiscovery is enabled - trying to discover your system's DNS Servers");
String[] serversArray = ResolverConfig.getCurrentConfig().servers();
@@ -263,7 +264,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
*/
private List<String> findMXRecordsRaw(String hostname) throws TemporaryResolutionException {
Record answers[] = lookup(hostname, Type.MX, "MX");
- List<String> servers = new ArrayList<String>();
+ List<String> servers = new ArrayList<>();
if (answers == null) {
return servers;
}
@@ -280,7 +281,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
// now add the mx records to the right list and take care of shuffle
// mx records with the same priority
int currentPrio = -1;
- List<String> samePrio = new ArrayList<String>();
+ List<String> samePrio = new ArrayList<>();
for (int i = 0; i < mxAnswers.length; i++) {
boolean same = false;
boolean lastItem = i + 1 == mxAnswers.length;
@@ -319,7 +320,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
@Override
public Collection<String> findMXRecords(String hostname) throws TemporaryResolutionException {
TimeMetric timeMetric = metricFactory.timer("findMXRecords");
- List<String> servers = new ArrayList<String>();
+ List<String> servers = new ArrayList<>();
try {
servers = findMXRecordsRaw(hostname);
return Collections.unmodifiableCollection(servers);
@@ -493,7 +494,7 @@ public class DNSJavaService implements DNSService, DNSServiceMBean, LogEnabled,
@Override
public Collection<String> findTXTRecords(String hostname) {
TimeMetric timeMetric = metricFactory.timer("findTXTRecords");
- List<String> txtR = new ArrayList<String>();
+ List<String> txtR = new ArrayList<>();
Record[] records = lookupNoException(hostname, Type.TXT, "TXT");
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
----------------------------------------------------------------------
diff --git a/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java b/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
index fa59ed8..be24c10 100644
--- a/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
+++ b/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
@@ -18,21 +18,26 @@
****************************************************************/
package org.apache.james.dnsservice.dnsjava;
-import com.google.common.io.Resources;
-import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.james.metrics.api.NoopMetricFactory;
-import org.junit.After;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.Test;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.james.metrics.api.NoopMetricFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xbill.DNS.Cache;
@@ -42,11 +47,7 @@ import org.xbill.DNS.Name;
import org.xbill.DNS.Resolver;
import org.xbill.DNS.Zone;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
+import com.google.common.io.Resources;
public class DNSJavaServiceTest {
private static final Logger LOGGER = LoggerFactory.getLogger(DNSJavaServiceTest.class);
@@ -174,7 +175,7 @@ public class DNSJavaServiceTest {
dnsServer.setCache(mockedCache);
// a.setSearchPath(new String[] { "searchdomain.com." });
- ArrayList<String> records = new ArrayList<String>(dnsServer.findMXRecords("three-mx.bar."));
+ ArrayList<String> records = new ArrayList<>(dnsServer.findMXRecords("three-mx.bar."));
assertEquals(3, records.size());
assertTrue(records.contains("mx1.three-mx.bar."));
assertTrue(records.contains("mx2.three-mx.bar."));
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
index e4f8750..8662256 100644
--- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
+++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
@@ -42,8 +42,8 @@ public class MockMailetContext implements MailetContext {
private static final Logger LOGGER = LoggerFactory.getLogger(MockMailetContext.class);
- private final Map<String, Object> attributes = new HashMap<String, Object>();
- private final List<Mail> mails = new ArrayList<Mail>();
+ private final Map<String, Object> attributes = new HashMap<>();
+ private final List<Mail> mails = new ArrayList<>();
@Override
public void bounce(Mail arg0, String arg1) throws MessagingException {
@@ -76,7 +76,7 @@ public class MockMailetContext implements MailetContext {
*/
@Override
public Collection<String> getMailServers(String host) {
- List<String> servers = new ArrayList<String>();
+ List<String> servers = new ArrayList<>();
if ("localhost".equalsIgnoreCase(host)) {
servers.add("mx.localhost");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java
index d9920c1..6407eb8 100644
--- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java
+++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java
@@ -22,7 +22,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+
import javax.mail.MessagingException;
+
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
@@ -55,7 +57,7 @@ public class MockMatcher implements Matcher {
@Override
public Collection<MailAddress> match(Mail mail) throws MessagingException {
- List<MailAddress> match = new ArrayList<MailAddress>();
+ List<MailAddress> match = new ArrayList<>();
Iterator<MailAddress> rcpts = mail.getRecipients().iterator();
while (rcpts.hasNext() && match.size() < matchCount) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
index 4274727..f21ac95 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
@@ -69,7 +69,7 @@ public class JamesMailetContext implements MailetContext, LogEnabled, Configurab
/**
* A hash table of server attributes These are the MailetContext attributes
*/
- private final Hashtable<String, Object> attributes = new Hashtable<String, Object>();
+ private final Hashtable<String, Object> attributes = new Hashtable<>();
protected DNSService dns;
protected Logger log;
@@ -130,7 +130,7 @@ public class JamesMailetContext implements MailetContext, LogEnabled, Configurab
@Override
public Iterator<String> getAttributeNames() {
- Vector<String> names = new Vector<String>();
+ Vector<String> names = new Vector<>();
for (Enumeration<String> e = attributes.keys(); e.hasMoreElements(); ) {
names.add(e.nextElement());
}
@@ -223,7 +223,7 @@ public class JamesMailetContext implements MailetContext, LogEnabled, Configurab
MimeMessage reply = (MimeMessage) original.reply(false);
reply.setSubject("Re: " + original.getSubject());
reply.setSentDate(new Date());
- Collection<MailAddress> recipients = new HashSet<MailAddress>();
+ Collection<MailAddress> recipients = new HashSet<>();
recipients.add(mail.getSender());
InternetAddress addr[] = {new InternetAddress(mail.getSender().toString())};
reply.setRecipients(Message.RecipientType.TO, addr);
@@ -380,7 +380,7 @@ public class JamesMailetContext implements MailetContext, LogEnabled, Configurab
@Override
public void sendMail(MimeMessage message) throws MessagingException {
MailAddress sender = new MailAddress((InternetAddress) message.getFrom()[0]);
- Collection<MailAddress> recipients = new HashSet<MailAddress>();
+ Collection<MailAddress> recipients = new HashSet<>();
Address addresses[] = message.getAllRecipients();
if (addresses != null) {
for (Address address : addresses) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
index dfd82a1..b41bb53 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
@@ -19,16 +19,16 @@
package org.apache.james.mailetcontainer.impl;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.DefaultConfigurationBuilder;
-import org.apache.mailet.MailetConfig;
-import org.apache.mailet.MailetContext;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.mailet.MailetConfig;
+import org.apache.mailet.MailetContext;
+
/**
* Implements the configuration object for a Mailet.
*/
@@ -73,7 +73,7 @@ public class MailetConfigImpl implements MailetConfig {
*/
public Iterator<String> getInitParameterNames() {
Iterator<String> it = configuration.getKeys();
- List<String> params = new ArrayList<String>();
+ List<String> params = new ArrayList<>();
while (it.hasNext()) {
String param = it.next();
// Remove all attributes
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
index 1deac8a..77c3dcd 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java
@@ -81,13 +81,13 @@ public class MatcherSplitter {
@Property(METRIC_FACTORY) MetricFactory metricFactory,
@Body Mail mail) throws MessagingException {
Collection<MailAddress> matchedRcpts = null;
- Collection<MailAddress> origRcpts = new ArrayList<MailAddress>(mail.getRecipients());
+ Collection<MailAddress> origRcpts = new ArrayList<>(mail.getRecipients());
long start = System.currentTimeMillis();
MessagingException ex = null;
TimeMetric timeMetric = metricFactory.timer(matcher.getClass().getSimpleName());
try {
- List<Mail> mails = new ArrayList<Mail>();
+ List<Mail> mails = new ArrayList<>();
boolean fullMatch = false;
try {
@@ -97,7 +97,7 @@ public class MatcherSplitter {
if (matchedRcpts == null) {
// In case the matcher returned null, create an empty
// Collection
- matchedRcpts = new ArrayList<MailAddress>(0);
+ matchedRcpts = new ArrayList<>(0);
} else if (matchedRcpts != mail.getRecipients()) {
// Make sure all the objects are MailAddress objects
ProcessorUtil.verifyMailAddresses(matchedRcpts);
@@ -113,7 +113,7 @@ public class MatcherSplitter {
if (onMatchException.compareTo("nomatch") == 0) {
// In case the matcher returned null, create an empty
// Collection
- matchedRcpts = new ArrayList<MailAddress>(0);
+ matchedRcpts = new ArrayList<>(0);
} else if (onMatchException.compareTo("matchall") == 0) {
matchedRcpts = mail.getRecipients();
// no need to verify addresses
@@ -124,7 +124,7 @@ public class MatcherSplitter {
// check if the matcher matched
if (matchedRcpts != null && !matchedRcpts.isEmpty()) {
- List<MailAddress> rcpts = new ArrayList<MailAddress>(mail.getRecipients());
+ List<MailAddress> rcpts = new ArrayList<>(mail.getRecipients());
for (MailAddress matchedRcpt : matchedRcpts) {
// loop through the recipients and remove the recipients
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
index b844867..f4839d1 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
@@ -43,8 +43,8 @@ public class JMXStateCompositeProcessorListener implements CompositeProcessorLis
private final AbstractStateCompositeProcessor mList;
private final MBeanServer mbeanserver;
- private final List<ObjectName> mbeans = new ArrayList<ObjectName>();
- private final Map<MailProcessor, MailProcessorManagement> mMap = new HashMap<MailProcessor, MailProcessorManagement>();
+ private final List<ObjectName> mbeans = new ArrayList<>();
+ private final Map<MailProcessor, MailProcessorManagement> mMap = new HashMap<>();
public JMXStateCompositeProcessorListener(AbstractStateCompositeProcessor mList) throws JMException {
this.mList = mList;
@@ -57,7 +57,7 @@ public class JMXStateCompositeProcessorListener implements CompositeProcessorLis
* Unregister all JMX MBeans
*/
private void unregisterMBeans() {
- List<ObjectName> unregistered = new ArrayList<ObjectName>();
+ List<ObjectName> unregistered = new ArrayList<>();
for (ObjectName name : mbeans) {
try {
mbeanserver.unregisterMBean(name);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
index 1a826cf..f304cbd 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
@@ -48,9 +48,9 @@ public class JMXStateMailetProcessorListener implements MailetProcessorListener,
private final AbstractStateMailetProcessor processor;
private final MBeanServer mbeanserver;
- private final List<ObjectName> mbeans = new ArrayList<ObjectName>();
- private final Map<Mailet, MailetManagement> mailetMap = new HashMap<Mailet, MailetManagement>();
- private final Map<Matcher, MatcherManagement> matcherMap = new HashMap<Matcher, MatcherManagement>();
+ private final List<ObjectName> mbeans = new ArrayList<>();
+ private final Map<Mailet, MailetManagement> mailetMap = new HashMap<>();
+ private final Map<Matcher, MatcherManagement> matcherMap = new HashMap<>();
private final String name;
@@ -177,7 +177,7 @@ public class JMXStateMailetProcessorListener implements MailetProcessorListener,
* Unregister all JMX MBeans
*/
private void unregisterMBeans() {
- List<ObjectName> unregistered = new ArrayList<ObjectName>();
+ List<ObjectName> unregistered = new ArrayList<>();
for (ObjectName name : mbeans) {
try {
mbeanserver.unregisterMBean(name);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
index e379732..a9fc452 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
@@ -75,7 +75,7 @@ public final class MailetManagement extends StandardMBean implements MailetManag
* @see org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetParameters()
*/
public String[] getMailetParameters() {
- List<String> parameterList = new ArrayList<String>();
+ List<String> parameterList = new ArrayList<>();
Iterator<String> iterator = config.getInitParameterNames();
while (iterator.hasNext()) {
String name = iterator.next();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
index 7158ef2..4fe2acf 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java
@@ -52,6 +52,6 @@ public abstract class GenericCompositeMatcher extends GenericMatcher implements
}
// the collection used to store the child-matchers
- private final Collection<Matcher> matchers = new ArrayList<Matcher>();
+ private final Collection<Matcher> matchers = new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
index e7a8baf..8ce5a23 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java
@@ -43,7 +43,7 @@ import com.google.common.collect.Lists;
public class Not extends GenericCompositeMatcher {
public Collection<MailAddress> match(Mail mail) throws MessagingException {
- Collection<MailAddress> finalResult = Optional.fromNullable(Lists.newArrayList(mail.getRecipients())).or(new ArrayList<MailAddress>());
+ Collection<MailAddress> finalResult = Optional.fromNullable(Lists.newArrayList(mail.getRecipients())).or(new ArrayList<>());
for (Matcher matcher : getMatchers()) {
Collection<MailAddress> matcherResult = matcher.match(mail);
if (matcherResult != null) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
index 6ba1e85..47bb7c6 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java
@@ -38,7 +38,7 @@ import org.apache.mailet.Matcher;
public class Or extends GenericCompositeMatcher {
public Collection<MailAddress> match(Mail mail) throws MessagingException {
- HashSet<MailAddress> result = new HashSet<MailAddress>();
+ HashSet<MailAddress> result = new HashSet<>();
for (Matcher matcher : getMatchers()) {
Collection<MailAddress> matchResult = matcher.match(mail);
if (matchResult != null) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
index 963273f..87bd63e 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java
@@ -19,12 +19,13 @@
package org.apache.james.mailetcontainer.impl.matchers;
-import java.util.Collection;
import java.util.ArrayList;
+import java.util.Collection;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.Mail;
import javax.mail.MessagingException;
+
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
import org.apache.mailet.Matcher;
import com.google.common.base.Optional;
@@ -45,7 +46,7 @@ public class Xor extends GenericCompositeMatcher {
Collection<MailAddress> finalResult = null;
boolean first = true;
for (Matcher matcher: getMatchers()) {
- Collection<MailAddress> matchedAddresses = Optional.fromNullable(matcher.match(mail)).or(new ArrayList<MailAddress>());
+ Collection<MailAddress> matchedAddresses = Optional.fromNullable(matcher.match(mail)).or(new ArrayList<>());
if (first) {
finalResult = matchedAddresses;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
index 330b38b..b68e93f 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
@@ -45,7 +45,7 @@ import org.slf4j.Logger;
public abstract class AbstractStateCompositeProcessor implements MailProcessor, Configurable, LogEnabled {
private final List<CompositeProcessorListener> listeners = Collections.synchronizedList(new ArrayList<CompositeProcessorListener>());
- private final Map<String, MailProcessor> processors = new HashMap<String, MailProcessor>();
+ private final Map<String, MailProcessor> processors = new HashMap<>();
protected Logger logger;
protected HierarchicalConfiguration config;
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index 7912568..e3070ac 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -71,7 +71,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
private Logger logger;
private HierarchicalConfiguration config;
private MailetLoader mailetLoader;
- private final List<MatcherMailetPair> pairs = new ArrayList<MatcherMailetPair>();
+ private final List<MatcherMailetPair> pairs = new ArrayList<>();
private String state;
public void setMatcherLoader(MatcherLoader matcherLoader) {
@@ -260,7 +260,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
* @throws NotCompliantMBeanException
*/
private List<Matcher> loadCompositeMatchers(String state, Map<String, Matcher> compMap, List<HierarchicalConfiguration> compMatcherConfs) throws ConfigurationException, MessagingException {
- List<Matcher> matchers = new ArrayList<Matcher>();
+ List<Matcher> matchers = new ArrayList<>();
for (HierarchicalConfiguration c : compMatcherConfs) {
String compName = c.getString("[@name]", null);
@@ -310,7 +310,7 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
private void parseConfiguration() throws MessagingException, ConfigurationException {
// load composite matchers if there are any
- Map<String, Matcher> compositeMatchers = new HashMap<String, Matcher>();
+ Map<String, Matcher> compositeMatchers = new HashMap<>();
loadCompositeMatchers(getState(), compositeMatchers, config.configurationsAt("matcher"));
final List<HierarchicalConfiguration> mailetConfs = config.configurationsAt("mailet");
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java
index dc396be..b5c60b2 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/MailetConfigImplTest.java
@@ -18,17 +18,18 @@
****************************************************************/
package org.apache.james.mailetcontainer.impl;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.DefaultConfigurationBuilder;
import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
public class MailetConfigImplTest {
private DefaultConfigurationBuilder builder;
@@ -86,7 +87,7 @@ public class MailetConfigImplTest {
assertEquals("whatever", param);
assertEquals(" some text ", config.getInitParameter(param));
- List<String> params = new ArrayList<String>();
+ List<String> params = new ArrayList<>();
Iterator<String> iter = config.getInitParameterNames();
while (iter.hasNext()) {
params.add(iter.next());
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
index 76d56c7..b89cc39 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java
@@ -80,12 +80,12 @@ public abstract class AbstractRecipientRewriteTable extends GenericMailet {
return;
}
- Collection<MailAddress> recipientsToRemove = new HashSet<MailAddress>();
- Collection<MailAddress> recipientsToAddLocal = new ArrayList<MailAddress>();
- Collection<MailAddress> recipientsToAddForward = new ArrayList<MailAddress>();
+ Collection<MailAddress> recipientsToRemove = new HashSet<>();
+ Collection<MailAddress> recipientsToAddLocal = new ArrayList<>();
+ Collection<MailAddress> recipientsToAddForward = new ArrayList<>();
Collection<MailAddress> recipients = mail.getRecipients();
- Map<MailAddress, String> recipientsMap = new HashMap<MailAddress, String>(recipients.size());
+ Map<MailAddress, String> recipientsMap = new HashMap<>(recipients.size());
for (MailAddress address : recipients) {
// Assume all addresses are non-virtual at start
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
index 9fd9433..57592e1 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/FromRepository.java
@@ -95,7 +95,7 @@ public class FromRepository extends GenericMailet {
*/
public void service(Mail trigger) throws MessagingException {
trigger.setState(Mail.GHOST);
- Collection<String> processed = new ArrayList<String>();
+ Collection<String> processed = new ArrayList<>();
Iterator<String> list = repository.list();
while (list.hasNext()) {
String key = (String) list.next();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
index cb69606..df89bd5 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java
@@ -123,8 +123,8 @@ public class JDBCAlias extends GenericMailet {
ResultSet mappingRS = null;
Collection<MailAddress> recipients = mail.getRecipients();
- Collection<MailAddress> recipientsToRemove = new Vector<MailAddress>();
- Collection<MailAddress> recipientsToAdd = new Vector<MailAddress>();
+ Collection<MailAddress> recipientsToRemove = new Vector<>();
+ Collection<MailAddress> recipientsToAdd = new Vector<>();
try {
conn = datasource.getConnection();
mappingStmt = conn.prepareStatement(query);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
index 2af44bd..2a16dfa 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java
@@ -53,9 +53,9 @@ import org.apache.james.util.sql.SqlResources;
import org.apache.mailet.Experimental;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.apache.mailet.base.DateFormats;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.base.RFC2822Headers;
-import org.apache.mailet.base.DateFormats;
/**
* <p>
@@ -157,7 +157,7 @@ public class WhiteListManager extends GenericMailet {
private final SqlResources sqlQueries = new SqlResources();
/** Holds value of property sqlParameters. */
- private final Map<String, String> sqlParameters = new HashMap<String, String>();
+ private final Map<String, String> sqlParameters = new HashMap<>();
@Inject
public void setDataSource(DataSource datasource) {
@@ -698,7 +698,7 @@ public class WhiteListManager extends GenericMailet {
reply.setHeader(RFC2822Headers.CONTENT_TYPE, multipart.getContentType());
// Create the list of recipients in our MailAddress format
- Set<MailAddress> recipients = new HashSet<MailAddress>();
+ Set<MailAddress> recipients = new HashSet<>();
recipients.add(senderMailAddress);
// Set additional headers
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
index a599c21..1afe6be 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java
@@ -79,7 +79,7 @@ public class XMLRecipientRewriteTable extends AbstractRecipientRewriteTable {
/**
* Holds the configured mappings
*/
- private Map<String, String> mappings = new HashMap<String, String>();
+ private Map<String, String> mappings = new HashMap<>();
/**
* Initialize the mailet
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
index fedd867..7125cb1 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
@@ -116,7 +116,7 @@ public class MailDispatcher {
}
private Collection<MailAddress> deliver(Mail mail, MimeMessage message) {
- Collection<MailAddress> errors = new Vector<MailAddress>();
+ Collection<MailAddress> errors = new Vector<>();
for (MailAddress recipient : mail.getRecipients()) {
try {
Map<String, List<String>> savedHeaders = saveHeaders(mail, recipient);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java
index a270f36..4621ecb 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java
@@ -19,6 +19,11 @@
package org.apache.james.transport.mailets.jsieve;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.mail.MessagingException;
+
import org.apache.jsieve.mail.Action;
import org.apache.jsieve.mail.ActionDiscard;
import org.apache.jsieve.mail.ActionFileInto;
@@ -28,10 +33,6 @@ import org.apache.jsieve.mail.ActionReject;
import org.apache.jsieve.mail.optional.ActionVacation;
import org.apache.mailet.Mail;
-import javax.mail.MessagingException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
/**
* Dynamically dispatches an Action depending on the type of Action received at runtime.
* <h4>Thread Safety</h4>
@@ -84,7 +85,7 @@ public class ActionDispatcher {
* @return Map
*/
private ConcurrentMap<Class<?>, MailAction> defaultMethodMap() {
- final ConcurrentMap<Class<?>, MailAction> actionMap = new ConcurrentHashMap<Class<?>, MailAction>(4);
+ final ConcurrentMap<Class<?>, MailAction> actionMap = new ConcurrentHashMap<>(4);
actionMap.put(ActionFileInto.class, new FileIntoAction());
actionMap.put(ActionKeep.class, new KeepAction());
actionMap.put(ActionRedirect.class, new RedirectAction());
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
index e8931af..127125c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
@@ -57,7 +57,7 @@ public class RedirectAction implements MailAction {
public void execute(ActionRedirect anAction, Mail aMail, ActionContext context) throws MessagingException
{
ActionUtils.detectAndHandleLocalLooping(aMail, context, "redirect");
- Collection<MailAddress> recipients = new ArrayList<MailAddress>(1);
+ Collection<MailAddress> recipients = new ArrayList<>(1);
recipients.add(new MailAddress(new InternetAddress(anAction.getAddress())));
MailAddress sender = aMail.getSender();
context.post(sender, recipients, aMail.getMessage());
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
index ecd6f9a..94c3666 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
@@ -126,7 +126,7 @@ public class RejectAction implements MailAction {
Address[] recipientAddresses = reply.getAllRecipients();
if (null != recipientAddresses)
{
- Collection<MailAddress> recipients = new ArrayList<MailAddress>(recipientAddresses.length);
+ Collection<MailAddress> recipients = new ArrayList<>(recipientAddresses.length);
for (Address recipientAddress : recipientAddresses) {
recipients.add(new MailAddress(
(InternetAddress) recipientAddress));
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
index 1e8b56f..a8a4fd8 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
@@ -153,7 +153,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
*/
protected List<Action> computeActions()
{
- return new ArrayList<Action>();
+ return new ArrayList<>();
}
/**
* Returns the List of actions.
@@ -217,7 +217,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
try
{
String[] headers = getMessage().getHeader(name);
- return (headers == null ? new ArrayList<String>(0) : Arrays.asList(headers));
+ return (headers == null ? new ArrayList<>(0) : Arrays.asList(headers));
}
catch (MessagingException ex)
{
@@ -230,14 +230,14 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
*/
public List<String> getHeaderNames() throws SieveMailException
{
- Set<String> headerNames = new HashSet<String>();
+ Set<String> headerNames = new HashSet<>();
try
{
Enumeration<?> allHeaders = getMessage().getAllHeaders();
while (allHeaders.hasMoreElements()) {
headerNames.add(((Header) allHeaders.nextElement()).getName());
}
- return new ArrayList<String>(headerNames);
+ return new ArrayList<>(headerNames);
}
catch (MessagingException ex)
{
@@ -275,7 +275,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
*/
protected Map<String, String> getEnvelopes()
{
- Map<String, String> envelopes = new HashMap<String, String>(2);
+ Map<String, String> envelopes = new HashMap<>(2);
if (null != getEnvelopeFrom())
envelopes.put("From", getEnvelopeFrom());
if (null != getEnvelopeTo())
@@ -287,7 +287,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
*/
public List<String> getEnvelope(String name) throws SieveMailException
{
- List<String> values = new ArrayList<String>(1);
+ List<String> values = new ArrayList<>(1);
String value = getEnvelopes().get(name);
if (null != value)
values.add(value);
@@ -299,7 +299,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
*/
public List<String> getEnvelopeNames() throws SieveMailException
{
- return new ArrayList<String>(getEnvelopes().keySet());
+ return new ArrayList<>(getEnvelopes().keySet());
}
/**
@@ -307,7 +307,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
*/
public List<String> getMatchingEnvelope(String name) throws SieveMailException
{
- final List<String> matchedEnvelopeValues = new ArrayList<String>(32);
+ final List<String> matchedEnvelopeValues = new ArrayList<>(32);
for (String envelopeName: getEnvelopeNames()) {
if (envelopeName.trim().equalsIgnoreCase(name))
matchedEnvelopeValues.addAll(getEnvelope(envelopeName));
@@ -413,7 +413,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
public Address[] parseAddresses(String arg) throws SieveMailException, InternetAddressException {
try {
List<String> headerValues = getHeader(arg);
- List<MailboxList> mailboxes = new ArrayList<MailboxList>();
+ List<MailboxList> mailboxes = new ArrayList<>();
int size = 0;
for(String headerValue : headerValues) {
MailboxList mailboxList = new AddressList(DefaultAddressParser.DEFAULT.parseAddressList(headerValue), true).flatten();
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
index f23d7d1..f429b15 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java
@@ -62,7 +62,7 @@ public abstract class AbstractSQLWhitelistMatcher extends GenericMatcher {
protected JDBCUtil jdbcUtil;
/** Holds value of property sqlParameters. */
- private final Map<String, String> sqlParameters = new HashMap<String, String>();
+ private final Map<String, String> sqlParameters = new HashMap<>();
@Inject
@@ -151,7 +151,7 @@ public abstract class AbstractSQLWhitelistMatcher extends GenericMatcher {
Collection<MailAddress> recipients = mail.getRecipients();
- Collection<MailAddress> inWhiteList = new java.util.HashSet<MailAddress>();
+ Collection<MailAddress> inWhiteList = new java.util.HashSet<>();
for (MailAddress recipientMailAddress : recipients) {
String recipientUser = recipientMailAddress.getLocalPart().toLowerCase(Locale.US);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java
index c8216b4..d63b015 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java
@@ -19,6 +19,13 @@
package org.apache.james.transport.matchers;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.mail.MessagingException;
+
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.exception.MailboxException;
@@ -34,12 +41,6 @@ import org.apache.mailet.base.GenericMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.inject.Inject;
-import javax.mail.MessagingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
/**
* This matcher will check if the incoming email will make recipients exceed their quotas.
*
@@ -75,7 +76,7 @@ public class IsOverQuota extends GenericMatcher {
@Override
public Collection<MailAddress> match(Mail mail) throws MessagingException {
try {
- List<MailAddress> result = new ArrayList<MailAddress>();
+ List<MailAddress> result = new ArrayList<>();
for (MailAddress mailAddress : mail.getRecipients()) {
String userName = usersRepository.getUser(mailAddress);
MailboxSession mailboxSession = mailboxManager.createSystemSession(userName, LOGGER);
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
index e7b98ac..ef64e21 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
@@ -93,7 +93,7 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
conn = datasource.getConnection();
}
- List<String> nets = new ArrayList<String>();
+ List<String> nets = new ArrayList<>();
try {
if (selectStmt == null) {
selectStmt = conn.prepareStatement(selectNetworks);
@@ -117,7 +117,7 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
selectStmt.setString(1, "*");
selectStmt.setString(2, recipientHost);
selectRS = selectStmt.executeQuery();
- nets = new ArrayList<String>();
+ nets = new ArrayList<>();
while (selectRS.next()) {
nets.add(selectRS.getString(1));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/03b574c9/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java
index 36d264d..9b55dd1 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecordingMailContext.java
@@ -41,7 +41,7 @@ import org.slf4j.Logger;
@SuppressWarnings("deprecation")
public class RecordingMailContext implements MailetContext {
- private final List<SendMailEvent> sendmails = new LinkedList<SendMailEvent>();
+ private final List<SendMailEvent> sendmails = new LinkedList<>();
private final FakeMailContext context;
public RecordingMailContext() {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org