JAMES-2127 Mailet: Replaced guava's Optional by java.util.Optional and it's related
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a50cd623 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a50cd623 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a50cd623 Branch: refs/heads/master Commit: a50cd623157d737e9e3f09f3c50e79c60cd300ca Parents: aa1920b Author: quynhn <qngu...@linagora.com> Authored: Fri Aug 25 15:23:05 2017 +0700 Committer: quynhn <qngu...@linagora.com> Committed: Wed Aug 30 11:08:48 2017 +0700 ---------------------------------------------------------------------- .../org/apache/mailet/base/GenericMailet.java | 7 ++--- .../java/org/apache/mailet/base/MailetUtil.java | 17 ++++++----- .../org/apache/mailet/base/MailetUtilTest.java | 6 ++-- .../org/apache/mailet/base/test/FakeMail.java | 27 ++++++++--------- .../mailet/base/test/FakeMailContext.java | 29 +++++++++--------- .../mailet/base/test/FakeMailetConfig.java | 15 +++++----- .../mailet/base/test/FakeMatcherConfig.java | 13 ++++---- .../mailet/base/test/MimeMessageBuilder.java | 31 ++++++++++---------- .../james/transport/mailets/AddFooter.java | 6 ++-- .../transport/mailets/ContentReplacer.java | 3 +- .../transport/mailets/MimeDecodingMailet.java | 9 +++--- .../transport/mailets/PatternExtractor.java | 6 ++-- .../james/transport/mailets/ReplaceContent.java | 4 +-- .../transport/mailets/StripAttachment.java | 19 ++++++------ .../james/transport/mailets/ToProcessor.java | 5 ++-- .../mailets/utils/MimeMessageModifier.java | 2 +- .../mailets/utils/MimeMessageUtils.java | 7 ++--- .../transport/mailets/ContentReplacerTest.java | 7 ++--- .../transport/mailets/StripAttachmentTest.java | 11 +++---- .../mailets/utils/MimeMessageModifierTest.java | 7 ++--- .../mailets/utils/MimeMessageUtilsTest.java | 10 ++----- 21 files changed, 108 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java index 53933fc..58d0d41 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/GenericMailet.java @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; - +import java.util.Optional; import javax.mail.MessagingException; import org.apache.commons.lang.StringUtils; @@ -36,7 +36,6 @@ import org.apache.mailet.MailetContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; import com.google.common.base.Strings; /** @@ -84,13 +83,13 @@ public abstract class GenericMailet implements Mailet, MailetConfig { if (config == null) { throw new NullPointerException("Mailet configuration must be set before getInitParameter is called."); } - return MailetUtil.getInitParameter(config, name).or(defaultValue); + return MailetUtil.getInitParameter(config, name).orElse(defaultValue); } public Optional<String> getInitParameterAsOptional(String name) { String value = getInitParameter(name); if (Strings.isNullOrEmpty(value)) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(value); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java b/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java index ae16f7c..dc8ec27 100644 --- a/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java +++ b/mailet/base/src/main/java/org/apache/mailet/base/MailetUtil.java @@ -21,11 +21,11 @@ package org.apache.mailet.base; +import java.util.Optional; import javax.mail.MessagingException; import org.apache.mailet.MailetConfig; -import com.google.common.base.Optional; import com.google.common.base.Strings; @@ -108,7 +108,7 @@ public class MailetUtil { if ("false".equalsIgnoreCase(value)){ return Optional.of(false); } - return Optional.absent(); + return Optional.empty(); } public static int getInitParameterAsStrictlyPositiveInteger(String condition, int defaultValue) throws MessagingException { @@ -117,21 +117,22 @@ public class MailetUtil { } public static int getInitParameterAsStrictlyPositiveInteger(String condition) throws MessagingException { - return getInitParameterAsStrictlyPositiveInteger(condition, Optional.<String>absent()); + return getInitParameterAsStrictlyPositiveInteger(condition, Optional.empty()); } public static int getInitParameterAsStrictlyPositiveInteger(String condition, Optional<String> defaultValue) throws MessagingException { - Optional<String> value = Optional.fromNullable(condition) - .or(defaultValue); + String value = Optional.ofNullable(condition) + .filter(Strings::isNullOrEmpty) + .orElse(defaultValue.orElse(null)); - if (Strings.isNullOrEmpty(value.orNull())) { + if (Strings.isNullOrEmpty(value)) { throw new MessagingException("Condition is required. It should be a strictly positive integer"); } - int valueAsInt = tryParseInteger(value.orNull()); + int valueAsInt = tryParseInteger(value); if (valueAsInt < 1) { - throw new MessagingException("Expecting condition to be a strictly positive integer. Got " + value.get()); + throw new MessagingException("Expecting condition to be a strictly positive integer. Got " + value); } return valueAsInt; } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java index be11e15..e9981a3 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/MailetUtilTest.java @@ -20,8 +20,6 @@ package org.apache.mailet.base; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; - import javax.mail.MessagingException; import org.apache.mailet.base.test.FakeMailetConfig; @@ -89,7 +87,7 @@ public class MailetUtilTest { public void getInitParameterShouldReturnAbsentWhenNull() { FakeMailetConfig mailetConfig = FakeMailetConfig.builder() .build(); - assertThat(MailetUtil.getInitParameter(mailetConfig, A_PARAMETER)).isAbsent(); + assertThat(MailetUtil.getInitParameter(mailetConfig, A_PARAMETER)).isEmpty(); } @Test @@ -177,6 +175,6 @@ public class MailetUtilTest { FakeMailetConfig mailetConfig = FakeMailetConfig.builder() .setProperty(A_PARAMETER, value) .build(); - return MailetUtil.getInitParameter(mailetConfig, A_PARAMETER).or(defaultValue); + return MailetUtil.getInitParameter(mailetConfig, A_PARAMETER).orElse(defaultValue); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java index 7c462c4..98c7579 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java @@ -28,8 +28,8 @@ import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Properties; - import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.InternetAddress; @@ -42,7 +42,6 @@ import org.apache.mailet.PerRecipientHeaders.Header; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -99,17 +98,17 @@ public class FakeMail implements Mail { private Optional<String> remoteAddr; private Builder() { - fileName = Optional.absent(); - mimeMessage = Optional.absent(); + fileName = Optional.empty(); + mimeMessage = Optional.empty(); recipients = Lists.newArrayList(); - name = Optional.absent(); - sender = Optional.absent(); - state = Optional.absent(); - errorMessage = Optional.absent(); - lastUpdated = Optional.absent(); + name = Optional.empty(); + sender = Optional.empty(); + state = Optional.empty(); + errorMessage = Optional.empty(); + lastUpdated = Optional.empty(); attributes = Maps.newHashMap(); - size = Optional.absent(); - remoteAddr = Optional.absent(); + size = Optional.empty(); + remoteAddr = Optional.empty(); } public Builder size(long size) { @@ -183,8 +182,8 @@ public class FakeMail implements Mail { } public FakeMail build() throws MessagingException { - return new FakeMail(getMimeMessage(), recipients, name.orNull(), sender.orNull(), state.orNull(), errorMessage.orNull(), lastUpdated.orNull(), - attributes, size.or(0l), remoteAddr.or("127.0.0.1")); + return new FakeMail(getMimeMessage(), recipients, name.orElse(null), sender.orElse(null), state.orElse(null), errorMessage.orElse(null), lastUpdated.orElse(null), + attributes, size.orElse(0l), remoteAddr.orElse("127.0.0.1")); } private MimeMessage getMimeMessage() throws MessagingException { @@ -192,7 +191,7 @@ public class FakeMail implements Mail { if (fileName.isPresent()) { return new MimeMessage(Session.getInstance(new Properties()), ClassLoader.getSystemResourceAsStream(fileName.get())); } - return mimeMessage.orNull(); + return mimeMessage.orElse(null); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java index 38ffad6..14409fb 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailContext.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - +import java.util.Optional; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; @@ -39,7 +39,6 @@ import org.slf4j.Logger; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -86,7 +85,7 @@ public class FakeMailContext implements MailetContext { private Optional<MailAddress> postmaster; private Builder() { - postmaster = Optional.absent(); + postmaster = Optional.empty(); } public Builder logger(Logger logger) { @@ -100,7 +99,7 @@ public class FakeMailContext implements MailetContext { } public FakeMailContext build() { - return new FakeMailContext(Optional.fromNullable(logger), postmaster.orNull()); + return new FakeMailContext(Optional.ofNullable(logger), postmaster.orElse(null)); } } @@ -108,11 +107,11 @@ public class FakeMailContext implements MailetContext { public static class Builder { private MailAddress sender; - private Optional<Collection<MailAddress>> recipients = Optional.absent(); + private Optional<Collection<MailAddress>> recipients = Optional.empty(); private MimeMessage msg; private Map<String, Serializable> attributes = new HashMap<>(); - private Optional<String> state = Optional.absent(); - private Optional<Boolean> fromMailet = Optional.absent(); + private Optional<String> state = Optional.empty(); + private Optional<Boolean> fromMailet = Optional.empty(); public Builder sender(MailAddress sender) { this.sender = sender; @@ -160,11 +159,11 @@ public class FakeMailContext implements MailetContext { } public SentMail build() { - if (fromMailet.or(false)) { + if (fromMailet.orElse(false)) { this.attribute(Mail.SENT_BY_MAILET, "true"); } - return new SentMail(sender, recipients.or(ImmutableList.<MailAddress>of()), msg, - ImmutableMap.copyOf(attributes), state.or(Mail.DEFAULT)); + return new SentMail(sender, recipients.orElse(ImmutableList.<MailAddress>of()), msg, + ImmutableMap.copyOf(attributes), state.orElse(Mail.DEFAULT)); } } @@ -186,9 +185,9 @@ public class FakeMailContext implements MailetContext { private Optional<String> getSubject(MimeMessage msg) { try { - return Optional.fromNullable(msg.getSubject()); + return Optional.ofNullable(msg.getSubject()); } catch (Exception e) { - return Optional.absent(); + return Optional.empty(); } } @@ -306,11 +305,11 @@ public class FakeMailContext implements MailetContext { } public void bounce(Mail mail, String message) throws MessagingException { - bouncedMails.add(new BouncedMail(fromMail(mail), message, Optional.<MailAddress>absent())); + bouncedMails.add(new BouncedMail(fromMail(mail), message, Optional.empty())); } public void bounce(Mail mail, String message, MailAddress bouncer) throws MessagingException { - bouncedMails.add(new BouncedMail(fromMail(mail), message, Optional.fromNullable(bouncer))); + bouncedMails.add(new BouncedMail(fromMail(mail), message, Optional.ofNullable(bouncer))); } /** @@ -482,6 +481,6 @@ public class FakeMailContext implements MailetContext { @Override public Logger getLogger() { - return logger.orNull(); + return logger.orElse(null); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java index 03d741c..f0598e5 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java @@ -20,13 +20,12 @@ package org.apache.mailet.base.test; import java.util.Iterator; +import java.util.Optional; import java.util.Properties; import org.apache.mailet.MailetConfig; import org.apache.mailet.MailetContext; -import com.google.common.base.Optional; - /** * MailetConfig over Properties */ @@ -44,18 +43,18 @@ public class FakeMailetConfig implements MailetConfig { private Properties properties; private Builder() { - mailetName = Optional.absent(); - mailetContext = Optional.absent(); + mailetName = Optional.empty(); + mailetContext = Optional.empty(); properties = new Properties(); } public Builder mailetName(String mailetName) { - this.mailetName = Optional.fromNullable(mailetName); + this.mailetName = Optional.ofNullable(mailetName); return this; } public Builder mailetContext(MailetContext mailetContext) { - this.mailetContext = Optional.fromNullable(mailetContext); + this.mailetContext = Optional.ofNullable(mailetContext); return this; } @@ -65,8 +64,8 @@ public class FakeMailetConfig implements MailetConfig { } public FakeMailetConfig build() { - return new FakeMailetConfig(mailetName.or(DEFAULT_MAILET_NAME), - mailetContext.or(FakeMailContext.defaultContext()), + return new FakeMailetConfig(mailetName.orElse(DEFAULT_MAILET_NAME), + mailetContext.orElse(FakeMailContext.defaultContext()), properties); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java index ef1376f..1917c3d 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java @@ -19,10 +19,11 @@ package org.apache.mailet.base.test; +import java.util.Optional; + import org.apache.mailet.MailetContext; import org.apache.mailet.MatcherConfig; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; /** @@ -41,8 +42,8 @@ public class FakeMatcherConfig implements MatcherConfig { private Optional<String> condition; private Builder() { - condition = Optional.absent(); - mailetContext = Optional.absent(); + condition = Optional.empty(); + mailetContext = Optional.empty(); } public Builder matcherName(String matcherName) { @@ -57,13 +58,13 @@ public class FakeMatcherConfig implements MatcherConfig { } public Builder condition(String condition) { - this.condition = Optional.fromNullable(condition); + this.condition = Optional.ofNullable(condition); return this; } public FakeMatcherConfig build() { Preconditions.checkNotNull(matcherName, "'matcherName' is mandatory"); - return new FakeMatcherConfig(matcherName, mailetContext.or(FakeMailContext.defaultContext()), condition); + return new FakeMatcherConfig(matcherName, mailetContext.orElse(FakeMailContext.defaultContext()), condition); } } @@ -89,6 +90,6 @@ public class FakeMatcherConfig implements MatcherConfig { @Override public String getCondition() { - return condition.orNull(); + return condition.orElse(null); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java index 043aa1a..f83cd6f 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/MimeMessageBuilder.java @@ -25,8 +25,8 @@ import java.io.InputStream; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.Properties; - import javax.activation.DataHandler; import javax.mail.BodyPart; import javax.mail.Message; @@ -44,7 +44,6 @@ import org.apache.commons.io.IOUtils; import com.google.common.base.Charsets; import com.google.common.base.Function; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.FluentIterable; @@ -89,13 +88,13 @@ public class MimeMessageBuilder { public static final String DEFAULT_TEXT_PLAIN_UTF8_TYPE = "text/plain; charset=UTF-8"; public static final String DEFAULT_VALUE = ""; - private Optional<String> cid = Optional.absent(); - private Optional<String> filename = Optional.absent(); + private Optional<String> cid = Optional.empty(); + private Optional<String> filename = Optional.empty(); private ImmutableList.Builder<Header> headers = ImmutableList.builder(); - private Optional<String> disposition = Optional.absent(); - private Optional<String> dataAsString = Optional.absent(); - private Optional<byte[]> dataAsBytes = Optional.absent(); - private Optional<String> type = Optional.absent(); + private Optional<String> disposition = Optional.empty(); + private Optional<String> dataAsString = Optional.empty(); + private Optional<byte[]> dataAsBytes = Optional.empty(); + private Optional<String> type = Optional.empty(); public BodyPartBuilder cid(String cid) { this.cid = Optional.of(cid); @@ -149,14 +148,14 @@ public class MimeMessageBuilder { new DataHandler( new ByteArrayDataSource( dataAsBytes.get(), - type.or(DEFAULT_TEXT_PLAIN_UTF8_TYPE)) + type.orElse(DEFAULT_TEXT_PLAIN_UTF8_TYPE)) )); } else { bodyPart.setDataHandler( new DataHandler( new ByteArrayDataSource( - dataAsString.or(DEFAULT_VALUE), - type.or(DEFAULT_TEXT_PLAIN_UTF8_TYPE)) + dataAsString.orElse(DEFAULT_VALUE), + type.orElse(DEFAULT_TEXT_PLAIN_UTF8_TYPE)) )); } if (filename.isPresent()) { @@ -208,10 +207,10 @@ public class MimeMessageBuilder { return new MimeBodyPart(new ByteArrayInputStream(bytes)); } - private Optional<String> text = Optional.absent(); - private Optional<String> subject = Optional.absent(); - private Optional<InternetAddress> sender = Optional.absent(); - private Optional<MimeMultipart> content = Optional.absent(); + private Optional<String> text = Optional.empty(); + private Optional<String> subject = Optional.empty(); + private Optional<InternetAddress> sender = Optional.empty(); + private Optional<MimeMultipart> content = Optional.empty(); private ImmutableList.Builder<InternetAddress> from = ImmutableList.builder(); private ImmutableList.Builder<InternetAddress> cc = ImmutableList.builder(); private ImmutableList.Builder<InternetAddress> to = ImmutableList.builder(); @@ -229,7 +228,7 @@ public class MimeMessageBuilder { } public MimeMessageBuilder setSubject(String subject) { - this.subject = Optional.fromNullable(subject); + this.subject = Optional.ofNullable(subject); return this; } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java index 52b006a..c0cc1b1 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java @@ -23,9 +23,9 @@ package org.apache.james.transport.mailets; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.mail.MessagingException; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; @@ -38,8 +38,6 @@ import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; - /** * Takes the message and attaches a footer message to it. Right now, it only * supports simple messages. Needs to have additions to make it support @@ -154,7 +152,7 @@ public class AddFooter extends GenericMailet { } else if (part.isMimeType("text/html")) { return Optional.of(attachFooterToHTML(content)); } - return Optional.absent(); + return Optional.empty(); } private boolean attachFooterToFirstPart(MimeMultipart multipart) throws MessagingException, IOException { http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java index a8cf514..22424e4 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java @@ -22,8 +22,8 @@ package org.apache.james.transport.mailets; import java.io.IOException; import java.nio.charset.Charset; import java.util.List; +import java.util.Optional; import java.util.regex.Matcher; - import javax.mail.MessagingException; import javax.mail.internet.ContentType; import javax.mail.internet.ParseException; @@ -33,7 +33,6 @@ import org.apache.mailet.MailetException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; import com.google.common.base.Strings; public class ContentReplacer { http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java index 20db4cc..c4fc0a4 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java @@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.Serializable; import java.util.Map; - +import java.util.Optional; import javax.mail.MessagingException; import javax.mail.internet.MimeBodyPart; @@ -33,7 +33,6 @@ import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; @@ -95,13 +94,13 @@ public class MimeDecodingMailet extends GenericMailet { private Optional<byte[]> extractContent(Object rawMime) throws MessagingException { try { MimeBodyPart mimeBodyPart = new MimeBodyPart(new ByteArrayInputStream((byte[]) rawMime)); - return Optional.fromNullable(IOUtils.toByteArray(mimeBodyPart.getInputStream())); + return Optional.ofNullable(IOUtils.toByteArray(mimeBodyPart.getInputStream())); } catch (IOException e) { LOGGER.error("Error while extracting content from mime part", e); - return Optional.absent(); + return Optional.empty(); } catch (ClassCastException e) { LOGGER.error("Invalid map attribute types.", e); - return Optional.absent(); + return Optional.empty(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java index dbeb42c..090a9f6 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/PatternExtractor.java @@ -26,13 +26,13 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.util.List; +import java.util.Optional; import java.util.regex.Pattern; import org.apache.commons.io.IOUtils; import org.apache.mailet.MailetException; import org.apache.mailet.base.StringUtils; -import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -135,7 +135,7 @@ public class PatternExtractor { if (charsetOffset >= 0) { return Optional.of(charsetOffset); } - return Optional.absent(); + return Optional.empty(); } private static Charset charset(String fileName, int charsetOffset) { @@ -183,6 +183,6 @@ public class PatternExtractor { if (file.isFile()) { return Optional.of(new FileInputStream(file)); } - return Optional.absent(); + return Optional.empty(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java index cdfe963..6926aa8 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ReplaceContent.java @@ -22,13 +22,13 @@ package org.apache.james.transport.mailets; import java.io.IOException; import java.nio.charset.Charset; import java.util.List; +import java.util.Optional; import org.apache.mailet.Mail; import org.apache.mailet.MailetException; import org.apache.mailet.base.GenericMailet; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -108,7 +108,7 @@ public class ReplaceContent extends GenericMailet { private Optional<Charset> initCharset() { String charsetName = getInitParameter(PARAMETER_NAME_CHARSET); if (Strings.isNullOrEmpty(charsetName)) { - return Optional.absent(); + return Optional.empty(); } return Optional.of(Charset.forName(charsetName)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java index b481680..8e87239 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java @@ -31,9 +31,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Optional; import java.util.UUID; import java.util.regex.Pattern; - import javax.mail.BodyPart; import javax.mail.Message; import javax.mail.MessagingException; @@ -42,10 +42,10 @@ import javax.mail.Part; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeUtility; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.james.mime4j.codec.DecodeMonitor; import org.apache.james.mime4j.codec.DecoderUtil; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.mailet.Mail; import org.apache.mailet.MailetException; import org.apache.mailet.base.GenericMailet; @@ -53,7 +53,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -409,8 +408,8 @@ public class StripAttachment extends GenericMailet { if (patternsAreEquals()) { return false; } - boolean result = isMatchingPattern(name, regExPattern).or(false) - || !isMatchingPattern(name, notRegExPattern).or(true); + boolean result = isMatchingPattern(name, regExPattern).orElse(false) + || !isMatchingPattern(name, notRegExPattern).orElse(true); LOGGER.debug("attachment " + name + " " + ((result) ? "matches" : "does not match")); return result; @@ -425,7 +424,7 @@ public class StripAttachment extends GenericMailet { if (pattern != null) { return Optional.of(pattern.matcher(name).matches()); } - return Optional.absent(); + return Optional.empty(); } /** @@ -447,13 +446,13 @@ public class StripAttachment extends GenericMailet { return Optional.of(outputFile.getName()); } catch (Exception e) { LOGGER.error("Error while saving contents of", e); - return Optional.absent(); + return Optional.empty(); } } private File outputFile(Part part, Optional<String> fileName) throws MessagingException, IOException { - Optional<String> maybePartFileName = Optional.fromNullable(part.getFileName()); - return createTempFile(fileName.or(maybePartFileName).orNull()); + Optional<String> maybePartFileName = Optional.ofNullable(part.getFileName()); + return createTempFile(fileName.orElse(maybePartFileName.orElse(null))); } private File createTempFile(String originalFileName) throws IOException { http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java index 1c6b3fa..e23d210 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java @@ -21,6 +21,7 @@ package org.apache.james.transport.mailets; +import java.util.Optional; import javax.mail.MessagingException; import org.apache.mailet.Mail; @@ -29,8 +30,6 @@ import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; - /** * <p>This mailet redirects the mail to the named processor</p> * @@ -58,7 +57,7 @@ public class ToProcessor extends GenericMailet { if (processor == null) { throw new MailetException("processor parameter is required"); } - noticeText = Optional.fromNullable(getInitParameter("notice")); + noticeText = Optional.ofNullable(getInitParameter("notice")); } private boolean isDebug() { http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageModifier.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageModifier.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageModifier.java index f9ea826..b3c9b8d 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageModifier.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageModifier.java @@ -19,11 +19,11 @@ package org.apache.james.transport.mailets.utils; +import java.util.Optional; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import com.google.common.base.Charsets; -import com.google.common.base.Optional; public class MimeMessageModifier { http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java index 5ae1360..bdd5518 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/utils/MimeMessageUtils.java @@ -20,7 +20,7 @@ package org.apache.james.transport.mailets.utils; import java.util.Enumeration; import java.util.List; - +import java.util.Optional; import javax.mail.Header; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; @@ -29,7 +29,6 @@ import org.apache.mailet.Mail; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; -import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -60,7 +59,7 @@ public class MimeMessageUtils { @VisibleForTesting Optional<String> buildNewSubject(String subjectPrefix, String originalSubject, String subject) throws MessagingException { String nullablePrefix = Strings.emptyToNull(subjectPrefix); if (nullablePrefix == null && subject == null) { - return Optional.absent(); + return Optional.empty(); } if (nullablePrefix == null) { return Optional.of(subject); @@ -70,7 +69,7 @@ public class MimeMessageUtils { } private String chooseSubject(String newSubject, String originalSubject) { - return Optional.fromNullable(newSubject).or(originalSubject); + return Optional.ofNullable(newSubject).orElse(originalSubject); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContentReplacerTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContentReplacerTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContentReplacerTest.java index 479bfd4..0ee2419 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContentReplacerTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContentReplacerTest.java @@ -23,17 +23,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - -import java.nio.charset.Charset; +import java.util.Optional; import java.util.regex.Pattern; - import javax.mail.internet.MimeMessage; import org.apache.mailet.Mail; import org.junit.Test; import com.google.common.base.Charsets; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; public class ContentReplacerTest { @@ -137,7 +134,7 @@ public class ContentReplacerTest { ReplaceConfig replaceConfig = ReplaceConfig.builder() .addAllSubjectReplacingUnits(patterns) .build(); - testee.replaceMailContentAndSubject(mail, replaceConfig, Optional.<Charset> absent()); + testee.replaceMailContentAndSubject(mail, replaceConfig, Optional.empty()); verify(mimeMessage).setSubject("TEST ee o", Charsets.UTF_8.name()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java index 7d6fd69..dd53140 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java @@ -20,17 +20,15 @@ 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.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.List; import java.util.Map; - +import java.util.Optional; import javax.mail.BodyPart; import javax.mail.MessagingException; import javax.mail.Part; @@ -38,8 +36,8 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; -import org.apache.commons.io.IOUtils; import org.apache.james.transport.mailets.StripAttachment.OutputFileName; +import org.apache.commons.io.IOUtils; import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetException; @@ -54,13 +52,12 @@ import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import com.google.common.base.Charsets; -import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; public class StripAttachmentTest { private static final String EXPECTED_ATTACHMENT_CONTENT = "\u0023\u00A4\u00E3\u00E0\u00E9"; - private static final Optional<String> ABSENT_MIME_TYPE = Optional.absent(); + private static final Optional<String> ABSENT_MIME_TYPE = Optional.empty(); private static final String CONTENT_TRANSFER_ENCODING_VALUE ="8bit"; public static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding"; @@ -828,7 +825,7 @@ public class StripAttachmentTest { Part part = MimeMessageBuilder.bodyPartBuilder().build(); Optional<String> maybeFilename = mailet.saveAttachmentToFile(part, ABSENT_MIME_TYPE); - assertThat(maybeFilename).isAbsent(); + assertThat(maybeFilename).isEmpty(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java index 446d8c2..9baa698 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageModifierTest.java @@ -20,16 +20,13 @@ package org.apache.james.transport.mailets.utils; import static org.assertj.core.api.Assertions.assertThat; - +import java.util.Optional; import java.util.Properties; - import javax.mail.Session; import javax.mail.internet.MimeMessage; import org.junit.Test; -import com.google.common.base.Optional; - public class MimeMessageModifierTest { @Test @@ -49,7 +46,7 @@ public class MimeMessageModifierTest { String expectedSubject = "subject"; message.setSubject(expectedSubject); - new MimeMessageModifier(message).replaceSubject(Optional.<String> absent()); + new MimeMessageModifier(message).replaceSubject(Optional.empty()); assertThat(message.getSubject()).isEqualTo(expectedSubject); } http://git-wip-us.apache.org/repos/asf/james-project/blob/a50cd623/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java index 87b53e0..baf3da1 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/utils/MimeMessageUtilsTest.java @@ -20,10 +20,8 @@ package org.apache.james.transport.mailets.utils; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.guava.api.Assertions.assertThat; - +import java.util.Optional; import java.util.Properties; - import javax.mail.Session; import javax.mail.internet.MimeMessage; @@ -31,8 +29,6 @@ import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.MimeMessageBuilder; import org.junit.Test; -import com.google.common.base.Optional; - public class MimeMessageUtilsTest { @Test @@ -64,7 +60,7 @@ public class MimeMessageUtilsTest { Optional<String> subjectWithPrefix = new MimeMessageUtils(message).subjectWithPrefix(subjectPrefix, oldMail, subject); - assertThat(subjectWithPrefix).isAbsent(); + assertThat(subjectWithPrefix).isEmpty(); } @Test @@ -77,7 +73,7 @@ public class MimeMessageUtilsTest { Optional<String> subjectWithPrefix = new MimeMessageUtils(message).subjectWithPrefix(subjectPrefix, oldMail, subject); - assertThat(subjectWithPrefix).isAbsent(); + assertThat(subjectWithPrefix).isEmpty(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
