JAMES-2127 Protocol: Stream instead of FluentIterable.from
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a93201e6 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a93201e6 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a93201e6 Branch: refs/heads/master Commit: a93201e6b6566c0ddbf42eeb9401900c66a04edd Parents: 0c2ae45 Author: quynhn <qngu...@linagora.com> Authored: Fri Aug 25 16:16:30 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Thu Aug 31 08:24:02 2017 +0700 ---------------------------------------------------------------------- .../apache/james/imap/api/ImapConfiguration.java | 8 ++++---- .../imap/processor/GetAnnotationProcessor.java | 16 +++++++++------- .../smtp/AllButStartTlsDelimiterChannelHandler.java | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a93201e6/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java index 48295e4..792b579 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/api/ImapConfiguration.java @@ -24,10 +24,10 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang.StringUtils; +import com.github.steveash.guavate.Guavate; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; public class ImapConfiguration { @@ -97,10 +97,10 @@ public class ImapConfiguration { } public ImapConfiguration build() { - ImmutableSet<String> normalizeDisableCaps = FluentIterable.from(disabledCaps) + ImmutableSet<String> normalizeDisableCaps = disabledCaps.stream() .filter(Builder::noBlankString) - .transform(StringUtils::normalizeSpace) - .toSet(); + .map(StringUtils::normalizeSpace) + .collect(Guavate.toImmutableSet()); return new ImapConfiguration( enableIdle.orElse(DEFAULT_ENABLE_IDLE), idleTimeInterval.orElse(DEFAULT_HEARTBEAT_INTERVAL_IN_SECONDS), http://git-wip-us.apache.org/repos/asf/james-project/blob/a93201e6/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java index d194632..99f58d4 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/GetAnnotationProcessor.java @@ -24,6 +24,7 @@ import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.Set; +import java.util.function.Predicate; import org.apache.james.imap.api.ImapCommand; import org.apache.james.imap.api.ImapConstants; @@ -45,12 +46,11 @@ import org.apache.james.mailbox.model.MailboxAnnotationKey; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.util.MDCBuilder; +import org.apache.commons.lang.NotImplementedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.commons.lang.NotImplementedException; -import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; +import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedSet; @@ -113,7 +113,9 @@ public class GetAnnotationProcessor extends AbstractMailboxProcessor<GetAnnotati .map(maxSizeInput -> (annotation.size() <= maxSizeInput)) .orElse(true); - return FluentIterable.from(mailboxAnnotations).filter(lowerPredicate).toList(); + return mailboxAnnotations.stream() + .filter(lowerPredicate) + .collect(Guavate.toImmutableList()); } private List<MailboxAnnotation> getMailboxAnnotations(ImapSession session, Set<MailboxAnnotationKey> keys, GetAnnotationRequest.Depth depth, MailboxPath mailboxPath) throws MailboxException { @@ -141,10 +143,10 @@ public class GetAnnotationProcessor extends AbstractMailboxProcessor<GetAnnotati private Optional<Integer> getMaxSizeOfOversizedItems(List<MailboxAnnotation> mailboxAnnotations, final Integer maxsize) { Predicate<MailboxAnnotation> filterOverSizedAnnotation = annotation -> annotation.size() > maxsize; - ImmutableSortedSet<Integer> overLimitSizes = FluentIterable.from(mailboxAnnotations) + ImmutableSortedSet<Integer> overLimitSizes = mailboxAnnotations.stream() .filter(filterOverSizedAnnotation) - .transform(MailboxAnnotation::size) - .toSortedSet(Comparator.reverseOrder()); + .map(MailboxAnnotation::size) + .collect(Guavate.toImmutableSortedSet(Comparator.reverseOrder())); if (overLimitSizes.isEmpty()) { return Optional.empty(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a93201e6/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java index 268a9c1..b2439c5 100644 --- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java +++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java @@ -31,7 +31,7 @@ import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder; import com.google.common.base.CharMatcher; import com.google.common.base.Charsets; import com.google.common.base.Splitter; -import com.google.common.collect.FluentIterable; + public class AllButStartTlsDelimiterChannelHandler extends DelimiterBasedFrameDecoder { @@ -68,12 +68,12 @@ public class AllButStartTlsDelimiterChannelHandler extends DelimiterBasedFrameDe } private boolean multiPartsAndOneStartTls(List<String> parts) { - return FluentIterable.from(parts) + return parts.stream() .anyMatch(line -> line.startsWith(STARTTLS)) && parts.size() > 1; } private boolean hasInvalidStartTlsPart(List<String> parts) { - return FluentIterable.from(parts) + return parts.stream() .anyMatch(line -> line.startsWith(STARTTLS) && !line.endsWith(STARTTLS)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
