Skip to content

JAMES-3534 Avoid blocking calls in Identity/set #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chibenwa merged 1 commit into from
May 9, 2022
+5 −3
Merged

JAMES-3534 Avoid blocking calls in Identity/set #992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .../data/data-jmap/src/main/scala/org/apache/james/jmap/api/identity/CustomIdentityDAO.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

package org.apache.james.jmap.api.identity

import java.nio.charset.StandardCharsets
import java.util.UUID

import javax.inject.Inject
import org.apache.james.core.{MailAddress, Username}
import org.apache.james.jmap.api.model.{EmailAddress, ForbiddenSendFromException, HtmlSignature, Identity, IdentityId, IdentityName, MayDeleteIdentity, TextSignature}
import org.apache.james.rrt.api.CanSendFrom
Expand All @@ -27,9 +31,6 @@ import org.reactivestreams.Publisher
import reactor.core.scala.publisher.{SFlux, SMono}
import reactor.core.scheduler.Schedulers

import java.nio.charset.StandardCharsets
import java.util.UUID
import javax.inject.Inject
import scala.jdk.StreamConverters._
import scala.util.Try

Expand Down Expand Up @@ -158,6 +159,7 @@ class IdentityRepository @Inject()(customIdentityDao: CustomIdentityDAO, identit
def update(user: Username, identityId: IdentityId, identityUpdateRequest: IdentityUpdateRequest): Publisher[Unit] = {
val findServerSetIdentity: SMono[Option[Identity]] = SMono.fromCallable(() => identityFactory.listIdentities(user)
.find(identity => identity.id.equals(identityId)))
.subscribeOn(Schedulers.elastic)
val findCustomIdentity: SMono[Option[Identity]] = SMono(customIdentityDao.findByIdentityId(user, identityId))
.map(Some(_))
.switchIfEmpty(SMono.just(None))
Expand Down