You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/05/09 21:07:17 UTC
[incubator-pekko-persistence-jdbc] branch main updated: Apply compat changes from latest Pekko
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-jdbc.git
The following commit(s) were added to refs/heads/main by this push:
new e6f717e Apply compat changes from latest Pekko
e6f717e is described below
commit e6f717eb9747826f1ff256d59c164123a60ec828
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Tue May 9 22:06:29 2023 +0200
Apply compat changes from latest Pekko
---
.../jdbc/state/javadsl/JdbcDurableStateStore.scala | 15 +++++++--------
.../persistence/jdbc/testkit/javadsl/SchemaUtils.scala | 9 ++++-----
project/Dependencies.scala | 2 +-
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/javadsl/JdbcDurableStateStore.scala b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/javadsl/JdbcDurableStateStore.scala
index 85da113..ba1400b 100644
--- a/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/javadsl/JdbcDurableStateStore.scala
+++ b/core/src/main/scala/org/apache/pekko/persistence/jdbc/state/javadsl/JdbcDurableStateStore.scala
@@ -16,7 +16,6 @@ package org.apache.pekko.persistence.jdbc.state.javadsl
import java.util.Optional
import java.util.concurrent.CompletionStage
-import scala.compat.java8.FutureConverters._
import scala.concurrent.ExecutionContext
import org.apache.pekko
import pekko.annotation.ApiMayChange
@@ -28,6 +27,7 @@ import pekko.persistence.query.{ DurableStateChange, Offset }
import pekko.persistence.query.javadsl.DurableStateStoreQuery
import pekko.persistence.state.javadsl.{ DurableStateUpdateStore, GetObjectResult }
import pekko.stream.javadsl.Source
+import pekko.util.FutureConverters._
import slick.jdbc.JdbcProfile
object JdbcDurableStateStore {
@@ -48,19 +48,18 @@ class JdbcDurableStateStore[A](
val queries = new DurableStateQueries(profile, durableStateConfig)
def getObject(persistenceId: String): CompletionStage[GetObjectResult[A]] =
- toJava(
- scalaStore
- .getObject(persistenceId)
- .map(x => GetObjectResult(Optional.ofNullable(x.value.getOrElse(null.asInstanceOf[A])), x.revision)))
+ scalaStore
+ .getObject(persistenceId)
+ .map(x => GetObjectResult(Optional.ofNullable(x.value.getOrElse(null.asInstanceOf[A])), x.revision)).asJava
def upsertObject(persistenceId: String, revision: Long, value: A, tag: String): CompletionStage[Done] =
- toJava(scalaStore.upsertObject(persistenceId, revision, value, tag))
+ scalaStore.upsertObject(persistenceId, revision, value, tag).asJava
def deleteObject(persistenceId: String): CompletionStage[Done] =
- toJava(scalaStore.deleteObject(persistenceId))
+ scalaStore.deleteObject(persistenceId).asJava
def deleteObject(persistenceId: String, revision: Long): CompletionStage[Done] =
- toJava(scalaStore.deleteObject(persistenceId, revision))
+ scalaStore.deleteObject(persistenceId, revision).asJava
def currentChanges(tag: String, offset: Offset): Source[DurableStateChange[A], NotUsed] =
scalaStore.currentChanges(tag, offset).asJava
diff --git a/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/javadsl/SchemaUtils.scala b/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/javadsl/SchemaUtils.scala
index 164f9ef..c049239 100644
--- a/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/javadsl/SchemaUtils.scala
+++ b/core/src/main/scala/org/apache/pekko/persistence/jdbc/testkit/javadsl/SchemaUtils.scala
@@ -16,13 +16,12 @@ package org.apache.pekko.persistence.jdbc.testkit.javadsl
import java.util.concurrent.CompletionStage
-import scala.compat.java8.FutureConverters._
-
import org.apache.pekko
import pekko.Done
import pekko.actor.ClassicActorSystemProvider
import pekko.annotation.ApiMayChange
import pekko.persistence.jdbc.testkit.internal.SchemaUtilsImpl
+import pekko.util.FutureConverters._
import org.slf4j.LoggerFactory
object SchemaUtils {
@@ -63,7 +62,7 @@ object SchemaUtils {
*/
@ApiMayChange
def dropIfExists(configKey: String, actorSystem: ClassicActorSystemProvider): CompletionStage[Done] =
- SchemaUtilsImpl.dropIfExists(configKey, logger)(actorSystem).toJava
+ SchemaUtilsImpl.dropIfExists(configKey, logger)(actorSystem).asJava
/**
* Creates the schema for both the journal and the snapshot table using the default schema definition.
@@ -99,7 +98,7 @@ object SchemaUtils {
*/
@ApiMayChange
def createIfNotExists(configKey: String, actorSystem: ClassicActorSystemProvider): CompletionStage[Done] =
- SchemaUtilsImpl.createIfNotExists(configKey, logger)(actorSystem).toJava
+ SchemaUtilsImpl.createIfNotExists(configKey, logger)(actorSystem).asJava
/**
* This method can be used to load alternative DDL scripts.
@@ -135,5 +134,5 @@ object SchemaUtils {
separator: String,
configKey: String,
actorSystem: ClassicActorSystemProvider): CompletionStage[Done] =
- SchemaUtilsImpl.applyScript(script, separator, configKey, logger)(actorSystem).toJava
+ SchemaUtilsImpl.applyScript(script, separator, configKey, logger)(actorSystem).asJava
}
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 4988476..0de3f51 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -15,7 +15,7 @@ object Dependencies {
val Scala213 = "2.13.10"
val ScalaVersions = Seq(Scala212, Scala213)
- val PekkoVersion = "0.0.0+26623-85c2a469-SNAPSHOT"
+ val PekkoVersion = "0.0.0+26656-898c6970-SNAPSHOT"
val SlickVersion = "3.3.3"
val ScalaTestVersion = "3.2.10"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org