From b5c772bad19c885dec3a5c12620eec659358e65e Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Wed, 9 Oct 2024 16:41:52 +0200 Subject: [PATCH] mima and converter --- .../1.3.0-M1.backwards.excludes/SkipBacktracking.excludes | 2 ++ .../r2dbc/query/EventsBySliceBacktrackingSpec.scala | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 core/src/main/mima-filters/1.3.0-M1.backwards.excludes/SkipBacktracking.excludes diff --git a/core/src/main/mima-filters/1.3.0-M1.backwards.excludes/SkipBacktracking.excludes b/core/src/main/mima-filters/1.3.0-M1.backwards.excludes/SkipBacktracking.excludes new file mode 100644 index 00000000..600ff835 --- /dev/null +++ b/core/src/main/mima-filters/1.3.0-M1.backwards.excludes/SkipBacktracking.excludes @@ -0,0 +1,2 @@ +# internals +ProblemFilters.exclude[Problem]("akka.persistence.r2dbc.internal.BySliceQuery#QueryState*") diff --git a/core/src/test/scala/akka/persistence/r2dbc/query/EventsBySliceBacktrackingSpec.scala b/core/src/test/scala/akka/persistence/r2dbc/query/EventsBySliceBacktrackingSpec.scala index 554d635a..98c45712 100644 --- a/core/src/test/scala/akka/persistence/r2dbc/query/EventsBySliceBacktrackingSpec.scala +++ b/core/src/test/scala/akka/persistence/r2dbc/query/EventsBySliceBacktrackingSpec.scala @@ -37,7 +37,7 @@ import akka.persistence.typed.PersistenceId import akka.serialization.SerializationExtension import akka.stream.testkit.TestSubscriber import akka.stream.testkit.scaladsl.TestSink -import akka.util.JavaDurationConverters._ +import scala.jdk.DurationConverters._ object EventsBySliceBacktrackingSpec { private val BufferSize = 10 // small buffer for testing @@ -289,7 +289,7 @@ class EventsBySliceBacktrackingSpec // no backtracking result1.expectNoMessage() - val now = InstantFactory.now().minus(settings.querySettings.backtrackingBehindCurrentTime.asJava) + val now = InstantFactory.now().minus(settings.querySettings.backtrackingBehindCurrentTime.toJava) writeEvent(slice1, pid1, 101, now, "e1-101") writeEvent(slice2, pid2, 101, now.plusMillis(1), "e2-101") @@ -373,7 +373,7 @@ class EventsBySliceBacktrackingSpec val timeZero = InstantFactory .now() .truncatedTo(ChronoUnit.SECONDS) - .minus(settings.querySettings.backtrackingBehindCurrentTime.asJava) + .minus(settings.querySettings.backtrackingBehindCurrentTime.toJava) .minusSeconds(10) // events around the buffer size (of 10) will share the same timestamp