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 ro...@apache.org on 2017/01/11 09:26:28 UTC
[40/50] [abbrv] james-project git commit: MAILET-115 getSender method
returns an Optional
MAILET-115 getSender method returns an Optional
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7974e706
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7974e706
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7974e706
Branch: refs/heads/master
Commit: 7974e7065c51cec7df361bca20349d238e9fbdd8
Parents: 7a618b9
Author: Antoine Duprat <ad...@linagora.com>
Authored: Tue Jan 3 13:28:32 2017 +0100
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Jan 11 10:03:32 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/james/transport/mailets/Bounce.java | 5 ++---
.../org/apache/james/transport/mailets/DSNBounce.java | 5 ++---
.../org/apache/james/transport/mailets/Forward.java | 4 ++--
.../james/transport/mailets/NotifyPostmaster.java | 5 ++---
.../apache/james/transport/mailets/NotifySender.java | 5 ++---
.../org/apache/james/transport/mailets/Redirect.java | 5 ++---
.../java/org/apache/james/transport/mailets/Resend.java | 5 ++---
.../transport/mailets/redirect/RedirectNotify.java | 2 +-
.../org/apache/james/transport/util/SenderUtils.java | 12 ++++++------
.../apache/james/transport/util/SenderUtilsTest.java | 10 +++++-----
10 files changed, 26 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java
index f3c360b..b964618 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java
@@ -217,10 +217,9 @@ public class Bounce extends GenericMailet implements RedirectNotify {
}
@Override
- public MailAddress getSender() throws MessagingException {
+ public Optional<MailAddress> getSender() throws MessagingException {
return SpecialAddressesUtils.from(this)
- .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS)
- .orNull();
+ .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
index 9651f47..4b39e7d 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
@@ -205,10 +205,9 @@ public class DSNBounce extends GenericMailet implements RedirectNotify {
}
@Override
- public MailAddress getSender() throws MessagingException {
+ public Optional<MailAddress> getSender() throws MessagingException {
return SpecialAddressesUtils.from(this)
- .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS)
- .orNull();
+ .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java
index 1e4dbb6..2b57c0a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Forward.java
@@ -221,8 +221,8 @@ public class Forward extends GenericMailet implements RedirectNotify {
}
@Override
- public MailAddress getSender() throws MessagingException {
- return null;
+ public Optional<MailAddress> getSender() throws MessagingException {
+ return Optional.absent();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java
index a9a8df5..3cfc7b2 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java
@@ -233,10 +233,9 @@ public class NotifyPostmaster extends GenericMailet implements RedirectNotify {
}
@Override
- public MailAddress getSender() throws MessagingException {
+ public Optional<MailAddress> getSender() throws MessagingException {
return SpecialAddressesUtils.from(this)
- .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS)
- .orNull();
+ .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java
index b0ad1ee..b8b4e38 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java
@@ -233,10 +233,9 @@ public class NotifySender extends GenericMailet implements RedirectNotify {
}
@Override
- public MailAddress getSender() throws MessagingException {
+ public Optional<MailAddress> getSender() throws MessagingException {
return SpecialAddressesUtils.from(this)
- .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS)
- .orNull();
+ .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java
index f8fafaf..0511e02 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java
@@ -453,10 +453,9 @@ public class Redirect extends GenericMailet implements RedirectNotify {
}
@Override
- public MailAddress getSender() throws MessagingException {
+ public Optional<MailAddress> getSender() throws MessagingException {
return SpecialAddressesUtils.from(this)
- .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS)
- .orNull();
+ .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java
index 386d372..696263b 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java
@@ -416,10 +416,9 @@ public class Resend extends GenericMailet implements RedirectNotify {
}
@Override
- public MailAddress getSender() throws MessagingException {
+ public Optional<MailAddress> getSender() throws MessagingException {
return SpecialAddressesUtils.from(this)
- .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS)
- .orNull();
+ .getFirstSpecialAddressIfMatchingOrGivenAddress(getInitParameters().getSender(), RedirectNotify.SENDER_ALLOWED_SPECIALS);
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java
index a87c298..27cac14 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java
@@ -259,7 +259,7 @@ public interface RedirectNotify extends Mailet, MailetConfig {
* <code>SpecialAddress.UNALTERED</code> or <code>null</code> if
* missing
*/
- MailAddress getSender() throws MessagingException;
+ Optional<MailAddress> getSender() throws MessagingException;
/**
* Gets the <code>sender</code> property, built dynamically using the
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java
index 301617d..40dd1ab 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java
@@ -28,23 +28,23 @@ import com.google.common.base.Optional;
public class SenderUtils {
- public static SenderUtils from(MailAddress sender) {
+ public static SenderUtils from(Optional<MailAddress> sender) {
return new SenderUtils(sender);
}
- private final MailAddress sender;
+ private final Optional<MailAddress> sender;
- private SenderUtils(MailAddress sender) {
+ private SenderUtils(Optional<MailAddress> sender) {
this.sender = sender;
}
public Optional<MailAddress> getSender(Mail originalMail) throws MessagingException {
- if (sender != null) {
- if (isUnalteredOrSender(sender)) {
+ if (sender.isPresent()) {
+ if (isUnalteredOrSender(sender.get())) {
return Optional.absent();
}
}
- return Optional.fromNullable(sender);
+ return sender;
}
private boolean isUnalteredOrSender(MailAddress sender) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/7974e706/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java
index 5fc4d3b..ac12cf8 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java
@@ -30,8 +30,8 @@ import com.google.common.base.Optional;
public class SenderUtilsTest {
@Test
- public void getSenderShouldReturnAbsentWhenSenderIsNull() throws Exception {
- SenderUtils testee = SenderUtils.from(null);
+ public void getSenderShouldReturnAbsentWhenSenderIsAbsent() throws Exception {
+ SenderUtils testee = SenderUtils.from(Optional.<MailAddress> absent());
FakeMail fakeMail = FakeMail.defaultFakeMail();
@@ -42,7 +42,7 @@ public class SenderUtilsTest {
@Test
public void getSenderShouldReturnAbsentWhenSenderEqualsToUnaltered() throws Exception {
- SenderUtils testee = SenderUtils.from(SpecialAddress.UNALTERED);
+ SenderUtils testee = SenderUtils.from(Optional.of(SpecialAddress.UNALTERED));
FakeMail fakeMail = FakeMail.defaultFakeMail();
@@ -53,7 +53,7 @@ public class SenderUtilsTest {
@Test
public void getSenderShouldReturnAbsentWhenSenderEqualsToSender() throws Exception {
- SenderUtils testee = SenderUtils.from(SpecialAddress.SENDER);
+ SenderUtils testee = SenderUtils.from(Optional.of(SpecialAddress.SENDER));
FakeMail fakeMail = FakeMail.defaultFakeMail();
@@ -65,7 +65,7 @@ public class SenderUtilsTest {
@Test
public void getSenderShouldReturnSenderWhenSenderIsCommon() throws Exception {
MailAddress expectedMailAddress = new MailAddress("sender", "james.org");
- SenderUtils testee = SenderUtils.from(expectedMailAddress);
+ SenderUtils testee = SenderUtils.from(Optional.of(expectedMailAddress));
FakeMail fakeMail = FakeMail.defaultFakeMail();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org