This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b2f0789afac251cc65f8e01fcda4fbf912edd9b6 Author: Benoit Tellier <[email protected]> AuthorDate: Tue Aug 27 10:16:52 2019 +0700 JAMES-2866 Avoid relying on Optional now that we have the matchAll condition --- .../james/mock/smtp/server/MockSMTPBehavior.java | 21 +++++++++++++++------ .../org/apache/james/mock/smtp/server/Fixture.java | 7 +++---- .../mock/smtp/server/MockSMTPBehaviorTest.java | 8 +++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSMTPBehavior.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSMTPBehavior.java index 2d8596a..f49f92d 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSMTPBehavior.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSMTPBehavior.java @@ -72,12 +72,11 @@ public class MockSMTPBehavior { @JsonPOJOBuilder(withPrefix = "") public static class Builder { private SMTPCommand smtpCommand; - private Optional<Condition> condition; + private Condition condition; private Response response; private Optional<NumberOfAnswersPolicy> numberOfAnswers; public Builder() { - condition = Optional.empty(); numberOfAnswers = Optional.empty(); } @@ -92,7 +91,7 @@ public class MockSMTPBehavior { } public Builder condition(Condition condition) { - this.condition = Optional.of(condition); + this.condition = condition; return this; } @@ -114,11 +113,11 @@ public class MockSMTPBehavior { } private final SMTPCommand smtpCommand; - private final Optional<Condition> condition; + private final Condition condition; private final Response response; private final NumberOfAnswersPolicy numberOfAnswers; - public MockSMTPBehavior(SMTPCommand smtpCommand, Optional<Condition> condition, Response response, NumberOfAnswersPolicy numberOfAnswers) { + public MockSMTPBehavior(SMTPCommand smtpCommand, Condition condition, Response response, NumberOfAnswersPolicy numberOfAnswers) { Preconditions.checkNotNull(smtpCommand); Preconditions.checkNotNull(condition); Preconditions.checkNotNull(response); @@ -134,7 +133,7 @@ public class MockSMTPBehavior { return smtpCommand; } - public Optional<Condition> getCondition() { + public Condition getCondition() { return condition; } @@ -163,4 +162,14 @@ public class MockSMTPBehavior { public final int hashCode() { return Objects.hash(smtpCommand, condition, response, numberOfAnswers); } + + @Override + public String toString() { + return "MockSMTPBehavior{" + + "smtpCommand=" + smtpCommand + + ", condition=" + condition + + ", response=" + response + + ", numberOfAnswers=" + numberOfAnswers + + '}'; + } } diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/Fixture.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/Fixture.java index 3178766..fe1ff47 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/Fixture.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/Fixture.java @@ -19,8 +19,6 @@ package org.apache.james.mock.smtp.server; -import java.util.Optional; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.guava.GuavaModule; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; @@ -34,13 +32,14 @@ public interface Fixture { Response RESPONSE = Response.serverAccept(Response.SMTPStatusCode.of(250), "message"); String JSON_BEHAVIOR_COMPULSORY_FIELDS = "{" + + " \"condition\": {\"operator\":\"matchAll\"}," + " \"response\": {\"code\":250, \"message\":\"OK\", \"rejected\":false}," + " \"command\": \"EHLO\"" + "}"; MockSMTPBehavior BEHAVIOR_COMPULSORY_FIELDS = new MockSMTPBehavior( SMTPCommand.EHLO, - Optional.empty(), + Condition.MATCH_ALL, Response.serverAccept(Response.SMTPStatusCode.ACTION_COMPLETE_250, "OK"), MockSMTPBehavior.NumberOfAnswersPolicy.anytime()); @@ -53,7 +52,7 @@ public interface Fixture { MockSMTPBehavior BEHAVIOR_ALL_FIELDS = new MockSMTPBehavior( SMTPCommand.EHLO, - Optional.of(new Condition.OperatorCondition(Operator.CONTAINS, "matchme")), + new Condition.OperatorCondition(Operator.CONTAINS, "matchme"), Response.serverAccept(Response.SMTPStatusCode.of(250), "OK"), MockSMTPBehavior.NumberOfAnswersPolicy.times(7)); diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSMTPBehaviorTest.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSMTPBehaviorTest.java index 7a3f7cb..7bcc95e 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSMTPBehaviorTest.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSMTPBehaviorTest.java @@ -29,8 +29,6 @@ import static org.apache.james.mock.smtp.server.Fixture.RESPONSE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Optional; - import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -80,7 +78,7 @@ class MockSMTPBehaviorTest { @Test void constructorShouldThrowWhenCommandIsNull() { - assertThatThrownBy(() -> new MockSMTPBehavior(null, Optional.empty(), RESPONSE, MockSMTPBehavior.NumberOfAnswersPolicy.anytime())) + assertThatThrownBy(() -> new MockSMTPBehavior(null, Condition.MATCH_ALL, RESPONSE, MockSMTPBehavior.NumberOfAnswersPolicy.anytime())) .isInstanceOf(NullPointerException.class); } @@ -92,13 +90,13 @@ class MockSMTPBehaviorTest { @Test void constructorShouldThrowWhenResponseIsNull() { - assertThatThrownBy(() -> new MockSMTPBehavior(SMTPCommand.NOOP, Optional.empty(), null, MockSMTPBehavior.NumberOfAnswersPolicy.anytime())) + assertThatThrownBy(() -> new MockSMTPBehavior(SMTPCommand.NOOP, Condition.MATCH_ALL, null, MockSMTPBehavior.NumberOfAnswersPolicy.anytime())) .isInstanceOf(NullPointerException.class); } @Test void constructorShouldThrowWhenNumberOfAnswersIsNull() { - assertThatThrownBy(() -> new MockSMTPBehavior(SMTPCommand.NOOP, Optional.empty(), RESPONSE, null)) + assertThatThrownBy(() -> new MockSMTPBehavior(SMTPCommand.NOOP, Condition.MATCH_ALL, RESPONSE, null)) .isInstanceOf(NullPointerException.class); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
