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
The following commit(s) were added to refs/heads/master by this push:
new 3e72483 JAMES-3539 Fix PushListenerTest after breaking merge on
master branch
3e72483 is described below
commit 3e72483a0966a7fedbc747ecf47cccf56d6893d1
Author: Rene Cordier <[email protected]>
AuthorDate: Mon Nov 1 13:06:18 2021 +0700
JAMES-3539 Fix PushListenerTest after breaking merge on master branch
---
.../org/apache/james/jmap/pushsubscription/PushListenerTest.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushListenerTest.scala
b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushListenerTest.scala
index b962dc3..b7880eb 100644
---
a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushListenerTest.scala
+++
b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/pushsubscription/PushListenerTest.scala
@@ -23,7 +23,6 @@ import java.nio.charset.StandardCharsets
import java.security.interfaces.{ECPrivateKey, ECPublicKey}
import java.time.Clock
import java.util.{Base64, UUID}
-
import com.google.common.collect.ImmutableSet
import com.google.common.hash.Hashing
import com.google.crypto.tink.apps.webpush.WebPushHybridDecrypt
@@ -31,9 +30,10 @@ import com.google.crypto.tink.subtle.EllipticCurves.CurveType
import com.google.crypto.tink.subtle.{EllipticCurves, Random}
import org.apache.james.core.Username
import org.apache.james.events.Event.EventId
+import org.apache.james.jmap.api.change.TypeStateFactory
import org.apache.james.jmap.api.model.{DeviceClientId,
PushSubscriptionCreationRequest, PushSubscriptionKeys,
PushSubscriptionServerURL, TypeName}
import org.apache.james.jmap.api.pushsubscription.PushSubscriptionRepository
-import org.apache.james.jmap.change.{EmailDeliveryTypeName, EmailTypeName,
MailboxTypeName, StateChangeEvent, TypeStateFactory}
+import org.apache.james.jmap.change.{EmailDeliveryTypeName, EmailTypeName,
MailboxTypeName, StateChangeEvent}
import org.apache.james.jmap.core.UuidState
import org.apache.james.jmap.json.PushSerializer
import
org.apache.james.jmap.memory.pushsubscription.MemoryPushSubscriptionRepository
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
