Repository: james-project Updated Branches: refs/heads/master aba9b9213 -> 57edcaa4f
JAMES-1788 Advertise the new JMAP Upload endpoint Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/447b5dc8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/447b5dc8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/447b5dc8 Branch: refs/heads/master Commit: 447b5dc882b94b103792c8a359032a7a7511e224 Parents: bdd8415 Author: Raphael Ouazana <raphael.ouaz...@linagora.com> Authored: Thu Jun 30 17:08:19 2016 +0200 Committer: Raphael Ouazana <raphael.ouaz...@linagora.com> Committed: Mon Jul 4 14:57:37 2016 +0200 ---------------------------------------------------------------------- .../test/java/org/apache/james/jmap/JMAPAuthenticationTest.java | 4 ++-- .../main/java/org/apache/james/jmap/AuthenticationServlet.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/447b5dc8/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java index 60ccaf9..cd17481 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java @@ -285,7 +285,7 @@ public abstract class JMAPAuthenticationTest { .body("accessToken", isA(String.class)) .body("api", equalTo("/jmap")) .body("eventSource", both(isA(String.class)).and(notNullValue())) - .body("upload", both(isA(String.class)).and(notNullValue())) + .body("upload", equalTo("/upload")) .body("download", equalTo("/download")); } @@ -321,7 +321,7 @@ public abstract class JMAPAuthenticationTest { .statusCode(200) .body("api", equalTo("/jmap")) .body("eventSource", both(isA(String.class)).and(notNullValue())) - .body("upload", both(isA(String.class)).and(notNullValue())) + .body("upload", equalTo("/upload")) .body("download", equalTo("/download")); } http://git-wip-us.apache.org/repos/asf/james-project/blob/447b5dc8/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java index 06c5395..7b0e187 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java @@ -184,7 +184,7 @@ public class AuthenticationServlet extends HttpServlet { .accessToken(accessTokenManager.grantAccessToken(username)) .api(JMAPUrls.JMAP) .eventSource("/notImplemented") - .upload("/notImplemented") + .upload(JMAPUrls.UPLOAD) .download(JMAPUrls.DOWNLOAD) .build(); mapper.writeValue(resp.getOutputStream(), response); @@ -197,7 +197,7 @@ public class AuthenticationServlet extends HttpServlet { .builder() .api(JMAPUrls.JMAP) .eventSource("/notImplemented") - .upload("/notImplemented") + .upload(JMAPUrls.UPLOAD) .download(JMAPUrls.DOWNLOAD) .build(); mapper.writeValue(resp.getOutputStream(), response); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
