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 5d7b4e4634140988368c4b2d2104444c5e9809b9 Author: Tran Tien Duc <[email protected]> AuthorDate: Fri Mar 27 11:01:34 2020 +0700 JAMES-2891 moving common classes into a common module --- pom.xml | 5 +++++ .../java/org/apache/james/jmap/http/AuthenticationRoutes.java | 2 +- .../src/main/java/org/apache/james/jmap/http/DownloadRoutes.java | 2 +- .../src/main/java/org/apache/james/jmap/http/JMAPApiRoutes.java | 2 +- .../src/main/java/org/apache/james/jmap/http/UploadRoutes.java | 2 +- .../test/java/org/apache/james/jmap/http/AuthenticatorTest.java | 2 +- .../http/QueryParameterAccessTokenAuthenticationStrategyTest.java | 2 -- server/protocols/jmap/pom.xml | 8 ++++++++ .../jmap/src/main/java/org/apache/james/jmap/JMAPRoutes.java | 4 ++-- .../org/apache/james/jmap}/exceptions/UnauthorizedException.java | 2 +- .../java/org/apache/james/jmap/http/AuthenticationStrategy.java | 0 .../src/main/java/org/apache/james/jmap/http/Authenticator.java | 2 +- 12 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index ac8afa0..a30cb9b 100644 --- a/pom.xml +++ b/pom.xml @@ -1516,6 +1516,11 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>james-server-jmap</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-server-jmap-draft</artifactId> <version>${project.version}</version> </dependency> diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/AuthenticationRoutes.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/AuthenticationRoutes.java index 70b0490..f824da2 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/AuthenticationRoutes.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/AuthenticationRoutes.java @@ -52,13 +52,13 @@ import org.apache.james.jmap.draft.api.SimpleTokenFactory; import org.apache.james.jmap.draft.api.SimpleTokenManager; import org.apache.james.jmap.draft.exceptions.BadRequestException; import org.apache.james.jmap.draft.exceptions.InternalErrorException; -import org.apache.james.jmap.draft.exceptions.UnauthorizedException; import org.apache.james.jmap.draft.json.MultipleObjectMapperBuilder; import org.apache.james.jmap.draft.model.AccessTokenRequest; import org.apache.james.jmap.draft.model.AccessTokenResponse; import org.apache.james.jmap.draft.model.ContinuationTokenRequest; import org.apache.james.jmap.draft.model.ContinuationTokenResponse; import org.apache.james.jmap.draft.model.EndPointsResponse; +import org.apache.james.jmap.exceptions.UnauthorizedException; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DownloadRoutes.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DownloadRoutes.java index 8ac0bc3..21ac5a9 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DownloadRoutes.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/DownloadRoutes.java @@ -43,9 +43,9 @@ import org.apache.james.jmap.JMAPRoutes; import org.apache.james.jmap.draft.api.SimpleTokenFactory; import org.apache.james.jmap.draft.exceptions.BadRequestException; import org.apache.james.jmap.draft.exceptions.InternalErrorException; -import org.apache.james.jmap.draft.exceptions.UnauthorizedException; import org.apache.james.jmap.draft.model.AttachmentAccessToken; import org.apache.james.jmap.draft.utils.DownloadPath; +import org.apache.james.jmap.exceptions.UnauthorizedException; import org.apache.james.mailbox.BlobManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.BlobNotFoundException; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/JMAPApiRoutes.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/JMAPApiRoutes.java index 7454afe..68c51c4 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/JMAPApiRoutes.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/JMAPApiRoutes.java @@ -36,11 +36,11 @@ import org.apache.james.jmap.JMAPRoute; import org.apache.james.jmap.JMAPRoutes; import org.apache.james.jmap.draft.exceptions.BadRequestException; import org.apache.james.jmap.draft.exceptions.InternalErrorException; -import org.apache.james.jmap.draft.exceptions.UnauthorizedException; import org.apache.james.jmap.draft.methods.RequestHandler; import org.apache.james.jmap.draft.model.AuthenticatedRequest; import org.apache.james.jmap.draft.model.InvocationRequest; import org.apache.james.jmap.draft.model.InvocationResponse; +import org.apache.james.jmap.exceptions.UnauthorizedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.metrics.api.MetricFactory; import org.slf4j.Logger; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/UploadRoutes.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/UploadRoutes.java index 6788c69..5629608 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/UploadRoutes.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/UploadRoutes.java @@ -40,8 +40,8 @@ import org.apache.james.jmap.JMAPRoute; import org.apache.james.jmap.JMAPRoutes; import org.apache.james.jmap.draft.exceptions.BadRequestException; import org.apache.james.jmap.draft.exceptions.InternalErrorException; -import org.apache.james.jmap.draft.exceptions.UnauthorizedException; import org.apache.james.jmap.draft.model.UploadResponse; +import org.apache.james.jmap.exceptions.UnauthorizedException; import org.apache.james.mailbox.AttachmentManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.model.Attachment; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/AuthenticatorTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/AuthenticatorTest.java index 9f31ec7..0d614ed 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/AuthenticatorTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/AuthenticatorTest.java @@ -31,7 +31,7 @@ import org.apache.james.core.Username; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.api.access.AccessTokenRepository; import org.apache.james.jmap.draft.exceptions.MailboxSessionCreationException; -import org.apache.james.jmap.draft.exceptions.UnauthorizedException; +import org.apache.james.jmap.exceptions.UnauthorizedException; import org.apache.james.jmap.memory.access.MemoryAccessTokenRepository; import org.apache.james.mailbox.MailboxSession; import org.apache.james.metrics.tests.RecordingMetricFactory; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/QueryParameterAccessTokenAuthenticationStrategyTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/QueryParameterAccessTokenAuthenticationStrategyTest.java index ad06819..3895c58 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/QueryParameterAccessTokenAuthenticationStrategyTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/QueryParameterAccessTokenAuthenticationStrategyTest.java @@ -19,12 +19,10 @@ package org.apache.james.jmap.http; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.apache.james.jmap.draft.api.SimpleTokenManager; -import org.apache.james.jmap.draft.exceptions.UnauthorizedException; import org.apache.james.mailbox.MailboxManager; import org.junit.Before; import org.junit.Test; diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index e7b7e0b..d39f9e5 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -32,6 +32,10 @@ <dependencies> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>apache-james-mailbox-api</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>james-core</artifactId> </dependency> <dependency> @@ -44,6 +48,10 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> + <artifactId>metrics-api</artifactId> + </dependency> + <dependency> + <groupId>${james.groupId}</groupId> <artifactId>testing-base</artifactId> <scope>test</scope> </dependency> diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPRoutes.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPRoutes.java index f2a8b09..3ef6302 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPRoutes.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPRoutes.java @@ -48,12 +48,12 @@ public interface JMAPRoutes { return response.status(INTERNAL_SERVER_ERROR).send(); } - default Mono<Void> handleBadRequest(HttpServerResponse response, Exception e) { + default Mono<Void> handleBadRequest(HttpServerResponse response, Throwable e) { logger().warn("Invalid request received.", e); return response.status(BAD_REQUEST).send(); } - default Mono<Void> handleAuthenticationFailure(HttpServerResponse response, Exception e) { + default Mono<Void> handleAuthenticationFailure(HttpServerResponse response, Throwable e) { logger().warn("Unauthorized", e); return response.status(UNAUTHORIZED).send(); } diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/exceptions/UnauthorizedException.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/exceptions/UnauthorizedException.java similarity index 96% rename from server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/exceptions/UnauthorizedException.java rename to server/protocols/jmap/src/main/java/org/apache/james/jmap/exceptions/UnauthorizedException.java index 464abe3..b9fd26a 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/exceptions/UnauthorizedException.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/exceptions/UnauthorizedException.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft.exceptions; +package org.apache.james.jmap.exceptions; public class UnauthorizedException extends RuntimeException { public UnauthorizedException() { diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/AuthenticationStrategy.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/http/AuthenticationStrategy.java similarity index 100% rename from server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/AuthenticationStrategy.java rename to server/protocols/jmap/src/main/java/org/apache/james/jmap/http/AuthenticationStrategy.java diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/Authenticator.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/http/Authenticator.java similarity index 97% rename from server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/Authenticator.java rename to server/protocols/jmap/src/main/java/org/apache/james/jmap/http/Authenticator.java index 20ca13a..6f9bc98 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/http/Authenticator.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/http/Authenticator.java @@ -22,7 +22,7 @@ import java.util.List; import javax.inject.Inject; -import org.apache.james.jmap.draft.exceptions.UnauthorizedException; +import org.apache.james.jmap.exceptions.UnauthorizedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.metrics.api.MetricFactory; import org.slf4j.Logger; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
