You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2020/10/19 03:24:50 UTC
[james-project] 03/03: JAMES-3413 Revert changes to JMAPApiRoutes
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 715dd582cb7291356e6bb37b6813d0c0298c64ec
Author: LanKhuat <dl...@linagora.com>
AuthorDate: Thu Oct 15 17:44:32 2020 +0700
JAMES-3413 Revert changes to JMAPApiRoutes
---
.../src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala
index a945c21..626528f 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala
@@ -162,8 +162,9 @@ class JMAPApiRoutes (val authenticator: Authenticator,
private def processMethodWithMatchName(capabilities: Set[CapabilityIdentifier], invocation: InvocationWithContext, mailboxSession: MailboxSession): SMono[InvocationWithContext] =
SMono.justOrEmpty(methodsByName.get(invocation.invocation.methodName))
- .filter(method => validateCapabilities(capabilities, method.requiredCapabilities).isRight)
- .flatMap(method => SMono.fromPublisher(method.process(capabilities, invocation, mailboxSession)))
+ .flatMap(method => validateCapabilities(capabilities, method.requiredCapabilities)
+ .fold(e => SMono.just(InvocationWithContext(Invocation.error(ErrorCode.UnknownMethod, e.description, invocation.invocation.methodCallId), invocation.processingContext)),
+ _ => SMono.fromPublisher(method.process(capabilities, invocation, mailboxSession))))
.onErrorResume(throwable => SMono.just(InvocationWithContext(Invocation.error(ErrorCode.ServerFail, throwable.getMessage, invocation.invocation.methodCallId), invocation.processingContext)))
.switchIfEmpty(SMono.just(InvocationWithContext(Invocation.error(ErrorCode.UnknownMethod, invocation.invocation.methodCallId), invocation.processingContext)))
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org