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 ad...@apache.org on 2018/08/30 13:15:56 UTC
[14/26] james-project git commit: JAMES-2529 Replace
OptionalUtils::ofNullableToStream by StreamUtils::ofNullables
JAMES-2529 Replace OptionalUtils::ofNullableToStream by StreamUtils::ofNullables
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/aee5424b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/aee5424b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/aee5424b
Branch: refs/heads/master
Commit: aee5424b30de411ab0e6cf467d63cf49bc4959ae
Parents: d0ee968
Author: Benoit Tellier <bt...@linagora.com>
Authored: Thu Aug 30 14:57:19 2018 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Thu Aug 30 15:07:03 2018 +0200
----------------------------------------------------------------------
.../main/java/org/apache/james/util/OptionalUtils.java | 4 ----
.../main/java/org/apache/james/util/StreamUtils.java | 4 ++++
.../java/org/apache/james/util/OptionalUtilsTest.java | 13 -------------
.../james/transport/matchers/dlp/DlpDomainRules.java | 3 ++-
.../apache/james/jmap/mailet/filter/MailMatcher.java | 3 +--
5 files changed, 7 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/aee5424b/server/container/util/src/main/java/org/apache/james/util/OptionalUtils.java
----------------------------------------------------------------------
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 8f64e38..4a3449c 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
@@ -42,10 +42,6 @@ public class OptionalUtils {
.orElse(Stream.of());
}
- public static <T> Stream<T> ofNullableToStream(T maybeNull) {
- return toStream(Optional.ofNullable(maybeNull));
- }
-
@SafeVarargs
public static <T> Optional<T> or(Optional<T>... optionals) {
return orStream(Arrays.stream(optionals));
http://git-wip-us.apache.org/repos/asf/james-project/blob/aee5424b/server/container/util/src/main/java/org/apache/james/util/StreamUtils.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/main/java/org/apache/james/util/StreamUtils.java b/server/container/util/src/main/java/org/apache/james/util/StreamUtils.java
index e8a71bd..4f3df3f 100644
--- a/server/container/util/src/main/java/org/apache/james/util/StreamUtils.java
+++ b/server/container/util/src/main/java/org/apache/james/util/StreamUtils.java
@@ -27,6 +27,10 @@ import java.util.stream.Stream;
public class StreamUtils {
+ public static <T> Stream<T> ofNullables(T... array) {
+ return ofNullable(array);
+ }
+
public static <T> Stream<T> ofNullable(T[] array) {
return ofOptional(Optional.ofNullable(array));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/aee5424b/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java b/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java
index f7d7bf2..c0cf551 100644
--- a/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java
+++ b/server/container/util/src/test/java/org/apache/james/util/OptionalUtilsTest.java
@@ -85,19 +85,6 @@ public class OptionalUtilsTest {
}
@Test
- public void ofNullableToStreamShouldReturnAStreamContainingTheValueWhenNotNull() {
- long value = 18L;
- assertThat(OptionalUtils.ofNullableToStream(value))
- .containsExactly(value);
- }
-
- @Test
- public void ofNullableToStreamShouldReturnAnEmptyStreamWhenNull() {
- assertThat(OptionalUtils.ofNullableToStream(null))
- .isEmpty();
- }
-
- @Test
public void orShouldReturnEmptyWhenEmpty() {
assertThat(
OptionalUtils.or(
http://git-wip-us.apache.org/repos/asf/james-project/blob/aee5424b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/dlp/DlpDomainRules.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/dlp/DlpDomainRules.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/dlp/DlpDomainRules.java
index 3dcfec7..b954801 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/dlp/DlpDomainRules.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/dlp/DlpDomainRules.java
@@ -39,6 +39,7 @@ import org.apache.james.dlp.api.DLPConfigurationItem.Targets;
import org.apache.james.javax.AddressHelper;
import org.apache.james.javax.MultipartUtil;
import org.apache.james.util.OptionalUtils;
+import org.apache.james.util.StreamUtils;
import org.apache.mailet.Mail;
import com.github.fge.lambdas.Throwing;
@@ -168,7 +169,7 @@ public class DlpDomainRules {
}
private Stream<String> listEnvelopSender(Mail mail) {
- return OptionalUtils.ofNullableToStream(mail.getSender()).map(MailAddress::asString);
+ return StreamUtils.ofNullables(mail.getSender()).map(MailAddress::asString);
}
private Stream<String> listFromHeaders(Mail mail) throws MessagingException {
http://git-wip-us.apache.org/repos/asf/james-project/blob/aee5424b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java
index a7ac517..031e696 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/filter/MailMatcher.java
@@ -36,7 +36,6 @@ import org.apache.james.javax.AddressHelper;
import org.apache.james.jmap.api.filtering.Rule;
import org.apache.james.jmap.api.filtering.Rule.Condition.Field;
import org.apache.james.mime4j.util.MimeUtil;
-import org.apache.james.util.OptionalUtils;
import org.apache.james.util.StreamUtils;
import org.apache.mailet.Mail;
import org.slf4j.Logger;
@@ -52,7 +51,7 @@ public interface MailMatcher {
Logger LOGGER = LoggerFactory.getLogger(HeaderExtractor.class);
HeaderExtractor SUBJECT_EXTRACTOR = mail ->
- OptionalUtils.ofNullableToStream(mail.getMessage().getSubject());
+ StreamUtils.ofNullables(mail.getMessage().getSubject());
HeaderExtractor CC_EXTRACTOR = recipientExtractor(Message.RecipientType.CC);
HeaderExtractor TO_EXTRACTOR = recipientExtractor(Message.RecipientType.TO);
HeaderExtractor RECIPIENT_EXTRACTOR = and(TO_EXTRACTOR, CC_EXTRACTOR);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org