http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java ---------------------------------------------------------------------- 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 dc86e09..5e68d80 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 @@ -20,8 +20,8 @@ package org.apache.james.transport.util; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.Set; - import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; @@ -37,8 +37,6 @@ import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; -import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -95,7 +93,9 @@ public class SpecialAddressesUtils { case SENDER: case FROM: case REVERSE_PATH: - return Optional.fromNullable(mail.getSender()).asSet(); + return Optional.ofNullable(mail.getSender()) + .map(sender -> ImmutableSet.of(sender)) + .orElse(ImmutableSet.of()); case REPLY_TO: return getReplyTosFromMail(mail); case RECIPIENTS: @@ -184,7 +184,9 @@ public class SpecialAddressesUtils { switch (specialAddressKind) { case SENDER: case REVERSE_PATH: - return Optional.fromNullable(mail.getSender()).asSet(); + return Optional.ofNullable(mail.getSender()) + .map(ImmutableSet::of) + .orElse(ImmutableSet.of()); case FROM: try { InternetAddress[] fromArray = (InternetAddress[]) mail.getMessage().getFrom(); @@ -254,6 +256,7 @@ public class SpecialAddressesUtils { .withContext(mailet.getMailetContext()) .allowedSpecials(allowedSpecials) .extract(givenAddress); - return FluentIterable.from(extractAddresses).first(); + return extractAddresses.stream() + .findFirst(); } }
http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java index 8e7f193..bc2b318 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java @@ -20,14 +20,11 @@ package org.apache.james.transport.mailets; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import java.net.UnknownHostException; import java.util.Collection; import java.util.Properties; - import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; @@ -143,17 +140,17 @@ public class ForwardTest { @Test public void getReplyToShouldReturnNull() throws Exception { - assertThat(forward.getReplyTo()).isAbsent(); + assertThat(forward.getReplyTo()).isEmpty(); } @Test public void getReversePathShouldReturnAbsent() throws Exception { - assertThat(forward.getReversePath()).isAbsent(); + assertThat(forward.getReversePath()).isEmpty(); } @Test public void getSenderShouldReturnAbsent() throws Exception { - assertThat(forward.getSender()).isAbsent(); + assertThat(forward.getSender()).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java index 1d6b2aa..3c99341 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java @@ -20,13 +20,10 @@ package org.apache.james.transport.mailets; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import java.net.UnknownHostException; import java.util.Properties; - import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; @@ -233,7 +230,7 @@ public class RedirectTest { .build(); redirect.init(mailetConfig); - assertThat(redirect.getReversePath()).isAbsent(); + assertThat(redirect.getReversePath()).isEmpty(); } @Test @@ -286,7 +283,7 @@ public class RedirectTest { message.setText("This is a fake mail"); FakeMail mail = FakeMail.from(message); - assertThat(redirect.getReversePath(mail)).isAbsent(); + assertThat(redirect.getReversePath(mail)).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java index 8303a9e..f9db7eb 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java @@ -20,12 +20,10 @@ package org.apache.james.transport.mailets.redirect; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import java.util.List; - +import java.util.Optional; import javax.mail.MessagingException; import org.apache.mailet.MailAddress; @@ -35,7 +33,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; public class AddressExtractorTest { @@ -103,7 +100,7 @@ public class AddressExtractorTest { public void extractShouldReturnEmptyWhenAddressListIsAbsent() throws Exception { List<MailAddress> extract = AddressExtractor.withContext(mailetContext) .allowedSpecials(ImmutableList.<String> of()) - .extract(Optional.<String> absent()); + .extract(Optional.empty()); assertThat(extract).isEmpty();; } @@ -141,7 +138,7 @@ public class AddressExtractorTest { Optional<MailAddress> specialAddress = AddressExtractor.withContext(mailetContext) .allowedSpecials(ImmutableList.<String> of()) .getSpecialAddress(null); - assertThat(specialAddress).isAbsent(); + assertThat(specialAddress).isEmpty(); } @Test @@ -149,7 +146,7 @@ public class AddressExtractorTest { Optional<MailAddress> specialAddress = AddressExtractor.withContext(mailetContext) .allowedSpecials(ImmutableList.<String> of()) .getSpecialAddress(""); - assertThat(specialAddress).isAbsent(); + assertThat(specialAddress).isEmpty(); } @Test @@ -157,7 +154,7 @@ public class AddressExtractorTest { Optional<MailAddress> specialAddress = AddressExtractor.withContext(mailetContext) .allowedSpecials(ImmutableList.<String> of()) .getSpecialAddress("u...@james.org"); - assertThat(specialAddress).isAbsent(); + assertThat(specialAddress).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java index 5fa59b0..7e23e47 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java @@ -20,11 +20,10 @@ package org.apache.james.transport.mailets.redirect; import static org.assertj.core.api.Assertions.assertThat; +import java.util.Optional; import org.junit.Test; -import com.google.common.base.Optional; - public class LoadedOnceInitParametersTest { @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java index 874fa61..b36608d 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java @@ -20,8 +20,7 @@ package org.apache.james.transport.mailets.redirect; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; - +import java.util.Optional; import javax.mail.MessagingException; import org.apache.mailet.Mail; @@ -30,8 +29,6 @@ import org.apache.mailet.base.test.FakeMailetConfig; import org.junit.Before; import org.junit.Test; -import com.google.common.base.Optional; - public class NotifyMailetInitParametersTest { private GenericMailet mailet; @@ -320,7 +317,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> recipients = testee.getRecipients(); - assertThat(recipients).isAbsent(); + assertThat(recipients).isEmpty(); } @Test @@ -332,7 +329,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> recipients = testee.getRecipients(); - assertThat(recipients).isAbsent(); + assertThat(recipients).isEmpty(); } @Test @@ -358,7 +355,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> to = testee.getTo(); - assertThat(to).isAbsent(); + assertThat(to).isEmpty(); } @Test @@ -370,7 +367,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> to = testee.getTo(); - assertThat(to).isAbsent(); + assertThat(to).isEmpty(); } @Test @@ -396,7 +393,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> reversePath = testee.getReversePath(); - assertThat(reversePath).isAbsent(); + assertThat(reversePath).isEmpty(); } @Test @@ -408,7 +405,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> reversePath = testee.getReversePath(); - assertThat(reversePath).isAbsent(); + assertThat(reversePath).isEmpty(); } @Test @@ -434,7 +431,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> sender = testee.getSender(); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test @@ -446,7 +443,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> sender = testee.getSender(); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test @@ -485,7 +482,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> replyTo = testee.getReplyTo(); - assertThat(replyTo).isAbsent(); + assertThat(replyTo).isEmpty(); } @Test @@ -497,7 +494,7 @@ public class NotifyMailetInitParametersTest { InitParameters testee = NotifyMailetInitParameters.from(mailet); Optional<String> replyTo = testee.getReplyTo(); - assertThat(replyTo).isAbsent(); + assertThat(replyTo).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java index 7134935..039e5da 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java @@ -20,8 +20,7 @@ package org.apache.james.transport.mailets.redirect; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; - +import java.util.Optional; import javax.mail.MessagingException; import org.apache.mailet.Mail; @@ -30,8 +29,6 @@ import org.apache.mailet.base.test.FakeMailetConfig; import org.junit.Before; import org.junit.Test; -import com.google.common.base.Optional; - public class RedirectMailetInitParametersTest { private GenericMailet mailet; @@ -346,7 +343,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> recipients = testee.getRecipients(); - assertThat(recipients).isAbsent(); + assertThat(recipients).isEmpty(); } @Test @@ -358,7 +355,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> recipients = testee.getRecipients(); - assertThat(recipients).isAbsent(); + assertThat(recipients).isEmpty(); } @Test @@ -384,7 +381,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> to = testee.getTo(); - assertThat(to).isAbsent(); + assertThat(to).isEmpty(); } @Test @@ -396,7 +393,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> to = testee.getTo(); - assertThat(to).isAbsent(); + assertThat(to).isEmpty(); } @Test @@ -422,7 +419,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> reversePath = testee.getReversePath(); - assertThat(reversePath).isAbsent(); + assertThat(reversePath).isEmpty(); } @Test @@ -434,7 +431,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> reversePath = testee.getReversePath(); - assertThat(reversePath).isAbsent(); + assertThat(reversePath).isEmpty(); } @Test @@ -460,7 +457,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> sender = testee.getSender(); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test @@ -472,7 +469,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> sender = testee.getSender(); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test @@ -511,7 +508,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> replyTo = testee.getReplyTo(); - assertThat(replyTo).isAbsent(); + assertThat(replyTo).isEmpty(); } @Test @@ -523,7 +520,7 @@ public class RedirectMailetInitParametersTest { InitParameters testee = RedirectMailetInitParameters.from(mailet); Optional<String> replyTo = testee.getReplyTo(); - assertThat(replyTo).isAbsent(); + assertThat(replyTo).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java index b2b325b..4066c5f 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java @@ -22,17 +22,15 @@ package org.apache.james.transport.mailets.remoteDelivery; import static org.apache.james.transport.mailets.remoteDelivery.Bouncer.DELIVERY_ERROR; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; - import java.net.ConnectException; import java.net.SocketException; import java.net.UnknownHostException; - +import java.util.Optional; import javax.mail.MessagingException; import javax.mail.SendFailedException; import org.apache.james.domainlist.api.DomainList; import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; @@ -40,8 +38,6 @@ import org.apache.mailet.base.test.FakeMailetConfig; import org.junit.Before; import org.junit.Test; -import com.google.common.base.Optional; - public class BouncerTest { public static final String HELLO_NAME = "hello_name"; public static final String BOUNCE_PROCESSOR = "bounce_processor"; @@ -74,7 +70,7 @@ public class BouncerTest { "This is a permanent error; I've given up. Sorry it didn't work out. Below\n" + "I include the list of recipients and the reason why I was unable to deliver\n" + "your message.\n\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -103,7 +99,7 @@ public class BouncerTest { "your message.\n" + "\n" + exceptionMessage + "\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -132,7 +128,7 @@ public class BouncerTest { "your message.\n" + "\n" + "Remote mail server told me: " + exceptionMessage + "\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -162,7 +158,7 @@ public class BouncerTest { "\n" + "Unknown host: " + exceptionMessage + "\n" + "This could be a DNS server error, a typo, or a problem with the recipient's mail server.\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -191,7 +187,7 @@ public class BouncerTest { "your message.\n" + "\n" + exceptionMessage + "\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -220,7 +216,7 @@ public class BouncerTest { "your message.\n" + "\n" + "Socket exception: " + exceptionMessage + "\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -249,7 +245,7 @@ public class BouncerTest { "your message.\n" + "\n" + exceptionMessage + "\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -294,7 +290,7 @@ public class BouncerTest { "This is a permanent error; I've given up. Sorry it didn't work out. Below\n" + "I include the list of recipients and the reason why I was unable to deliver\n" + "your message.\n\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -320,7 +316,7 @@ public class BouncerTest { "This is a permanent error; I've given up. Sorry it didn't work out. Below\n" + "I include the list of recipients and the reason why I was unable to deliver\n" + "your message.\n\nnull\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -394,7 +390,7 @@ public class BouncerTest { "I include the list of recipients and the reason why I was unable to deliver\n" + "your message.\n\n" + MailAddressFixture.ANY_AT_JAMES2.asString() + "\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } @@ -423,7 +419,7 @@ public class BouncerTest { "your message.\n\n" + MailAddressFixture.ANY_AT_JAMES2.asString() + "\n" + MailAddressFixture.OTHER_AT_JAMES2.asString() + "\n\n", - Optional.<MailAddress>absent()); + Optional.empty()); assertThat(mailetContext.getSentMails()).isEmpty(); assertThat(mailetContext.getBouncedMails()).containsOnly(expected); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java index 8b5502f..77ad785 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java @@ -18,15 +18,14 @@ ****************************************************************/ package org.apache.james.transport.util; -import static org.assertj.guava.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; +import java.util.Optional; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Test; -import com.google.common.base.Optional; - public class ReplyToUtilsTest { @Test @@ -37,7 +36,7 @@ public class ReplyToUtilsTest { Optional<MailAddress> replyTo = testee.getReplyTo(fakeMail); - assertThat(replyTo).isAbsent(); + assertThat(replyTo).isEmpty(); } @Test @@ -48,7 +47,7 @@ public class ReplyToUtilsTest { Optional<MailAddress> replyTo = testee.getReplyTo(fakeMail); - assertThat(replyTo).isAbsent(); + assertThat(replyTo).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/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 ac12cf8..12994c3 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 @@ -18,26 +18,25 @@ ****************************************************************/ package org.apache.james.transport.util; -import static org.assertj.guava.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; +import java.util.Optional; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Test; -import com.google.common.base.Optional; - public class SenderUtilsTest { @Test public void getSenderShouldReturnAbsentWhenSenderIsAbsent() throws Exception { - SenderUtils testee = SenderUtils.from(Optional.<MailAddress> absent()); + SenderUtils testee = SenderUtils.from(Optional.empty()); FakeMail fakeMail = FakeMail.defaultFakeMail(); Optional<MailAddress> sender = testee.getSender(fakeMail); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test @@ -48,7 +47,7 @@ public class SenderUtilsTest { Optional<MailAddress> sender = testee.getSender(fakeMail); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test @@ -59,7 +58,7 @@ public class SenderUtilsTest { Optional<MailAddress> sender = testee.getSender(fakeMail); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java index 52d9e68..550fdb3 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java @@ -19,14 +19,12 @@ package org.apache.james.transport.util; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.Properties; - import javax.mail.Session; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; @@ -43,7 +41,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; public class SpecialAddressesUtilsTest { @@ -461,16 +458,16 @@ public class SpecialAddressesUtilsTest { @Test public void getFirstSpecialAddressIfMatchingOrGivenAddressShouldReturnAbsentWhenSenderInitParameterIsAbsent() throws Exception { - Optional<MailAddress> sender = testee.getFirstSpecialAddressIfMatchingOrGivenAddress(Optional.<String> absent(), ImmutableList.of("postmaster", "sender", "unaltered")); + Optional<MailAddress> sender = testee.getFirstSpecialAddressIfMatchingOrGivenAddress(Optional.empty(), ImmutableList.of("postmaster", "sender", "unaltered")); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test public void getFirstSpecialAddressIfMatchingOrGivenAddressShouldReturnAbsentWhenSenderInitParameterIsEmpty() throws Exception { Optional<MailAddress> sender = testee.getFirstSpecialAddressIfMatchingOrGivenAddress(Optional.of(""), ImmutableList.of("postmaster", "sender", "unaltered")); - assertThat(sender).isAbsent(); + assertThat(sender).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java index a84085b..9c03d3f 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java @@ -219,8 +219,8 @@ public class MessageFactory { .blobId(BlobId.of(attachment.getAttachmentId().getId())) .type(attachment.getAttachment().getType()) .size(attachment.getAttachment().getSize()) - .name(attachment.getName().orNull()) - .cid(attachment.getCid().transform(Cid::getValue).orNull()) + .name(attachment.getName().orElse(null)) + .cid(attachment.getCid().map(Cid::getValue).orElse(null)) .isInline(attachment.isInline()) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3de14014/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java index 5a572de..2f0dd8b 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterThreadTest.java @@ -20,6 +20,7 @@ package org.apache.james.jmap; import java.util.EnumSet; import java.util.List; +import java.util.Optional; import java.util.Set; import org.apache.james.mailbox.MailboxListener; @@ -46,7 +47,6 @@ import org.apache.james.mailbox.model.TestId; import org.apache.james.metrics.api.NoopMetricFactory; import org.junit.Test; -import com.google.common.base.Optional; import com.google.testing.threadtester.AnnotatedTestRunner; import com.google.testing.threadtester.ThreadedAfter; import com.google.testing.threadtester.ThreadedBefore; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
