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 1e07697082f063567316a3e297cc7b407bca438a Author: Tran Tien Duc <[email protected]> AuthorDate: Thu Aug 22 14:30:26 2019 +0700 JAMES-2865 move POJOs to new package --- .../james/mock/smtp/server/MockSmtpBehaviors.java | 2 + .../mock/smtp/server/{ => model}/Condition.java | 8 +-- .../james/mock/smtp/server/{ => model}/Mail.java | 71 ++++++++++++++++++++-- .../smtp/server/{ => model}/MockSMTPBehavior.java | 2 +- .../mock/smtp/server/{ => model}/Operator.java | 2 +- .../mock/smtp/server/{ => model}/Response.java | 14 ++--- .../mock/smtp/server/{ => model}/SMTPCommand.java | 4 +- .../org/apache/james/mock/smtp/server/Fixture.java | 6 ++ .../smtp/server/{ => model}/ConditionTest.java | 2 +- .../mock/smtp/server/{ => model}/MailTest.java | 2 +- .../server/{ => model}/MockSMTPBehaviorTest.java | 5 +- .../mock/smtp/server/{ => model}/OperatorTest.java | 2 +- .../mock/smtp/server/{ => model}/ResponseTest.java | 6 +- 13 files changed, 99 insertions(+), 27 deletions(-) diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSmtpBehaviors.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSmtpBehaviors.java index 7ebe28a..b81528c 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSmtpBehaviors.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSmtpBehaviors.java @@ -22,6 +22,8 @@ package org.apache.james.mock.smtp.server; import java.util.List; import java.util.Objects; +import org.apache.james.mock.smtp.server.model.MockSMTPBehavior; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.collect.ImmutableList; diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Condition.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Condition.java similarity index 95% rename from server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Condition.java rename to server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Condition.java index 523794b..96a91ab 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Condition.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Condition.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import java.util.Objects; import java.util.Optional; @@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.google.common.base.Preconditions; @JsonDeserialize(builder = Condition.Builder.class) -interface Condition { +public interface Condition { @JsonPOJOBuilder(withPrefix = "") class Builder { private Operator.OperatorName operator; @@ -79,7 +79,7 @@ interface Condition { private final Operator operator; private final String matchingValue; - OperatorCondition(Operator operator, String matchingValue) { + public OperatorCondition(Operator operator, String matchingValue) { Preconditions.checkNotNull(operator); Preconditions.checkNotNull(matchingValue); @@ -121,5 +121,5 @@ interface Condition { Condition MATCH_ALL = new MatchAllCondition(); - boolean matches(String line); + public boolean matches(String line); } diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Mail.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Mail.java similarity index 62% rename from server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Mail.java rename to server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Mail.java index e977334..a212386 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Mail.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Mail.java @@ -17,21 +17,47 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import java.util.List; import java.util.Objects; import org.apache.james.core.MailAddress; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +public class Mail { + public static class Envelope { + + public static class Builder { + private MailAddress from; + private ImmutableList.Builder<MailAddress> recipients; + + public Builder() { + recipients = new ImmutableList.Builder<>(); + } + + public Builder from(MailAddress from) { + this.from = from; + return this; + } + + public Builder addRecipient(MailAddress recipient) { + recipients.add(recipient); + return this; + } + + public Envelope build() { + return new Envelope(from, recipients.build()); + } + } -class Mail { - static class Envelope { private final MailAddress from; private final List<MailAddress> recipients; - Envelope(MailAddress from, List<MailAddress> recipients) { + public Envelope(MailAddress from, List<MailAddress> recipients) { Preconditions.checkNotNull(from); Preconditions.checkNotNull(recipients); Preconditions.checkArgument(!recipients.isEmpty(), "'recipients' field should not be empty"); @@ -63,12 +89,39 @@ class Mail { public final int hashCode() { return Objects.hash(from, recipients); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("from", from) + .add("recipients", recipients) + .toString(); + } + } + + public static class Builder { + private Envelope envelope; + private String message; + + public Builder message(String message) { + this.message = message; + return this; + } + + public Builder envelope(Envelope envelope) { + this.envelope = envelope; + return this; + } + + public Mail build() { + return new Mail(envelope, message); + } } private final Envelope envelope; private final String message; - Mail(Envelope envelope, String message) { + public Mail(Envelope envelope, String message) { Preconditions.checkNotNull(envelope); Preconditions.checkNotNull(message); @@ -99,4 +152,12 @@ class Mail { public final int hashCode() { return Objects.hash(envelope, message); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("envelope", envelope) + .add("message", message) + .toString(); + } } 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/model/MockSMTPBehavior.java similarity index 99% rename from server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSMTPBehavior.java rename to server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/MockSMTPBehavior.java index f49f92d..9dbb66c 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/model/MockSMTPBehavior.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import java.util.Objects; import java.util.Optional; diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Operator.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Operator.java similarity index 98% rename from server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Operator.java rename to server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Operator.java index d56e04c..6e44451 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Operator.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Operator.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import java.util.Arrays; import java.util.Optional; diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Response.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Response.java similarity index 94% rename from server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Response.java rename to server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Response.java index 04f3ea0..341c496 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/Response.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/Response.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import java.util.Arrays; import java.util.Objects; @@ -27,8 +27,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.Preconditions; -class Response { - enum SMTPStatusCode { +public class Response { + public enum SMTPStatusCode { OK_200(200), SYSTEM_STATUS_211(211), HELP_214(214), @@ -70,7 +70,7 @@ class Response { } @JsonValue - public int getCode() { + public int getRawCode() { return code; } } @@ -99,12 +99,12 @@ class Response { this.serverRejected = serverRejected; } - String asReplyString() { - return code.getCode() + " " + message; + public String asReplyString() { + return code.getRawCode() + " " + message; } @JsonProperty("rejected") - boolean isServerRejected() { + public boolean isServerRejected() { return serverRejected; } diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/SMTPCommand.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/SMTPCommand.java similarity index 96% rename from server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/SMTPCommand.java rename to server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/SMTPCommand.java index 60a2a76..7b156f6 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/SMTPCommand.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/SMTPCommand.java @@ -17,14 +17,14 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -enum SMTPCommand { +public enum SMTPCommand { RCPT_TO("RCPT TO"), EHLO("EHLO"), MAIL_FROM("MAIL FROM"), 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 fe1ff47..34cf335 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,6 +19,12 @@ package org.apache.james.mock.smtp.server; +import org.apache.james.mock.smtp.server.model.Condition; +import org.apache.james.mock.smtp.server.model.MockSMTPBehavior; +import org.apache.james.mock.smtp.server.model.Operator; +import org.apache.james.mock.smtp.server.model.Response; +import org.apache.james.mock.smtp.server.model.SMTPCommand; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.guava.GuavaModule; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/ConditionTest.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/ConditionTest.java similarity index 99% rename from server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/ConditionTest.java rename to server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/ConditionTest.java index c16c299..693a5c3 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/ConditionTest.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/ConditionTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.mock.smtp.server.Fixture.OBJECT_MAPPER; diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MailTest.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/MailTest.java similarity index 98% rename from server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MailTest.java rename to server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/MailTest.java index b21082f..b9d695a 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MailTest.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/MailTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import static org.assertj.core.api.Assertions.assertThatThrownBy; 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/model/MockSMTPBehaviorTest.java similarity index 97% rename from server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSMTPBehaviorTest.java rename to server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/MockSMTPBehaviorTest.java index 7bcc95e..f1e6a63 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/model/MockSMTPBehaviorTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.mock.smtp.server.Fixture.BEHAVIOR_ALL_FIELDS; @@ -29,6 +29,9 @@ 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.apache.james.mock.smtp.server.model.Response.SMTPStatusCode; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/OperatorTest.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/OperatorTest.java similarity index 98% rename from server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/OperatorTest.java rename to server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/OperatorTest.java index bd2eedd..5677f4e 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/OperatorTest.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/OperatorTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/ResponseTest.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/ResponseTest.java similarity index 96% rename from server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/ResponseTest.java rename to server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/ResponseTest.java index e07e819..4f7c985 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/ResponseTest.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/ResponseTest.java @@ -17,14 +17,14 @@ * under the License. * ****************************************************************/ -package org.apache.james.mock.smtp.server; +package org.apache.james.mock.smtp.server.model; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.mock.smtp.server.Fixture.OBJECT_MAPPER; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.apache.james.mock.smtp.server.Response.SMTPStatusCode; +import org.apache.james.mock.smtp.server.model.Response.SMTPStatusCode; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -68,7 +68,7 @@ class ResponseTest { @Test void getCodeShouldReturnInternalValue() { - assertThat(OK_250.getCode()) + assertThat(OK_250.getRawCode()) .isEqualTo(OK_250_CODE); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
