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 0802b688c62419afa86d1434c4c9aef1f5ded741 Author: Tran Tien Duc <[email protected]> AuthorDate: Tue Aug 27 17:13:55 2019 +0700 JAMES-2865 move MockSmtpBehaviors to model package --- .../org/apache/james/mock/smtp/server/HTTPConfigurationServer.java | 1 + .../org/apache/james/mock/smtp/server/SMTPBehaviorRepository.java | 2 ++ .../apache/james/mock/smtp/server/{ => model}/MockSmtpBehaviors.java | 4 +--- .../src/test/java/org/apache/james/mock/smtp/server/Fixture.java | 1 + .../java/org/apache/james/mock/smtp/server/MockSmtpBehaviorsTest.java | 1 + .../org/apache/james/mock/smtp/server/SMTPBehaviorRepositoryTest.java | 1 + .../org/apache/james/mock/smtp/server/model/MockSMTPBehaviorTest.java | 3 --- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/HTTPConfigurationServer.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/HTTPConfigurationServer.java index 2f04ec9..c25011f 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/HTTPConfigurationServer.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/HTTPConfigurationServer.java @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.james.http.jetty.Configuration; import org.apache.james.http.jetty.JettyHttpServer; +import org.apache.james.mock.smtp.server.model.MockSmtpBehaviors; import org.apache.james.util.Port; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/SMTPBehaviorRepository.java b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/SMTPBehaviorRepository.java index 23084cd..dddfb2a 100644 --- a/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/SMTPBehaviorRepository.java +++ b/server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/SMTPBehaviorRepository.java @@ -22,6 +22,8 @@ package org.apache.james.mock.smtp.server; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; +import org.apache.james.mock.smtp.server.model.MockSmtpBehaviors; + public class SMTPBehaviorRepository { private final AtomicReference<MockSmtpBehaviors> behaviors; 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/model/MockSmtpBehaviors.java similarity index 95% rename from server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/MockSmtpBehaviors.java rename to server/mailet/mock-smtp-server/src/main/java/org/apache/james/mock/smtp/server/model/MockSmtpBehaviors.java index b81528c..5efd902 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/model/MockSmtpBehaviors.java @@ -17,13 +17,11 @@ * 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.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/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 ac7b69e..8d1afdc 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 @@ -21,6 +21,7 @@ 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.MockSmtpBehaviors; 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; diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSmtpBehaviorsTest.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSmtpBehaviorsTest.java index d9647f3..166c2e8 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSmtpBehaviorsTest.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/MockSmtpBehaviorsTest.java @@ -25,6 +25,7 @@ import static org.apache.james.mock.smtp.server.Fixture.JSON_BEHAVIORS; import static org.apache.james.mock.smtp.server.Fixture.OBJECT_MAPPER; import static org.assertj.core.api.Assertions.assertThat; +import org.apache.james.mock.smtp.server.model.MockSmtpBehaviors; import org.junit.jupiter.api.Test; import net.javacrumbs.jsonunit.core.Option; diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/SMTPBehaviorRepositoryTest.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/SMTPBehaviorRepositoryTest.java index d610fc5..9419ebd 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/SMTPBehaviorRepositoryTest.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/SMTPBehaviorRepositoryTest.java @@ -23,6 +23,7 @@ import static org.apache.james.mock.smtp.server.Fixture.BEHAVIORS; import static org.apache.james.mock.smtp.server.Fixture.BEHAVIOR_COMPULSORY_FIELDS; import static org.assertj.core.api.Assertions.assertThat; +import org.apache.james.mock.smtp.server.model.MockSmtpBehaviors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/MockSMTPBehaviorTest.java b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/MockSMTPBehaviorTest.java index f1e6a63..44df764 100644 --- a/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/MockSMTPBehaviorTest.java +++ b/server/mailet/mock-smtp-server/src/test/java/org/apache/james/mock/smtp/server/model/MockSMTPBehaviorTest.java @@ -29,9 +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.apache.james.mock.smtp.server.model.Response.SMTPStatusCode; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
