Skip to content

Commit 0537a73

Browse files
sebastian-alferssebastian-alfers
authored
bump: update akka to 2.10.0-M1 (#84)
1 parent fcb55ac commit 0537a73

23 files changed

+94
-113
lines changed

‎.jvmopts

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎core/src/main/scala/akka/persistence/dynamodb/cleanup/scaladsl/EventSourcedCleanup.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import scala.util.Success
1515
import akka.Done
1616
import akka.actor.ClassicActorSystemProvider
1717
import akka.actor.typed.ActorSystem
18-
import akka.actor.typed.scaladsl.LoggerOps
1918
import akka.annotation.ApiMayChange
2019
import akka.annotation.InternalApi
2120
import akka.persistence.SnapshotSelectionCriteria
@@ -549,7 +548,7 @@ final class EventSourcedCleanup(systemProvider: ClassicActorSystemProvider, conf
549548
case pid :: tail =>
550549
pidOperation(pid).flatMap { _ =>
551550
if (n % settings.cleanupSettings.logProgressEvery == 0)
552-
log.infoN("Cleanup {} [{}] of [{}].", operationName, n, size)
551+
log.info("Cleanup {} [{}] of [{}].", operationName, n, size)
553552
loop(tail, n + 1)
554553
}
555554
}
@@ -559,7 +558,7 @@ final class EventSourcedCleanup(systemProvider: ClassicActorSystemProvider, conf
559558

560559
result.onComplete {
561560
case Success(_) =>
562-
log.info2("Cleanup completed {} of [{}] persistenceId.", operationName, size)
561+
log.info("Cleanup completed {} of [{}] persistenceId.", operationName, size)
563562
case Failure(e) =>
564563
log.error(s"Cleanup {$operationName} failed.", e)
565564
}

‎core/src/main/scala/akka/persistence/dynamodb/internal/BySliceQuery.scala

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import scala.concurrent.ExecutionContext
1111
import scala.concurrent.duration.FiniteDuration
1212

1313
import akka.NotUsed
14-
import akka.actor.typed.scaladsl.LoggerOps
1514
import akka.annotation.InternalApi
1615
import akka.persistence.dynamodb.DynamoDBSettings
1716
import akka.persistence.query.Offset
@@ -118,7 +117,7 @@ import org.slf4j.Logger
118117
}
119118

120119
if (state.queryCount != 0 && log.isDebugEnabled())
121-
log.debugN(
120+
log.debug(
122121
"{} next query [{}] from slice [{}], between time [{} - {}]. Found [{}] items in previous query.",
123122
logPrefix,
124123
state.queryCount,
@@ -136,7 +135,7 @@ import org.slf4j.Logger
136135
.via(deserializeAndAddOffset(state.latest)))
137136
} else {
138137
if (log.isDebugEnabled)
139-
log.debugN(
138+
log.debug(
140139
"{} query [{}] from slice [{}] completed. Found [{}] items in previous query.",
141140
logPrefix,
142141
state.queryCount,
@@ -149,7 +148,7 @@ import org.slf4j.Logger
149148

150149
val currentTimestamp = InstantFactory.now()
151150
if (log.isDebugEnabled())
152-
log.debugN(
151+
log.debug(
153152
"{} query slice [{}], from time [{}] until now [{}].",
154153
logPrefix,
155154
slice,
@@ -174,7 +173,7 @@ import org.slf4j.Logger
174173
val initialOffset = toTimestampOffset(offset)
175174

176175
if (log.isDebugEnabled())
177-
log.debugN("Starting {} query from slice [{}], from time [{}].", logPrefix, slice, initialOffset.timestamp)
176+
log.debug("Starting {} query from slice [{}], from time [{}].", logPrefix, slice, initialOffset.timestamp)
178177

179178
def nextOffset(state: QueryState, envelope: Envelope): QueryState = {
180179
val offset = extractOffset(envelope)
@@ -198,7 +197,7 @@ import org.slf4j.Logger
198197
if (log.isDebugEnabled()) {
199198
if (state.latestBacktracking.seen.nonEmpty &&
200199
offset.timestamp.isAfter(state.latestBacktracking.timestamp.plus(firstBacktrackingQueryWindow)))
201-
log.debugN(
200+
log.debug(
202201
"{} next offset is outside the backtracking window, latestBacktracking: [{}], offset: [{}]",
203202
logPrefix,
204203
state.latestBacktracking,
@@ -221,7 +220,7 @@ import org.slf4j.Logger
221220

222221
if (log.isDebugEnabled)
223222
delay.foreach { d =>
224-
log.debugN(
223+
log.debug(
225224
"{} query [{}] from slice [{}] delay next [{}] ms.",
226225
logPrefix,
227226
state.queryCount,
@@ -308,7 +307,7 @@ import org.slf4j.Logger
308307
" in backtracking mode,"
309308
else
310309
""
311-
log.debugN(
310+
log.debug(
312311
"{} next query [{}]{} from slice [{}], between time [{} - {}]. {}",
313312
logPrefix,
314313
newState.queryCount,
@@ -351,7 +350,7 @@ import org.slf4j.Logger
351350
throw new IllegalStateException(
352351
s"Too many events stored with the same timestamp [$currentTimestamp], buffer size [${settings.querySettings.bufferSize}]")
353352
}
354-
log.traceN(
353+
log.trace(
355354
"filtering [{}] [{}] as db timestamp is the same as last offset and is in seen [{}]",
356355
item.persistenceId,
357356
item.seqNr,

‎core/src/main/scala/akka/persistence/dynamodb/internal/ContinuousQuery.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
package akka.persistence.dynamodb.internal
66

7-
import scala.concurrent.Future
87
import scala.concurrent.duration._
8+
import scala.concurrent.ExecutionContext
9+
import scala.concurrent.Future
910
import scala.util.Failure
1011
import scala.util.Success
1112
import scala.util.Try
1213

1314
import akka.NotUsed
1415
import akka.annotation.InternalApi
15-
import akka.dispatch.ExecutionContexts
1616
import akka.stream.Attributes
1717
import akka.stream.Outlet
1818
import akka.stream.SourceShape
@@ -118,7 +118,7 @@ final private[dynamodb] class ContinuousQuery[S, T](
118118
beforeQuery(state) match {
119119
case None => runNextQuery()
120120
case Some(beforeQueryFuture) =>
121-
beforeQueryFuture.onComplete(beforeQueryCallback.invoke)(ExecutionContexts.parasitic)
121+
beforeQueryFuture.onComplete(beforeQueryCallback.invoke)(ExecutionContext.parasitic)
122122
}
123123
}
124124
}

‎core/src/main/scala/akka/persistence/dynamodb/internal/JournalDao.scala

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import scala.jdk.FutureConverters._
1616
import akka.Done
1717
import akka.actor.typed.ActorSystem
1818
import akka.annotation.InternalApi
19-
import akka.dispatch.ExecutionContexts
2019
import akka.persistence.Persistence
2120
import akka.persistence.dynamodb.DynamoDBSettings
2221
import akka.persistence.typed.PersistenceId
@@ -115,7 +114,7 @@ import software.amazon.awssdk.services.dynamodb.model.Update
115114
response.consumedCapacity.capacityUnits)
116115
}
117116
}
118-
result.map(_ => Done)(ExecutionContexts.parasitic)
117+
result.map(_ => Done)(ExecutionContext.parasitic)
119118
} else {
120119
val writeItems =
121120
events.map { item =>
@@ -143,10 +142,10 @@ import software.amazon.awssdk.services.dynamodb.model.Update
143142
}
144143
}
145144
result
146-
.map(_ => Done)(ExecutionContexts.parasitic)
145+
.map(_ => Done)(ExecutionContext.parasitic)
147146
.recoverWith { case c: CompletionException =>
148147
Future.failed(c.getCause)
149-
}(ExecutionContexts.parasitic)
148+
}(ExecutionContext.parasitic)
150149
}
151150

152151
}
@@ -190,7 +189,7 @@ import software.amazon.awssdk.services.dynamodb.model.Update
190189
result
191190
.recoverWith { case c: CompletionException =>
192191
Future.failed(c.getCause)
193-
}(ExecutionContexts.parasitic)
192+
}(ExecutionContext.parasitic)
194193
}
195194

196195
private def readLowestSequenceNr(persistenceId: String): Future[Long] = {
@@ -220,7 +219,7 @@ import software.amazon.awssdk.services.dynamodb.model.Update
220219
result
221220
.recoverWith { case c: CompletionException =>
222221
Future.failed(c.getCause)
223-
}(ExecutionContexts.parasitic)
222+
}(ExecutionContext.parasitic)
224223
}
225224

226225
def deleteEventsTo(persistenceId: String, toSequenceNr: Long, resetSequenceNumber: Boolean): Future[Unit] = {
@@ -284,10 +283,10 @@ import software.amazon.awssdk.services.dynamodb.model.Update
284283
}
285284
}
286285
result
287-
.map(_ => ())(ExecutionContexts.parasitic)
286+
.map(_ => ())(ExecutionContext.parasitic)
288287
.recoverWith { case c: CompletionException =>
289288
Future.failed(c.getCause)
290-
}(ExecutionContexts.parasitic)
289+
}(ExecutionContext.parasitic)
291290
}
292291

293292
// TransactWriteItems has a limit of 100
@@ -317,7 +316,7 @@ import software.amazon.awssdk.services.dynamodb.model.Update
317316
result
318317
.recoverWith { case c: CompletionException =>
319318
Future.failed(c.getCause)
320-
}(ExecutionContexts.parasitic)
319+
}(ExecutionContext.parasitic)
321320
}
322321

323322
def updateEventExpiry(
@@ -376,10 +375,10 @@ import software.amazon.awssdk.services.dynamodb.model.Update
376375
}
377376
}
378377
result
379-
.map(_ => ())(ExecutionContexts.parasitic)
378+
.map(_ => ())(ExecutionContext.parasitic)
380379
.recoverWith { case c: CompletionException =>
381380
Future.failed(c.getCause)
382-
}(ExecutionContexts.parasitic)
381+
}(ExecutionContext.parasitic)
383382
}
384383

385384
// TransactWriteItems has a limit of 100
@@ -409,7 +408,7 @@ import software.amazon.awssdk.services.dynamodb.model.Update
409408
result
410409
.recoverWith { case c: CompletionException =>
411410
Future.failed(c.getCause)
412-
}(ExecutionContexts.parasitic)
411+
}(ExecutionContext.parasitic)
413412
}
414413

415414
}

‎core/src/main/scala/akka/persistence/dynamodb/internal/QueryDao.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import java.time.Instant
88
import java.util.concurrent.CompletionException
99
import java.util.{ Map => JMap }
1010

11+
import scala.concurrent.ExecutionContext
1112
import scala.concurrent.Future
1213
import scala.jdk.CollectionConverters._
1314
import scala.jdk.FutureConverters._
1415

1516
import akka.NotUsed
1617
import akka.actor.typed.ActorSystem
1718
import akka.annotation.InternalApi
18-
import akka.dispatch.ExecutionContexts
1919
import akka.persistence.dynamodb.DynamoDBSettings
2020
import akka.persistence.typed.PersistenceId
2121
import akka.stream.scaladsl.Source
@@ -303,7 +303,7 @@ import software.amazon.awssdk.services.dynamodb.model.QueryRequest
303303
}
304304
.recoverWith { case c: CompletionException =>
305305
Future.failed(c.getCause)
306-
}(ExecutionContexts.parasitic)
306+
}(ExecutionContext.parasitic)
307307
}
308308

309309
def loadEvent(persistenceId: String, seqNr: Long, includePayload: Boolean): Future[Option[SerializedJournalItem]] = {
@@ -353,7 +353,7 @@ import software.amazon.awssdk.services.dynamodb.model.QueryRequest
353353
}
354354
.recoverWith { case c: CompletionException =>
355355
Future.failed(c.getCause)
356-
}(ExecutionContexts.parasitic)
356+
}(ExecutionContext.parasitic)
357357

358358
}
359359

‎core/src/main/scala/akka/persistence/dynamodb/internal/SnapshotDao.scala

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import scala.jdk.FutureConverters._
1717
import akka.NotUsed
1818
import akka.actor.typed.ActorSystem
1919
import akka.annotation.InternalApi
20-
import akka.dispatch.ExecutionContexts
2120
import akka.persistence.Persistence
2221
import akka.persistence.SnapshotSelectionCriteria
2322
import akka.persistence.dynamodb.DynamoDBSettings
@@ -106,7 +105,7 @@ import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest
106105
}
107106
.recoverWith { case c: CompletionException =>
108107
Future.failed(c.getCause)
109-
}(ExecutionContexts.parasitic)
108+
}(ExecutionContext.parasitic)
110109
}
111110

112111
private def itemHasExpired(item: JMap[String, AttributeValue]): Boolean = {
@@ -173,10 +172,10 @@ import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest
173172
}
174173

175174
result
176-
.map(_ => ())(ExecutionContexts.parasitic)
175+
.map(_ => ())(ExecutionContext.parasitic)
177176
.recoverWith { case c: CompletionException =>
178177
Future.failed(c.getCause)
179-
}(ExecutionContexts.parasitic)
178+
}(ExecutionContext.parasitic)
180179
}
181180

182181
def delete(persistenceId: String, criteria: SnapshotSelectionCriteria): Future[Unit] = {
@@ -212,7 +211,7 @@ import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest
212211
}
213212

214213
result
215-
.map(_ => ())(ExecutionContexts.parasitic)
214+
.map(_ => ())(ExecutionContext.parasitic)
216215
// ignore if the criteria conditional check failed
217216
.recover {
218217
case _: ConditionalCheckFailedException => ()
@@ -221,7 +220,7 @@ import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest
221220
case _: ConditionalCheckFailedException => ()
222221
case cause => throw cause
223222
}
224-
}(ExecutionContexts.parasitic)
223+
}(ExecutionContext.parasitic)
225224
}
226225

227226
def updateExpiry(
@@ -263,7 +262,7 @@ import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest
263262
}
264263

265264
result
266-
.map(_ => ())(ExecutionContexts.parasitic)
265+
.map(_ => ())(ExecutionContext.parasitic)
267266
// ignore if the criteria conditional check failed
268267
.recover {
269268
case _: ConditionalCheckFailedException => ()
@@ -272,7 +271,7 @@ import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest
272271
case _: ConditionalCheckFailedException => ()
273272
case cause => throw cause
274273
}
275-
}(ExecutionContexts.parasitic)
274+
}(ExecutionContext.parasitic)
276275
}
277276

278277
// Used from `BySliceQuery` (only if settings.querySettings.startFromSnapshotEnabled).

‎core/src/main/scala/akka/persistence/dynamodb/journal/DynamoDBJournal.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import akka.actor.ActorRef
1818
import akka.actor.typed.ActorSystem
1919
import akka.actor.typed.scaladsl.adapter._
2020
import akka.annotation.InternalApi
21-
import akka.dispatch.ExecutionContexts
2221
import akka.event.Logging
2322
import akka.persistence.AtomicWrite
2423
import akka.persistence.PersistentRepr
@@ -226,7 +225,7 @@ private[dynamodb] final class DynamoDBJournal(config: Config, cfgPath: String)
226225
case Some(f) =>
227226
log.debug("Write in progress for [{}], deferring replayMessages until write completed", persistenceId)
228227
// we only want to make write - replay sequential, not fail if previous write failed
229-
f.recover { case _ => Done }(ExecutionContexts.parasitic)
228+
f.recover { case _ => Done }(ExecutionContext.parasitic)
230229
case None => FutureDone
231230
}
232231
pendingWrite.flatMap { _ =>

‎core/src/main/scala/akka/persistence/dynamodb/query/javadsl/DynamoDBReadJournal.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import java.util
99
import java.util.Optional
1010
import java.util.concurrent.CompletionStage
1111

12+
import scala.concurrent.ExecutionContext
1213
import scala.jdk.CollectionConverters._
1314
import scala.jdk.FutureConverters._
1415
import scala.jdk.OptionConverters.RichOption
1516

1617
import akka.NotUsed
17-
import akka.dispatch.ExecutionContexts
1818
import akka.japi.Pair
1919
import akka.persistence.dynamodb.query.scaladsl
2020
import akka.persistence.query.Offset
@@ -136,7 +136,7 @@ final class DynamoDBReadJournal(delegate: scaladsl.DynamoDBReadJournal)
136136
delegate.eventsBySlicesStartingFromSnapshots(entityType, minSlice, maxSlice, offset, transformSnapshot(_)).asJava
137137

138138
override def timestampOf(persistenceId: String, sequenceNr: Long): CompletionStage[Optional[Instant]] =
139-
delegate.timestampOf(persistenceId, sequenceNr).map(_.toJava)(ExecutionContexts.parasitic).asJava
139+
delegate.timestampOf(persistenceId, sequenceNr).map(_.toJava)(ExecutionContext.parasitic).asJava
140140

141141
override def loadEnvelope[Event](persistenceId: String, sequenceNr: Long): CompletionStage[EventEnvelope[Event]] =
142142
delegate.loadEnvelope[Event](persistenceId, sequenceNr).asJava

0 commit comments

Comments
 (0)