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/21 10:34:29 UTC
[3/5] james-project git commit: JAMES-2107 Use guava instead of
unmodifiable collections
http://git-wip-us.apache.org/repos/asf/james-project/blob/4964e3d9/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
index fc0272c..5fb3964 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
@@ -19,7 +19,6 @@
package org.apache.james.protocols.smtp.core.esmtp;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -35,6 +34,9 @@ import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.SMTPStartTlsResponse;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
/**
* Handles STARTTLS command
*/
@@ -43,8 +45,8 @@ public class StartTlsCmdHandler implements CommandHandler<SMTPSession>, EhloExte
* The name of the command handled by the command handler
*/
private final static String COMMAND_NAME = "STARTTLS";
- private final static Collection<String> COMMANDS = Collections.unmodifiableCollection(Arrays.asList(COMMAND_NAME));
- private final static List<String> FEATURES = Collections.unmodifiableList(Arrays.asList(COMMAND_NAME));
+ private final static Collection<String> COMMANDS = ImmutableSet.of(COMMAND_NAME);
+ private final static List<String> FEATURES = ImmutableList.of(COMMAND_NAME);
private static final Response TLS_ALREADY_ACTIVE = new SMTPResponse("500", DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD) + " TLS already active RFC2487 5.2").immutable();
private static final Response READY_FOR_STARTTLS = new SMTPStartTlsResponse("220", DSNStatus.getStatus(DSNStatus.SUCCESS, DSNStatus.UNDEFINED_STATUS) + " Ready to start TLS").immutable();
http://git-wip-us.apache.org/repos/asf/james-project/blob/4964e3d9/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
index be49842..26f7c17 100644
--- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
+++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
@@ -19,7 +19,6 @@
package org.apache.james.user.jpa;
-import java.util.Collections;
import java.util.Iterator;
import java.util.Locale;
@@ -39,6 +38,8 @@ import org.apache.james.user.api.model.User;
import org.apache.james.user.jpa.model.JPAUser;
import org.apache.james.user.lib.AbstractUsersRepository;
+import com.google.common.collect.ImmutableList;
+
/**
* JPA based UserRepository
*/
@@ -241,7 +242,7 @@ public class JPAUsersRepository extends AbstractUsersRepository {
EntityManager entityManager = entityManagerFactory.createEntityManager();
try {
- return Collections.unmodifiableList(entityManager.createNamedQuery("listUserNames").getResultList()).iterator();
+ return ImmutableList.copyOf(entityManager.createNamedQuery("listUserNames").getResultList()).iterator();
} catch (PersistenceException e) {
getLogger().debug("Failed to find user", e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/4964e3d9/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 f21ac95..1970a29 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
@@ -19,9 +19,7 @@
package org.apache.james.mailetcontainer.impl;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
@@ -63,6 +61,8 @@ import org.apache.mailet.MailetContext;
import org.apache.mailet.base.RFC2822Headers;
import org.slf4j.Logger;
+import com.google.common.collect.ImmutableSet;
+
@SuppressWarnings("deprecation")
public class JamesMailetContext implements MailetContext, LogEnabled, Configurable {
@@ -109,7 +109,7 @@ public class JamesMailetContext implements MailetContext, LogEnabled, Configurab
} catch (TemporaryResolutionException e) {
// TODO: We only do this to not break backward compatiblity. Should
// fixed later
- return Collections.unmodifiableCollection(new ArrayList<String>(0));
+ return ImmutableSet.of();
}
}
@@ -306,7 +306,7 @@ public class JamesMailetContext implements MailetContext, LogEnabled, Configurab
} catch (TemporaryResolutionException e) {
// TODO: We only do this to not break backward compatiblity. Should
// fixed later
- return Collections.unmodifiableCollection(new ArrayList<HostAddress>(0)).iterator();
+ return ImmutableSet.<HostAddress>of().iterator();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4964e3d9/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
index c4cf74b..907e9e7 100644
--- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
+++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/mailbox/MailboxAdapter.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -42,6 +41,7 @@ import org.apache.james.protocols.pop3.mailbox.Mailbox;
import org.apache.james.protocols.pop3.mailbox.MessageMetaData;
import com.github.steveash.guavate.Guavate;
+import com.google.common.collect.ImmutableList;
public class MailboxAdapter implements Mailbox {
@@ -160,7 +160,7 @@ public class MailboxAdapter implements Mailbox {
MessageMetaData metaData = new MessageMetaData(String.valueOf(result.getUid().asLong()), result.getSize());
mList.add(metaData);
}
- return Collections.unmodifiableList(mList);
+ return ImmutableList.copyOf(mList);
} catch (MailboxException e) {
throw new IOException("Unable to retrieve messages", e);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org