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 2020/04/24 02:59:47 UTC
[james-project] 12/17: [Refactoring] remove OptionalUtils.toSet
method that is used only once
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit eba026d9be795747bc46435ce3023500a246d1c1
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Apr 21 21:17:27 2020 +0200
[Refactoring] remove OptionalUtils.toSet method that is used only once
---
.../util/src/main/java/org/apache/james/util/OptionalUtils.java | 7 -------
.../org/apache/james/transport/util/SpecialAddressesUtils.java | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/server/container/util/src/main/java/org/apache/james/util/OptionalUtils.java b/server/container/util/src/main/java/org/apache/james/util/OptionalUtils.java
index 5224ac7..806ba70 100644
--- a/server/container/util/src/main/java/org/apache/james/util/OptionalUtils.java
+++ b/server/container/util/src/main/java/org/apache/james/util/OptionalUtils.java
@@ -24,8 +24,6 @@ import java.util.function.BiPredicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import com.google.common.collect.ImmutableSet;
-
public class OptionalUtils {
@FunctionalInterface
@@ -40,11 +38,6 @@ public class OptionalUtils {
return optional;
}
- public static <T> ImmutableSet<T> toSet(Optional<T> optional) {
- return optional.map(ImmutableSet::of)
- .orElse(ImmutableSet.of());
- }
-
@SafeVarargs
public static <T> Optional<T> or(Optional<T>... optionals) {
return orStream(Arrays.stream(optionals));
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java
index 9abfd7c..fd2d843 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java
@@ -33,12 +33,12 @@ import org.apache.james.transport.mailets.redirect.AddressExtractor;
import org.apache.james.transport.mailets.redirect.RedirectNotify;
import org.apache.james.transport.mailets.redirect.SpecialAddress;
import org.apache.james.transport.mailets.redirect.SpecialAddressKind;
-import org.apache.james.util.OptionalUtils;
import org.apache.mailet.Mail;
import org.apache.mailet.base.RFC2822Headers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.github.steveash.guavate.Guavate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -126,7 +126,7 @@ public class SpecialAddressesUtils {
}
private Set<MailAddress> getSender(Mail mail) {
- return OptionalUtils.toSet(mail.getMaybeSender().asOptional());
+ return mail.getMaybeSender().asStream().collect(Guavate.toImmutableSet());
}
private Set<MailAddress> getReplyTos(InternetAddress[] replyToArray) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org