diff --git a/build.sbt b/build.sbt index 20cefdc60..26cca5e1a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.16" +scalaVersion := "2.13.18" enablePlugins(JavaServerAppPackaging) enablePlugins(DockerPlugin) @@ -28,12 +28,10 @@ import java.util.Calendar val specs2V = "4.23.0" // based on spray 1.3.x built in support -val akkaV = "2.7.+" -val sprayV = "1.3.+" val scalalikeV = "4.3.5" -val akkaHttpVersion = "10.5.3" -val akkaVersion = "2.8.5" +// all pekko components need to stick to the same version, therefore we take the latest common version here +val pekkoVersion = "1.2.0" val testContainersVersion = "1.21.4" resolvers += Resolver.typesafeRepo("releases") @@ -43,8 +41,8 @@ val buildSettings = Seq( .setPreference(DanglingCloseParenthesis, Force) .setPreference(AlignSingleLineCaseStatements, true), version := "2.6.46", - scalaVersion := "2.13.16", - crossScalaVersions := Seq("2.13.8", "2.13.16"), + scalaVersion := "2.13.18", + crossScalaVersions := Seq("2.13.18", "2.13.16"), resolvers ++= Resolver.sonatypeOssRepos("snapshots"), resolvers ++= Resolver.sonatypeOssRepos("releases"), resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/", @@ -56,19 +54,19 @@ val buildSettings = Seq( Seq( "org.scala-lang.modules" %% "scala-xml" % "2.4.0", "javax.xml.bind" % "jaxb-api" % "2.3.1", - "com.typesafe.akka" %% "akka-http" % akkaHttpVersion, - "com.typesafe.akka" %% "akka-http-caching" % akkaHttpVersion, - "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpVersion, // ### NO Scala 3 - "com.typesafe.akka" %% "akka-actor" % akkaVersion, - "com.typesafe.akka" %% "akka-persistence" % akkaVersion, - "com.typesafe.akka" %% "akka-persistence-query" % akkaVersion, - "com.typesafe.akka" %% "akka-slf4j" % akkaVersion, - "com.typesafe.akka" %% "akka-stream" % akkaVersion, - "com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test", - "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test", - "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % "test", - "com.lightbend.akka" %% "akka-persistence-jdbc" % "5.0.4", - "com.github.dnvriend" %% "akka-persistence-inmemory" % "2.5.15.2" % "test", // ### NO Scala 3 + "org.apache.pekko" %% "pekko-http" % pekkoVersion, + "org.apache.pekko" %% "pekko-http-caching" % pekkoVersion, + "org.apache.pekko" %% "pekko-http-spray-json" % pekkoVersion, // ### NO Scala 3 + "org.apache.pekko" %% "pekko-actor" % pekkoVersion, + "org.apache.pekko" %% "pekko-persistence" % pekkoVersion, + "org.apache.pekko" %% "pekko-persistence-query" % pekkoVersion, + "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion, + "org.apache.pekko" %% "pekko-stream" % pekkoVersion, + "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % "test", + "org.apache.pekko" %% "pekko-http-testkit" % pekkoVersion % "test", + "org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion % "test", + "org.apache.pekko" %% "pekko-persistence-jdbc" % pekkoVersion, + "io.github.alstanchev" %% "pekko-persistence-inmemory" % "1.3.0" % "test", "org.specs2" %% "specs2-core" % specs2V % "test", // ### Scala 3 "org.specs2" %% "specs2-mock" % specs2V % "test", "org.specs2" %% "specs2-junit" % specs2V % "test", @@ -85,13 +83,16 @@ val buildSettings = Seq( "com.github.jasync-sql" % "jasync-mysql" % "2.2.+", "com.h2database" % "h2" % "2.3.232" % "test", "org.testcontainers" % "mariadb" % testContainersVersion % "test", - "io.findify" %% "s3mock" % "0.2.6" % "test", + "io.github.marko-asplund" %% "s3mock" % "0.6.0" % "test", "ch.qos.logback" % "logback-classic" % "1.5.24", "org.mariadb.jdbc" % "mariadb-java-client" % "3.5.7", "com.mysql" % "mysql-connector-j" % "9.5.0", // Libreoffice document API "org.odftoolkit" % "simple-odf" % "0.9.0" withSources(), - "com.scalapenos" %% "stamina-json" % "0.1.6", // ### NO Scala 3 + // stamina-json replaced with stamino (Pekko-compatible fork) + // Note: stamino not yet published to Maven Central, keeping stamina-json for now + // "io.github.tmreau" %% "stamino-json" % "0.1.0", // Pekko-compatible alternative (not published yet) + "com.scalapenos" %% "stamina-json" % "0.1.6", // ### NO Scala 3, kept until stamino is published "net.virtual-void" %% "json-lenses" % "0.6.2", // s3 "com.amazonaws" % "aws-java-sdk-s3" % "1.12.795", @@ -122,7 +123,8 @@ val buildSettings = Seq( "org.apache.jena" % "jena-core" % "5.6.0", "com.google.protobuf" % "protobuf-java" % "4.33.2", "com.google.guava" % "guava" % "33.5.0-jre", - "commons-beanutils" % "commons-beanutils" % "1.11.0" + "commons-beanutils" % "commons-beanutils" % "1.11.0", + "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2" ) ) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 1bba33825..f945a0491 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -1,9 +1,9 @@ -akka { +pekko { loglevel = "DEBUG", stdout-loglevel = "DEBUG", - loggers = ["akka.event.slf4j.Slf4jLogger"] - logging-filter = "akka.event.slf4j.Slf4jLoggingFilter", + loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"] + logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter", persistence { journal.plugin = "jdbc-journal" snapshot-store.plugin = "jdbc-snapshot-store" @@ -23,7 +23,7 @@ akka { server { # The value of the `Server` header to produce. # Set to the empty string to disable rendering of the server header. - server-header = akka-http/${akka.http.version} + server-header = pekko-http/${pekko.http.version} # The maximum number of requests that are accepted (and dispatched to # the application) on one single connection before the first request @@ -204,7 +204,7 @@ akka { # explicit `User-Agent`-header was included in a request. # If this value is the empty string and no header was included in # the request, no `User-Agent` header will be rendered at all. - user-agent-header = akka-http/${akka.http.version} + user-agent-header = pekko-http/${pekko.http.version} # The time after which an idle connection will be automatically closed. # Set to `infinite` to completely disable idle timeouts. @@ -293,12 +293,12 @@ openolitor { slick = ${openolitor.csa1.slick} } - # the akka-persistence-snapshot-store in use + # the pekko-persistence-snapshot-store in use jdbc-snapshot-store { slick = ${openolitor.csa1.slick} } - # the akka-persistence-query provider in use + # the pekko-persistence-query provider in use jdbc-read-journal { slick = ${openolitor.csa1.slick} } @@ -479,7 +479,7 @@ openolitor { } # Configure own dispatcher for the reportsystem to control max used ressources -akka.actor.deployment { +pekko.actor.deployment { /oo-system/report-system { dispatcher = report-dispatcher } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 63ed2eb0e..199a707c5 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -3,17 +3,17 @@ System.out - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n - ./akka.log + ./pekko.log - ./akka.log.%d{yyyy-MM-dd-HH} + ./pekko.log.%d{yyyy-MM-dd-HH} - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n @@ -21,7 +21,7 @@ - + diff --git a/src/main/resources/openolitor-server-int-logback.xml b/src/main/resources/openolitor-server-int-logback.xml index 28a9b40de..8fef8423f 100644 --- a/src/main/resources/openolitor-server-int-logback.xml +++ b/src/main/resources/openolitor-server-int-logback.xml @@ -3,17 +3,17 @@ System.out - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n - ./akka.log + ./pekko.log - ./akka.log.%d{yyyy-MM-dd-HH} + ./pekko.log.%d{yyyy-MM-dd-HH} - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n @@ -21,7 +21,7 @@ - + diff --git a/src/main/resources/openolitor-server-prod-logback.xml b/src/main/resources/openolitor-server-prod-logback.xml index 28a9b40de..8fef8423f 100644 --- a/src/main/resources/openolitor-server-prod-logback.xml +++ b/src/main/resources/openolitor-server-prod-logback.xml @@ -3,17 +3,17 @@ System.out - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n - ./akka.log + ./pekko.log - ./akka.log.%d{yyyy-MM-dd-HH} + ./pekko.log.%d{yyyy-MM-dd-HH} - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n @@ -21,7 +21,7 @@ - + diff --git a/src/main/resources/openolitor-server-test-logback-sunu.xml b/src/main/resources/openolitor-server-test-logback-sunu.xml index a16573def..8ae14aa46 100644 --- a/src/main/resources/openolitor-server-test-logback-sunu.xml +++ b/src/main/resources/openolitor-server-test-logback-sunu.xml @@ -3,17 +3,17 @@ System.out - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n - ./akka.log + ./pekko.log - ./akka.log.%d{yyyy-MM-dd-HH} + ./pekko.log.%d{yyyy-MM-dd-HH} - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n @@ -21,7 +21,7 @@ - + diff --git a/src/main/resources/openolitor-server-test-logback.xml b/src/main/resources/openolitor-server-test-logback.xml index 62f489393..399f239b1 100644 --- a/src/main/resources/openolitor-server-test-logback.xml +++ b/src/main/resources/openolitor-server-test-logback.xml @@ -3,17 +3,17 @@ System.out - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n - ./akka.log + ./pekko.log - ./akka.log.%d{yyyy-MM-dd-HH} + ./pekko.log.%d{yyyy-MM-dd-HH} - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n @@ -21,7 +21,7 @@ - + diff --git a/src/main/resources/openolitor-server-test.conf b/src/main/resources/openolitor-server-test.conf index be95271af..62d5a448c 100644 --- a/src/main/resources/openolitor-server-test.conf +++ b/src/main/resources/openolitor-server-test.conf @@ -22,8 +22,8 @@ openolitor { teilnehmernummer = ${?OO_SERVICES.buchhaltung-object.mandant1.teilnehmernummer} } - # Project specific akka persistence configuration - akka-persistence-sql-async { + # Project specific pekko persistence configuration + pekko-persistence-sql-async { url = "jdbc:mysql://"${?VCAP_SERVICES.mariadbent-object.0.credentials.host}":"${?VCAP_SERVICES.mariadbent-object.0.credentials.port}"/"${?VCAP_SERVICES.mariadbent-object.0.credentials.database} user = ${?VCAP_SERVICES.mariadbent-object.0.credentials.username} password = ${?VCAP_SERVICES.mariadbent-object.0.credentials.password} @@ -134,15 +134,15 @@ openolitor { startTimeDelationSeconds = 300 } -# Default akka configuration -akka { +# Default pekko configuration +pekko { loglevel = "DEBUG", stdout-loglevel = "DEBUG", - loggers = ["akka.event.slf4j.Slf4jLogger"] - logging-filter = "akka.event.slf4j.Slf4jLoggingFilter", + loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"] + logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter", persistence { - journal.plugin = "akka-persistence-sql-async.journal" - snapshot-store.plugin = "akka-persistence-sql-async.snapshot-store" + journal.plugin = "jdbc-journal" + snapshot-store.plugin = "jdbc-snapshot-store" }, actor { serializers { @@ -150,14 +150,19 @@ akka { }, serialization-bindings { "ch.openolitor.core.domain.PersistentEvent" = event-serializer + }, + debug { + receive = on + autoreceive = on + lifecycle = on } } } -# Default akka-persistence configuration -akka-persistence-sql-async { - journal.class = "akka.persistence.journal.sqlasync.MySQLAsyncWriteJournal" - snapshot-store.class = "akka.persistence.snapshot.sqlasync.MySQLSnapshotStore" +# Default pekko-persistence configuration +pekko-persistence-sql-async { + journal.class = "org.apache.pekko.persistence.journal.sqlasync.MySQLAsyncWriteJournal" + snapshot-store.class = "org.apache.pekko.persistence.snapshot.sqlasync.MySQLSnapshotStore" wait-queue-capacity = 10000 @@ -167,7 +172,7 @@ akka-persistence-sql-async { } # Configure own dispatcher for the reportsystem to control max used ressources -akka.actor.deployment { +pekko.actor.deployment { /oo-system/report-system { dispatcher = report-dispatcher } diff --git a/src/main/resources/openolitor-server-testprod-logback.xml b/src/main/resources/openolitor-server-testprod-logback.xml index 28a9b40de..8fef8423f 100644 --- a/src/main/resources/openolitor-server-testprod-logback.xml +++ b/src/main/resources/openolitor-server-testprod-logback.xml @@ -3,17 +3,17 @@ System.out - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n - ./akka.log + ./pekko.log - ./akka.log.%d{yyyy-MM-dd-HH} + ./pekko.log.%d{yyyy-MM-dd-HH} - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n @@ -21,7 +21,7 @@ - + diff --git a/src/main/resources/openolitor-server-testprod-sunu-logback.xml b/src/main/resources/openolitor-server-testprod-sunu-logback.xml index bcea6ff01..711a72634 100644 --- a/src/main/resources/openolitor-server-testprod-sunu-logback.xml +++ b/src/main/resources/openolitor-server-testprod-sunu-logback.xml @@ -3,17 +3,17 @@ System.out - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n - ./akka.log + ./pekko.log - ./akka.log.%d{yyyy-MM-dd-HH} + ./pekko.log.%d{yyyy-MM-dd-HH} - %X{akkaTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n + %X{pekkoTimestamp} %-5level %logger{36} %X{sourceThread} - %msg%n @@ -21,7 +21,7 @@ - + diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzAktionenService.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzAktionenService.scala index 9e5e42b3c..6ea226d4b 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzAktionenService.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzAktionenService.scala @@ -29,11 +29,11 @@ import ch.openolitor.core._ import ch.openolitor.core.db._ import ch.openolitor.core.domain._ import ch.openolitor.stammdaten.MailCommandForwarder -import akka.util.Timeout +import org.apache.pekko.util.Timeout import scala.concurrent.duration._ import com.typesafe.scalalogging.LazyLogging -import akka.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.actor.{ ActorRef, ActorSystem } import ch.openolitor.stammdaten.models.{ Person, PersonEmailData, Projekt } import scalikejdbc.DB import ch.openolitor.core.models.PersonId diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzCommandHandler.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzCommandHandler.scala index b81514ef3..fcec9a842 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzCommandHandler.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzCommandHandler.scala @@ -32,7 +32,7 @@ import ch.openolitor.core.domain._ import ch.openolitor.core.models.PersonId import ch.openolitor.stammdaten.models.{ Person, PersonContactPermissionModify, PersonEmailData } import ch.openolitor.mailtemplates.engine.MailTemplateService -import akka.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.actor.{ ActorRef, ActorSystem } import ch.openolitor.core.security.Subject import ch.openolitor.stammdaten.{ DefaultMailCommandForwarderComponent, MailCommandForwarderComponent, ProjektHelper } import scalikejdbc._ diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzDeleteService.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzDeleteService.scala index 3df74fe78..172c4122c 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzDeleteService.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzDeleteService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.arbeitseinsatz -import akka.actor._ +import org.apache.pekko.actor._ import scalikejdbc._ import ch.openolitor.core._ import ch.openolitor.core.models._ diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzEntityStoreView.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzEntityStoreView.scala index d6c9003c6..c6e2f9da1 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzEntityStoreView.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzEntityStoreView.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.arbeitseinsatz -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.arbeitseinsatz.repositories._ import ch.openolitor.core._ import ch.openolitor.core.db.ConnectionPoolContextAware diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzInsertService.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzInsertService.scala index ab462991e..7caaae379 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzInsertService.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzInsertService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.arbeitseinsatz -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.arbeitseinsatz.models._ import ch.openolitor.arbeitseinsatz.repositories._ import ch.openolitor.core.Macros._ diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzRoutes.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzRoutes.scala index 4ea6a4d87..2ddfcbdd8 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzRoutes.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzRoutes.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.arbeitseinsatz -import akka.actor._ -import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.server.Directives._ -import akka.pattern.ask -import akka.http.scaladsl.server.Route +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.pattern.ask +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.arbeitseinsatz.eventsourcing.ArbeitseinsatzEventStoreSerializer import ch.openolitor.arbeitseinsatz.models._ import ch.openolitor.arbeitseinsatz.reporting._ diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzUpdateService.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzUpdateService.scala index 1e09c3050..441b96717 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzUpdateService.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzUpdateService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.arbeitseinsatz -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.arbeitseinsatz.models._ import ch.openolitor.arbeitseinsatz.repositories._ import ch.openolitor.core.Macros._ diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/batch/ArbeitseinsatzBatchJobs.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/batch/ArbeitseinsatzBatchJobs.scala index 89dcea9ea..2be0ac5e8 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/batch/ArbeitseinsatzBatchJobs.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/batch/ArbeitseinsatzBatchJobs.scala @@ -23,11 +23,11 @@ package ch.openolitor.arbeitseinsatz.batch import ch.openolitor.core.SystemConfig -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import ch.openolitor.arbeitseinsatz.repositories.DefaultArbeitseinsatzWriteRepositoryComponent import ch.openolitor.core.batch.BaseBatchJobsSupervisor -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef import ch.openolitor.arbeitseinsatz.batch.calculations.ArbeitseinsatzStatusUpdater object ArbeitseinsatzBatchJobs { diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/batch/calculations/ArbeitseinsatzStatusUpdater.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/batch/calculations/ArbeitseinsatzStatusUpdater.scala index e9ff8cda4..e701c7564 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/batch/calculations/ArbeitseinsatzStatusUpdater.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/batch/calculations/ArbeitseinsatzStatusUpdater.scala @@ -23,8 +23,8 @@ package ch.openolitor.arbeitseinsatz.batch.calculations import ch.openolitor.core.SystemConfig -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import ch.openolitor.core.batch.BaseBatchJob import scala.concurrent.duration._ import ch.openolitor.core.batch.BatchJobs._ @@ -33,7 +33,7 @@ import ch.openolitor.core.db.AsyncConnectionPoolContextAware import ch.openolitor.arbeitseinsatz.repositories.DefaultArbeitseinsatzWriteRepositoryComponent import scalikejdbc._ import ch.openolitor.arbeitseinsatz.repositories.ArbeitseinsatzRepositoryQueries -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef import scala.language.postfixOps object ArbeitseinsatzStatusUpdater { diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzReadRepositorySyncComponent.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzReadRepositorySyncComponent.scala index 0b9af68a0..b0ec74941 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzReadRepositorySyncComponent.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzReadRepositorySyncComponent.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.arbeitseinsatz.repositories -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.DefaultActorSystemReference trait ArbeitseinsatzReadRepositorySyncComponent { diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzUpdateRepositoryComponent.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzUpdateRepositoryComponent.scala index 42382e723..94de0478b 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzUpdateRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzUpdateRepositoryComponent.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.arbeitseinsatz.repositories -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.repositories.BaseUpdateRepositoryComponent import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzWriteRepositoryComponent.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzWriteRepositoryComponent.scala index f34d915e3..893b4fcdd 100644 --- a/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzWriteRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/arbeitseinsatz/repositories/ArbeitseinsatzWriteRepositoryComponent.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.arbeitseinsatz.repositories -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.repositories.BaseWriteRepositoryComponent import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungAktionenService.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungAktionenService.scala index 8c7cedfa9..6d1952ead 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungAktionenService.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungAktionenService.scala @@ -29,8 +29,8 @@ import ch.openolitor.buchhaltung.models._ import ch.openolitor.core.models.PersonId import scalikejdbc._ import com.typesafe.scalalogging.LazyLogging -import akka.actor.{ ActorRef, ActorSystem } -import akka.util.Timeout +import org.apache.pekko.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.util.Timeout import ch.openolitor.util.ConfigUtil._ import ch.openolitor.mailtemplates.engine.MailTemplateService import ch.openolitor.core.Macros._ diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungCommandHandler.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungCommandHandler.scala index 7b1f0810b..b80c6879c 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungCommandHandler.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungCommandHandler.scala @@ -33,7 +33,7 @@ import scalikejdbc.DB import scalikejdbc.DBSession import ch.openolitor.buchhaltung.models._ import ch.openolitor.core.exceptions.InvalidStateException -import akka.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.actor.{ ActorRef, ActorSystem } import ch.openolitor.core._ import ch.openolitor.core.filestore.FileTypeFilenameMapping import ch.openolitor.core.db.ConnectionPoolContextAware diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungDBEventEntityListener.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungDBEventEntityListener.scala index 972cd3940..164bad35f 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungDBEventEntityListener.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungDBEventEntityListener.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.buchhaltung -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.models._ import spray.json._ import ch.openolitor.buchhaltung.models._ diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungDeleteService.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungDeleteService.scala index 8318db8d4..48ade1b53 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungDeleteService.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungDeleteService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.buchhaltung -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core._ import ch.openolitor.core.db._ import ch.openolitor.core.domain._ diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungEntityStoreView.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungEntityStoreView.scala index d3e83bf6a..604dbd722 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungEntityStoreView.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungEntityStoreView.scala @@ -25,11 +25,11 @@ package ch.openolitor.buchhaltung import ch.openolitor.core.domain._ import ch.openolitor.core._ import ch.openolitor.core.db.ConnectionPoolContextAware -import akka.actor.Props -import akka.actor.ActorSystem +import org.apache.pekko.actor.Props +import org.apache.pekko.actor.ActorSystem import ch.openolitor.buchhaltung.repositories.DefaultBuchhaltungWriteRepositoryComponent import ch.openolitor.buchhaltung.repositories.BuchhaltungWriteRepositoryComponent -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef object BuchhaltungEntityStoreView { def props(dbEvolutionActor: ActorRef, airbrakeNotifier: ActorRef)(implicit sysConfig: SystemConfig, system: ActorSystem): Props = Props(classOf[DefaultBuchhaltungEntityStoreView], dbEvolutionActor, sysConfig, system, airbrakeNotifier) diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungInsertService.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungInsertService.scala index 1b0e97226..18265b0d6 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungInsertService.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungInsertService.scala @@ -30,7 +30,7 @@ import ch.openolitor.buchhaltung.models._ import scalikejdbc.DB import com.typesafe.scalalogging.LazyLogging import ch.openolitor.core.domain.EntityStore._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.Macros._ import ch.openolitor.stammdaten.models.{ Waehrung, CHF, EUR } import ch.openolitor.stammdaten.models.KontoDaten diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungReportEventListener.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungReportEventListener.scala index dc561a7e1..cf93e5f26 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungReportEventListener.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungReportEventListener.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.buchhaltung -import akka.actor._ +import org.apache.pekko.actor._ import spray.json._ import ch.openolitor.buchhaltung.models._ import ch.openolitor.core.EntityStoreReference diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungRoutes.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungRoutes.scala index 1187a8253..13ec572a4 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungRoutes.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungRoutes.scala @@ -22,22 +22,22 @@ \* */ package ch.openolitor.buchhaltung -import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Directives.{ parameters => httpParameters } +import org.apache.pekko.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Directives.{ parameters => httpParameters } import ch.openolitor.core._ import ch.openolitor.core.domain._ import ch.openolitor.core.db._ import scala.util._ -import akka.pattern.ask +import org.apache.pekko.pattern.ask import ch.openolitor.buchhaltung.eventsourcing.BuchhaltungEventStoreSerializer import stamina.Persister import ch.openolitor.buchhaltung.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.filestore._ -import akka.actor._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.buchhaltung.zahlungsimport.ZahlungsImportParser import ch.openolitor.buchhaltung.zahlungsimport.ZahlungsImportRecordResult import ch.openolitor.core.security.Subject diff --git a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungUpdateService.scala b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungUpdateService.scala index 9d7a443e1..a40aebcab 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungUpdateService.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/BuchhaltungUpdateService.scala @@ -30,7 +30,7 @@ import ch.openolitor.buchhaltung.models._ import scalikejdbc.DB import com.typesafe.scalalogging.LazyLogging import ch.openolitor.core.domain.EntityStore._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.models.PersonId import ch.openolitor.buchhaltung.repositories.DefaultBuchhaltungWriteRepositoryComponent import ch.openolitor.buchhaltung.repositories.BuchhaltungWriteRepositoryComponent diff --git a/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungReadRepositorySyncComponent.scala b/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungReadRepositorySyncComponent.scala index b528b5fe9..f9071e01d 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungReadRepositorySyncComponent.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungReadRepositorySyncComponent.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.buchhaltung.repositories -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.DefaultActorSystemReference trait BuchhaltungReadRepositorySyncComponent { diff --git a/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungUpdateRepositoryComponent.scala b/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungUpdateRepositoryComponent.scala index 8d86a1990..0479cfdac 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungUpdateRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungUpdateRepositoryComponent.scala @@ -25,7 +25,7 @@ package ch.openolitor.buchhaltung.repositories import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } import ch.openolitor.core.repositories.BaseUpdateRepositoryComponent -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait BuchhaltungUpdateRepositoryComponent extends BaseUpdateRepositoryComponent { val buchhaltungUpdateRepository: BuchhaltungUpdateRepository diff --git a/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungWriteRepositoryComponent.scala b/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungWriteRepositoryComponent.scala index 303c41efe..6ed285770 100644 --- a/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungWriteRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/buchhaltung/repositories/BuchhaltungWriteRepositoryComponent.scala @@ -25,7 +25,7 @@ package ch.openolitor.buchhaltung.repositories import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } import ch.openolitor.core.repositories.BaseWriteRepositoryComponent -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait BuchhaltungWriteRepositoryComponent extends BaseWriteRepositoryComponent { val buchhaltungWriteRepository: BuchhaltungWriteRepository diff --git a/src/main/scala/ch/openolitor/core/ActorReferences.scala b/src/main/scala/ch/openolitor/core/ActorReferences.scala index 8bbbf817f..42b6efc24 100644 --- a/src/main/scala/ch/openolitor/core/ActorReferences.scala +++ b/src/main/scala/ch/openolitor/core/ActorReferences.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core -import akka.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.actor.{ ActorRef, ActorSystem } trait EntityStoreReference { val entityStore: ActorRef diff --git a/src/main/scala/ch/openolitor/core/AkkaHttpDeserializers.scala b/src/main/scala/ch/openolitor/core/AkkaHttpDeserializers.scala index 44929b248..8ef2c4abd 100644 --- a/src/main/scala/ch/openolitor/core/AkkaHttpDeserializers.scala +++ b/src/main/scala/ch/openolitor/core/AkkaHttpDeserializers.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.core -import akka.http.scaladsl.server.{ PathMatcher1, PathMatchers } -import akka.http.scaladsl.unmarshalling.{ FromStringUnmarshaller, Unmarshaller } -import akka.http.scaladsl.util.FastFuture -import akka.stream.Materializer +import org.apache.pekko.http.scaladsl.server.{ PathMatcher1, PathMatchers } +import org.apache.pekko.http.scaladsl.unmarshalling.{ FromStringUnmarshaller, Unmarshaller } +import org.apache.pekko.http.scaladsl.util.FastFuture +import org.apache.pekko.stream.Materializer import ch.openolitor.core.models.BaseId import scala.concurrent.{ ExecutionContext, Future } diff --git a/src/main/scala/ch/openolitor/core/BaseRouteService.scala b/src/main/scala/ch/openolitor/core/BaseRouteService.scala index 7f6ff3d3f..3dc31329e 100644 --- a/src/main/scala/ch/openolitor/core/BaseRouteService.scala +++ b/src/main/scala/ch/openolitor/core/BaseRouteService.scala @@ -22,18 +22,18 @@ \* */ package ch.openolitor.core -import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import akka.http.scaladsl.marshalling.{ Marshaller, ToResponseMarshaller } -import akka.http.scaladsl.model._ -import akka.http.scaladsl.model.headers._ -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.directives.MarshallingDirectives.{ as, entity } -import akka.http.scaladsl.server.{ RequestContext, Route, RouteResult } -import akka.http.scaladsl.unmarshalling.FromRequestUnmarshaller -import akka.pattern.ask -import akka.stream.Materializer -import akka.stream.scaladsl.{ Sink, Source, StreamConverters } -import akka.util.{ ByteString, Timeout } +import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport +import org.apache.pekko.http.scaladsl.marshalling.{ Marshaller, ToResponseMarshaller } +import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.model.headers._ +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives.{ as, entity } +import org.apache.pekko.http.scaladsl.server.{ RequestContext, Route, RouteResult } +import org.apache.pekko.http.scaladsl.unmarshalling.FromRequestUnmarshaller +import org.apache.pekko.pattern.ask +import org.apache.pekko.stream.Materializer +import org.apache.pekko.stream.scaladsl.{ Sink, Source, StreamConverters } +import org.apache.pekko.util.{ ByteString, Timeout } import ch.openolitor.core.BaseJsonProtocol.IdResponse import ch.openolitor.core.domain.EntityStore import ch.openolitor.core.domain.EntityStore.EntityInsertedEvent @@ -67,7 +67,7 @@ import scala.util.{ Either, Failure, Left, Right, Success, Try } trait BaseRouteService extends ExecutionContextAware with SprayJsonSupport with AkkaHttpDeserializers with BaseJsonProtocol with EntityStoreReference with FileStoreReference with LazyLogging { implicit val timeout = Timeout(5 seconds) - lazy val DefaultChunkSize = ConfigLoader.loadConfig.getBytes("akka.http.parsing.max-chunk-size").toInt + lazy val DefaultChunkSize = ConfigLoader.loadConfig.getBytes("pekko.http.parsing.max-chunk-size").toInt implicit val exportFormatPath = enumPathMatcher(path => path.head match { diff --git a/src/main/scala/ch/openolitor/core/Boot.scala b/src/main/scala/ch/openolitor/core/Boot.scala index a9854839f..4347425fc 100644 --- a/src/main/scala/ch/openolitor/core/Boot.scala +++ b/src/main/scala/ch/openolitor/core/Boot.scala @@ -22,9 +22,9 @@ \* */ package ch.openolitor.core -import akka.actor.ActorSystem -import akka.http.scaladsl.Http -import akka.util.Timeout +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.http.scaladsl.Http +import org.apache.pekko.util.Timeout import ch.openolitor.core.batch.BatchJobs.InitializeBatchJob import ch.openolitor.core.db._ import ch.openolitor.core.domain.SystemEvents.SystemStarted @@ -152,7 +152,7 @@ object Boot extends App with LazyLogging with StartingServices { } /** - * Jeder Mandant wird in einem eigenen Akka System gestartet. + * Jeder Mandant wird in einem eigenen Pekko System gestartet. */ def startServices(configs: NonEmptyList[MandantConfiguration]): NonEmptyList[MandantSystem] = { configs.map { cfg => diff --git a/src/main/scala/ch/openolitor/core/CORSSupport.scala b/src/main/scala/ch/openolitor/core/CORSSupport.scala index b1d2938fe..3ee52ff4b 100644 --- a/src/main/scala/ch/openolitor/core/CORSSupport.scala +++ b/src/main/scala/ch/openolitor/core/CORSSupport.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.core -import akka.http.scaladsl.model.HttpResponse -import akka.http.scaladsl.model.headers._ -import akka.http.scaladsl.model.HttpMethods._ -import akka.http.scaladsl.server._ -import akka.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.model.HttpResponse +import org.apache.pekko.http.scaladsl.model.headers._ +import org.apache.pekko.http.scaladsl.model.HttpMethods._ +import org.apache.pekko.http.scaladsl.server._ +import org.apache.pekko.http.scaladsl.server.Directives._ import ch.openolitor.util.ConfigUtil._ import com.typesafe.scalalogging.LazyLogging diff --git a/src/main/scala/ch/openolitor/core/DBEvent2UserMapping.scala b/src/main/scala/ch/openolitor/core/DBEvent2UserMapping.scala index 142b5ad0d..8b496c673 100644 --- a/src/main/scala/ch/openolitor/core/DBEvent2UserMapping.scala +++ b/src/main/scala/ch/openolitor/core/DBEvent2UserMapping.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core -import akka.actor._ +import org.apache.pekko.actor._ import spray.json._ import ch.openolitor.core.models._ import ch.openolitor.core.ws._ diff --git a/src/main/scala/ch/openolitor/core/EventStream.scala b/src/main/scala/ch/openolitor/core/EventStream.scala index 0d7b4cf72..1a2d1c651 100644 --- a/src/main/scala/ch/openolitor/core/EventStream.scala +++ b/src/main/scala/ch/openolitor/core/EventStream.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.repositories.InstantEventPublisher /** diff --git a/src/main/scala/ch/openolitor/core/OpenOlitorExceptionHandler.scala b/src/main/scala/ch/openolitor/core/OpenOlitorExceptionHandler.scala index 65721b9b6..50f3a0226 100644 --- a/src/main/scala/ch/openolitor/core/OpenOlitorExceptionHandler.scala +++ b/src/main/scala/ch/openolitor/core/OpenOlitorExceptionHandler.scala @@ -22,9 +22,9 @@ \* */ package ch.openolitor.core -import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import akka.http.scaladsl.model.{ ContentTypes, HttpEntity, HttpResponse, StatusCodes } -import akka.http.scaladsl.server.ExceptionHandler +import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport +import org.apache.pekko.http.scaladsl.model.{ ContentTypes, HttpEntity, HttpResponse, StatusCodes } +import org.apache.pekko.http.scaladsl.server.ExceptionHandler import ch.openolitor.util.AirbrakeNotifier.AirbrakeNotification import com.typesafe.scalalogging.LazyLogging import spray.json.enrichAny diff --git a/src/main/scala/ch/openolitor/core/OpenOlitorRejectionHandler.scala b/src/main/scala/ch/openolitor/core/OpenOlitorRejectionHandler.scala index 9c360ad1c..46ea4615e 100644 --- a/src/main/scala/ch/openolitor/core/OpenOlitorRejectionHandler.scala +++ b/src/main/scala/ch/openolitor/core/OpenOlitorRejectionHandler.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.core -import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import akka.http.scaladsl.model.{ HttpEntity, HttpResponse } -import akka.http.scaladsl.model.StatusCodes._ -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.RejectionHandler +import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport +import org.apache.pekko.http.scaladsl.model.{ HttpEntity, HttpResponse } +import org.apache.pekko.http.scaladsl.model.StatusCodes._ +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.RejectionHandler import ch.openolitor.core.security.AuthenticatorRejection import com.typesafe.scalalogging.LazyLogging diff --git a/src/main/scala/ch/openolitor/core/RouteService.scala b/src/main/scala/ch/openolitor/core/RouteService.scala index c3791c59f..c6ada4b60 100644 --- a/src/main/scala/ch/openolitor/core/RouteService.scala +++ b/src/main/scala/ch/openolitor/core/RouteService.scala @@ -22,13 +22,13 @@ \* */ package ch.openolitor.core -import akka.actor._ -import akka.http.caching.scaladsl.Cache -import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.server.{ ExceptionHandler, RejectionHandler, Route } -import akka.http.scaladsl.server.Directives._ -import akka.pattern.ask -import akka.util.Timeout +import org.apache.pekko.actor._ +import org.apache.pekko.http.caching.scaladsl.Cache +import org.apache.pekko.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.server.{ ExceptionHandler, RejectionHandler, Route } +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.pattern.ask +import org.apache.pekko.util.Timeout import ch.openolitor.arbeitseinsatz.{ ArbeitseinsatzRoutes, DefaultArbeitseinsatzRoutes } import ch.openolitor.buchhaltung._ import ch.openolitor.core.db.evolution.DBEvolutionActor.CheckDBEvolution diff --git a/src/main/scala/ch/openolitor/core/StartingServices.scala b/src/main/scala/ch/openolitor/core/StartingServices.scala index ea3c48ebc..928a3a6aa 100644 --- a/src/main/scala/ch/openolitor/core/StartingServices.scala +++ b/src/main/scala/ch/openolitor/core/StartingServices.scala @@ -22,12 +22,12 @@ \* */ package ch.openolitor.core -import akka.actor.{ ActorRef, ActorSystem } -import akka.http.caching.scaladsl.{ Cache, CachingSettings } -import akka.http.caching.LfuCache -import akka.pattern.ask -import akka.stream.scaladsl.SourceQueueWithComplete -import akka.util.Timeout +import org.apache.pekko.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.http.caching.scaladsl.{ Cache, CachingSettings } +import org.apache.pekko.http.caching.LfuCache +import org.apache.pekko.pattern.ask +import org.apache.pekko.stream.scaladsl.SourceQueueWithComplete +import org.apache.pekko.util.Timeout import ch.openolitor.arbeitseinsatz.ArbeitseinsatzEntityStoreView import ch.openolitor.buchhaltung.{ BuchhaltungDBEventEntityListener, BuchhaltungEntityStoreView, BuchhaltungReportEventListener } import ch.openolitor.core.batch.OpenOlitorBatchJobs diff --git a/src/main/scala/ch/openolitor/core/SubscriberActor.scala b/src/main/scala/ch/openolitor/core/SubscriberActor.scala index 9364fadfe..8e8c4fb97 100644 --- a/src/main/scala/ch/openolitor/core/SubscriberActor.scala +++ b/src/main/scala/ch/openolitor/core/SubscriberActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core -import akka.actor._ +import org.apache.pekko.actor._ /** * Ein actor welcher automatisch für eine Anzahl Events auf dem Eventstream Bus registriert diff --git a/src/main/scala/ch/openolitor/core/SystemActor.scala b/src/main/scala/ch/openolitor/core/SystemActor.scala index 39a70413b..962bb5a9a 100644 --- a/src/main/scala/ch/openolitor/core/SystemActor.scala +++ b/src/main/scala/ch/openolitor/core/SystemActor.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.core -import akka.actor._ +import org.apache.pekko.actor._ import scala.concurrent.duration._ -import akka.actor.SupervisorStrategy.Restart -import akka.pattern.{ BackoffOpts, BackoffSupervisor } +import org.apache.pekko.actor.SupervisorStrategy.Restart +import org.apache.pekko.pattern.{ BackoffOpts, BackoffSupervisor } object SystemActor { case class Child(props: Props, name: String) diff --git a/src/main/scala/ch/openolitor/core/batch/BatchJobs.scala b/src/main/scala/ch/openolitor/core/batch/BatchJobs.scala index 69485f9ce..0c2bdd107 100644 --- a/src/main/scala/ch/openolitor/core/batch/BatchJobs.scala +++ b/src/main/scala/ch/openolitor/core/batch/BatchJobs.scala @@ -24,10 +24,10 @@ package ch.openolitor.core.batch import com.typesafe.scalalogging.LazyLogging import scala.concurrent.duration._ -import akka.actor.Actor +import org.apache.pekko.actor.Actor import org.joda.time.DateTime -import akka.actor.Cancellable -import akka.actor.ActorRef +import org.apache.pekko.actor.Cancellable +import org.apache.pekko.actor.ActorRef import scala.language.postfixOps object BatchJobs { diff --git a/src/main/scala/ch/openolitor/core/batch/OpenOlitorBatchJobs.scala b/src/main/scala/ch/openolitor/core/batch/OpenOlitorBatchJobs.scala index 5f542e452..afe4118a4 100644 --- a/src/main/scala/ch/openolitor/core/batch/OpenOlitorBatchJobs.scala +++ b/src/main/scala/ch/openolitor/core/batch/OpenOlitorBatchJobs.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.core.batch -import akka.actor.Props +import org.apache.pekko.actor.Props import ch.openolitor.stammdaten.batch.StammdatenBatchJobs -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.SystemConfig -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef import ch.openolitor.core.filestore.FileStore import ch.openolitor.core.filestore.batch.FileStoreBatchJobs import ch.openolitor.arbeitseinsatz.batch.ArbeitseinsatzBatchJobs diff --git a/src/main/scala/ch/openolitor/core/data/DataImportParser.scala b/src/main/scala/ch/openolitor/core/data/DataImportParser.scala index 4eab72e8e..102aa1b6b 100644 --- a/src/main/scala/ch/openolitor/core/data/DataImportParser.scala +++ b/src/main/scala/ch/openolitor/core/data/DataImportParser.scala @@ -26,8 +26,8 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.odftoolkit.simple._ import org.odftoolkit.simple.table._ -import akka.actor._ -import akka.event.LoggingAdapter +import org.apache.pekko.actor._ +import org.apache.pekko.event.LoggingAdapter import java.io.InputStream import scala.util._ diff --git a/src/main/scala/ch/openolitor/core/data/DataImportService.scala b/src/main/scala/ch/openolitor/core/data/DataImportService.scala index 4d6e5ae1e..20efe58bc 100644 --- a/src/main/scala/ch/openolitor/core/data/DataImportService.scala +++ b/src/main/scala/ch/openolitor/core/data/DataImportService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.data -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.stammdaten._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.models._ diff --git a/src/main/scala/ch/openolitor/core/data/EntityParser.scala b/src/main/scala/ch/openolitor/core/data/EntityParser.scala index 63f086fac..0ec937237 100644 --- a/src/main/scala/ch/openolitor/core/data/EntityParser.scala +++ b/src/main/scala/ch/openolitor/core/data/EntityParser.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.data -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter import ch.openolitor.core.models._ import org.joda.time.{ DateTime, LocalDate } import org.joda.time.format.{ DateTimeFormat, DateTimeFormatter } diff --git a/src/main/scala/ch/openolitor/core/data/parsers/AboParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/AboParser.scala index 2a67e7721..e4152e59f 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/AboParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/AboParser.scala @@ -28,7 +28,7 @@ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime import org.joda.time.LocalDate -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object AboParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/AbotypParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/AbotypParser.scala index afece33e5..e27bd3794 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/AbotypParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/AbotypParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.LocalDate import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object AbotypParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/AbwesenheitParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/AbwesenheitParser.scala index 4232305ee..3b6ca252c 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/AbwesenheitParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/AbwesenheitParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime import org.joda.time.LocalDate -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object AbwesenheitParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/BestellpositionParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/BestellpositionParser.scala index e2fb82dc7..6ddea251a 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/BestellpositionParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/BestellpositionParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object BestellpositionParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/BestellungParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/BestellungParser.scala index 7a546c1c0..e7715ab21 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/BestellungParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/BestellungParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object BestellungParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/CustomKundentypParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/CustomKundentypParser.scala index 5f749dd24..ef8bb9cd0 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/CustomKundentypParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/CustomKundentypParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object CustomKundentypParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/DepotParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/DepotParser.scala index d882d372d..1e8a13c79 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/DepotParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/DepotParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object DepotParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/KundeParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/KundeParser.scala index b11527392..be077c39c 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/KundeParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/KundeParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object KundeParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/LieferplanungParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/LieferplanungParser.scala index 8d15190bf..91f1db5e7 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/LieferplanungParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/LieferplanungParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object LieferplanungParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/LieferpositionParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/LieferpositionParser.scala index 9c78c6f6a..b50edc50d 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/LieferpositionParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/LieferpositionParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object LieferpositionParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/LieferungParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/LieferungParser.scala index 51110d181..903541980 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/LieferungParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/LieferungParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object LieferungParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/PendenzParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/PendenzParser.scala index 43395baf5..491f307a7 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/PendenzParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/PendenzParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object PendenzParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/PersonParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/PersonParser.scala index c5f5f7365..a1df86e75 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/PersonParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/PersonParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter import ch.openolitor.util.OtpUtil object PersonParser extends EntityParser { diff --git a/src/main/scala/ch/openolitor/core/data/parsers/ProduktParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/ProduktParser.scala index e45676785..f52114b11 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/ProduktParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/ProduktParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object ProduktParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/ProduktProduktekategorieParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/ProduktProduktekategorieParser.scala index 8ecec4e20..acf3120cc 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/ProduktProduktekategorieParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/ProduktProduktekategorieParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object ProduktProduktekategorieParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/ProduktProduzentParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/ProduktProduzentParser.scala index eeaacef2b..9e6f2d9dd 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/ProduktProduzentParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/ProduktProduzentParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object ProduktProduzentParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/ProduktekategorieParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/ProduktekategorieParser.scala index 8cf7e78af..aeee082b2 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/ProduktekategorieParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/ProduktekategorieParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object ProduktekategorieParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/ProduzentParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/ProduzentParser.scala index 8b85873f0..1649b9fb3 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/ProduzentParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/ProduzentParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object ProduzentParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/ProjektParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/ProjektParser.scala index 8a999711e..ef4ecc842 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/ProjektParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/ProjektParser.scala @@ -27,7 +27,7 @@ import java.util.Locale import ch.openolitor.core.data.EntityParser import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter import ch.openolitor.core.models.PersonId import org.joda.time.DateTime diff --git a/src/main/scala/ch/openolitor/core/data/parsers/SammelbestellungParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/SammelbestellungParser.scala index 7d7166ee6..34a55353b 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/SammelbestellungParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/SammelbestellungParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object SammelbestellungParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/TourParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/TourParser.scala index 13ce9e62e..9f7df0bf2 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/TourParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/TourParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object TourParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/TourlieferungParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/TourlieferungParser.scala index 353fcd6e4..6f9ed852c 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/TourlieferungParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/TourlieferungParser.scala @@ -27,7 +27,7 @@ import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object TourlieferungParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/VertriebParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/VertriebParser.scala index 53c1479e8..03f9edc8d 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/VertriebParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/VertriebParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object VertriebParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/VertriebsartParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/VertriebsartParser.scala index af34c8a8c..57486b06c 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/VertriebsartParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/VertriebsartParser.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.data.EntityParser import ch.openolitor.core.models._ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object VertriebsartParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/ZusatzAboParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/ZusatzAboParser.scala index c4d46100c..509689de8 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/ZusatzAboParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/ZusatzAboParser.scala @@ -28,7 +28,7 @@ import ch.openolitor.stammdaten.models._ import ch.openolitor.core.data.ParseException import org.joda.time.DateTime import org.joda.time.LocalDate -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object ZusatzAboParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/data/parsers/ZusatzAbotypParser.scala b/src/main/scala/ch/openolitor/core/data/parsers/ZusatzAbotypParser.scala index e9b31c9f7..9e55cbc7d 100644 --- a/src/main/scala/ch/openolitor/core/data/parsers/ZusatzAbotypParser.scala +++ b/src/main/scala/ch/openolitor/core/data/parsers/ZusatzAbotypParser.scala @@ -28,7 +28,7 @@ import ch.openolitor.stammdaten.models._ import org.joda.time.DateTime import org.joda.time.LocalDate -import akka.event.LoggingAdapter +import org.apache.pekko.event.LoggingAdapter object ZusatzAbotypParser extends EntityParser { import EntityParser._ diff --git a/src/main/scala/ch/openolitor/core/db/evolution/DBEvolutionActor.scala b/src/main/scala/ch/openolitor/core/db/evolution/DBEvolutionActor.scala index 06a076e83..4472b1f19 100644 --- a/src/main/scala/ch/openolitor/core/db/evolution/DBEvolutionActor.scala +++ b/src/main/scala/ch/openolitor/core/db/evolution/DBEvolutionActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.db.evolution -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.SystemConfig import ch.openolitor.core.db.ConnectionPoolContextAware import ch.openolitor.core.models.PersonId diff --git a/src/main/scala/ch/openolitor/core/db/evolution/scripts/Scripts.scala b/src/main/scala/ch/openolitor/core/db/evolution/scripts/Scripts.scala index e0352e33d..c7b032e4e 100644 --- a/src/main/scala/ch/openolitor/core/db/evolution/scripts/Scripts.scala +++ b/src/main/scala/ch/openolitor/core/db/evolution/scripts/Scripts.scala @@ -24,7 +24,7 @@ package ch.openolitor.core.db.evolution.scripts import ch.openolitor.core.db.evolution.scripts.v1._ import ch.openolitor.core.db.evolution.scripts.v2._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem object Scripts { def current(system: ActorSystem) = diff --git a/src/main/scala/ch/openolitor/core/db/evolution/scripts/v2/V2Scripts.scala b/src/main/scala/ch/openolitor/core/db/evolution/scripts/v2/V2Scripts.scala index 1c3a918e6..d682cecab 100644 --- a/src/main/scala/ch/openolitor/core/db/evolution/scripts/v2/V2Scripts.scala +++ b/src/main/scala/ch/openolitor/core/db/evolution/scripts/v2/V2Scripts.scala @@ -34,7 +34,7 @@ import org.joda.time.DateTime import ch.openolitor.core.repositories.CoreRepositoryQueries import ch.openolitor.core.models.PersistenceEventState import ch.openolitor.core.models.PersistenceEventStateId -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.stammdaten.StammdatenDBMappings import ch.openolitor.arbeitseinsatz.ArbeitseinsatzDBMappings import ch.openolitor.core.security.SystemSubject diff --git a/src/main/scala/ch/openolitor/core/domain/AggregateRoot.scala b/src/main/scala/ch/openolitor/core/domain/AggregateRoot.scala index c9cc0c4e6..dd5196ff7 100644 --- a/src/main/scala/ch/openolitor/core/domain/AggregateRoot.scala +++ b/src/main/scala/ch/openolitor/core/domain/AggregateRoot.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.domain -import akka.persistence._ -import akka.actor._ +import org.apache.pekko.persistence._ +import org.apache.pekko.actor._ import ch.openolitor.core.models.PersonId trait State diff --git a/src/main/scala/ch/openolitor/core/domain/CommandHandlerComponent.scala b/src/main/scala/ch/openolitor/core/domain/CommandHandlerComponent.scala index 8413bd1b0..e907a3b7d 100644 --- a/src/main/scala/ch/openolitor/core/domain/CommandHandlerComponent.scala +++ b/src/main/scala/ch/openolitor/core/domain/CommandHandlerComponent.scala @@ -28,7 +28,7 @@ import ch.openolitor.kundenportal.DefaultKundenportalCommandHandler import ch.openolitor.arbeitseinsatz.DefaultArbeitseinsatzCommandHandler import ch.openolitor.stammdaten.{ DefaultMailCommandForwarderComponent, DefaultStammdatenCommandHandler, MailCommandForwarder } import ch.openolitor.reports.DefaultReportsCommandHandler -import akka.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.actor.{ ActorRef, ActorSystem } import ch.openolitor.mailtemplates.DefaultMailTemplateCommandHanlder trait CommandHandlerComponent { diff --git a/src/main/scala/ch/openolitor/core/domain/EntityStore.scala b/src/main/scala/ch/openolitor/core/domain/EntityStore.scala index a389a1911..ffc3ae7fd 100644 --- a/src/main/scala/ch/openolitor/core/domain/EntityStore.scala +++ b/src/main/scala/ch/openolitor/core/domain/EntityStore.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.domain -import akka.actor._ -import akka.persistence._ +import org.apache.pekko.actor._ +import org.apache.pekko.persistence._ import ch.openolitor.core.models._ import ch.openolitor.core.db.evolution.Evolution diff --git a/src/main/scala/ch/openolitor/core/domain/EntityStoreView.scala b/src/main/scala/ch/openolitor/core/domain/EntityStoreView.scala index 13df0c7f2..f4ebf4b9d 100644 --- a/src/main/scala/ch/openolitor/core/domain/EntityStoreView.scala +++ b/src/main/scala/ch/openolitor/core/domain/EntityStoreView.scala @@ -23,16 +23,16 @@ package ch.openolitor.core.domain import java.util.concurrent.TimeUnit -import akka.actor.SupervisorStrategy.Restart +import org.apache.pekko.actor.SupervisorStrategy.Restart import DefaultMessages._ import scala.concurrent.duration._ -import akka.actor._ -import akka.persistence.jdbc.query.scaladsl.JdbcReadJournal -import akka.persistence.query.{ EventEnvelope, PersistenceQuery } -import akka.NotUsed -import akka.stream.scaladsl.Source -import akka.stream.Materializer +import org.apache.pekko.actor._ +import org.apache.pekko.persistence.jdbc.query.scaladsl.JdbcReadJournal +import org.apache.pekko.persistence.query.{ EventEnvelope, PersistenceQuery } +import org.apache.pekko.NotUsed +import org.apache.pekko.stream.scaladsl.Source +import org.apache.pekko.stream.Materializer import scala.util._ import com.typesafe.scalalogging.LazyLogging @@ -90,7 +90,10 @@ trait EntityStoreView extends Actor with DBEvolutionReference with LazyLogging w log.debug(s"replayJournalSource: $fromSequenceNr") implicit val materializer = Materializer.matFromSystem(context.system) journalSource(fromSequenceNr).runForeach { - case event: EventEnvelope => context.self ! event.event + case event: EventEnvelope => + log.debug(s"handle envelope from journal event: ${event.event}") + context.self ! event.event + case e => log.warning(s"Unknown envelope from journal: $e") } } @@ -127,12 +130,15 @@ trait EntityStoreView extends Actor with DBEvolutionReference with LazyLogging w log.debug("The Terminate was called") System.exit('R') case e: PersistentEvent if e.meta.transactionNr < lastProcessedTransactionNr => + log.debug(s"ignore already processed event ${e.meta.transactionNr} < $lastProcessedTransactionNr") // ignore already processed event case e: PersistentEvent if e.meta.transactionNr == lastProcessedTransactionNr && e.meta.seqNr <= lastProcessedSequenceNr => + log.debug(s"EntityStoreView: ignore already processed event ${e.meta.transactionNr} == $lastProcessedTransactionNr && ${e.meta.seqNr} <= $lastProcessedSequenceNr") // ignore already processed event case e: PersistentEvent => + log.debug(s"EntityStoreView: process persisted event $e") processNewEvents(e) } @@ -144,6 +150,7 @@ trait EntityStoreView extends Actor with DBEvolutionReference with LazyLogging w case _: EntityStoreInitialized => log.debug(s"Received EntityStoreInitialized") case e: EntityInsertedEvent[_, _] => + log.debug(s"Received EntityInsertedEvent $e") runSafe(insertService.handle, e) case e: EntityUpdatedEvent[_, _] => runSafe(updateService.handle, e) @@ -151,6 +158,7 @@ trait EntityStoreView extends Actor with DBEvolutionReference with LazyLogging w runSafe(deleteService.handle, e) case e: PersistentEvent => // handle custom events + log.debug(s"Received PersistentEvent $e") runSafe(aktionenService.handle, e) } diff --git a/src/main/scala/ch/openolitor/core/domain/Events.scala b/src/main/scala/ch/openolitor/core/domain/Events.scala index 4c8a00f25..1b8530229 100644 --- a/src/main/scala/ch/openolitor/core/domain/Events.scala +++ b/src/main/scala/ch/openolitor/core/domain/Events.scala @@ -47,8 +47,8 @@ case class EventTransactionMetadata(originator: PersonId, version: Int, timestam * @param version the version of the event store or more specific aggregate root. * @param timestamp the timestamp when the event has been created by the event store. * @param transactionNr the transaction number identifying one or more events that resulted out of a command. - * @param seqNr this is not to be confused with the sequenceNr which is managed by akka persistence. It is just representing the sequence nr of - * events within the given transactionNr. The name is misleading and unfortunately often mistaken for akka persistence's sequenceId. + * @param seqNr this is not to be confused with the sequenceNr which is managed by pekko persistence. It is just representing the sequence nr of + * events within the given transactionNr. The name is misleading and unfortunately often mistaken for pekko persistence's sequenceId. * @param source the persistence id of the aggregate root that created the event with this metadata. */ case class EventMetadata(originator: PersonId, version: Int, timestamp: DateTime, transactionNr: Long, seqNr: Long, source: String) diff --git a/src/main/scala/ch/openolitor/core/domain/PersistenceEventStateSupport.scala b/src/main/scala/ch/openolitor/core/domain/PersistenceEventStateSupport.scala index 9d0ed4e46..ae96dba87 100644 --- a/src/main/scala/ch/openolitor/core/domain/PersistenceEventStateSupport.scala +++ b/src/main/scala/ch/openolitor/core/domain/PersistenceEventStateSupport.scala @@ -22,9 +22,9 @@ \* */ package ch.openolitor.core.domain -import akka.actor._ -import akka.pattern.ask -import akka.util.Timeout +import org.apache.pekko.actor._ +import org.apache.pekko.pattern.ask +import org.apache.pekko.util.Timeout import ch.openolitor.core.db.ConnectionPoolContextAware import ch.openolitor.core.models.{ PersistenceEventState, PersistenceEventStateId } import ch.openolitor.core.repositories.CoreDBMappings diff --git a/src/main/scala/ch/openolitor/core/domain/SystemEventStore.scala b/src/main/scala/ch/openolitor/core/domain/SystemEventStore.scala index e8622dc87..6572140d9 100644 --- a/src/main/scala/ch/openolitor/core/domain/SystemEventStore.scala +++ b/src/main/scala/ch/openolitor/core/domain/SystemEventStore.scala @@ -23,9 +23,9 @@ package ch.openolitor.core.domain import org.joda.time.DateTime -import akka.persistence._ +import org.apache.pekko.persistence._ import ch.openolitor.core.SystemConfig -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.domain.DefaultMessages.Startup object SystemEventStore { diff --git a/src/main/scala/ch/openolitor/core/eventsourcing/EventStoreSerializer.scala b/src/main/scala/ch/openolitor/core/eventsourcing/EventStoreSerializer.scala index c2a45474e..93418293e 100644 --- a/src/main/scala/ch/openolitor/core/eventsourcing/EventStoreSerializer.scala +++ b/src/main/scala/ch/openolitor/core/eventsourcing/EventStoreSerializer.scala @@ -33,7 +33,7 @@ import ch.openolitor.core.eventsourcing.events._ import ch.openolitor.buchhaltung.eventsourcing.BuchhaltungEventStoreSerializer import ch.openolitor.reports.eventsourcing.ReportsEventStoreSerializer -class EventStoreSerializer extends StaminaAkkaSerializer(EventStoreSerializer.eventStorePersisters) +class EventStoreSerializer extends StaminaPekkoSerializer(EventStoreSerializer.eventStorePersisters) with LazyLogging { override def toBinary(obj: AnyRef): Array[Byte] = { diff --git a/src/main/scala/ch/openolitor/core/eventsourcing/PersistenceDBMappings.scala b/src/main/scala/ch/openolitor/core/eventsourcing/PersistenceDBMappings.scala index e2e09294c..c7d213504 100644 --- a/src/main/scala/ch/openolitor/core/eventsourcing/PersistenceDBMappings.scala +++ b/src/main/scala/ch/openolitor/core/eventsourcing/PersistenceDBMappings.scala @@ -31,14 +31,14 @@ import scala.util.{ Failure, Success, Try } import spray.json.JsValue import com.typesafe.scalalogging.LazyLogging import ch.openolitor.core.repositories.DBMappings -import akka.util.ByteString -import akka.util.ByteStringBuilder +import org.apache.pekko.util.ByteString +import org.apache.pekko.util.ByteStringBuilder import java.io.InputStream import scala.annotation.tailrec -import akka.serialization.SerializationExtension -import akka.serialization.Serialization -import akka.persistence.PersistentRepr +import org.apache.pekko.serialization.SerializationExtension +import org.apache.pekko.serialization.Serialization +import org.apache.pekko.persistence.PersistentRepr import ch.openolitor.core.ActorSystemReference import spray.json._ import ch.openolitor.core.domain.PersistentEvent diff --git a/src/main/scala/ch/openolitor/core/eventsourcing/StaminaPekkoSerializer.scala b/src/main/scala/ch/openolitor/core/eventsourcing/StaminaPekkoSerializer.scala new file mode 100644 index 000000000..723354d45 --- /dev/null +++ b/src/main/scala/ch/openolitor/core/eventsourcing/StaminaPekkoSerializer.scala @@ -0,0 +1,48 @@ +/* *\ +* ____ ____ ___ __ * +* / __ \____ ___ ____ / __ \/ (_) /_____ _____ * +* / / / / __ \/ _ \/ __ \/ / / / / / __/ __ \/ ___/ OpenOlitor * +* / /_/ / /_/ / __/ / / / /_/ / / / /_/ /_/ / / contributed by tegonal * +* \____/ .___/\___/_/ /_/\____/_/_/\__/\____/_/ http://openolitor.ch * +* /_/ * +* * +* This program is free software: you can redistribute it and/or modify it * +* under the terms of the GNU General Public License as published by * +* the Free Software Foundation, either version 3 of the License, * +* or (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, but * +* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * +* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * +* more details. * +* * +* You should have received a copy of the GNU General Public License along * +* with this program. If not, see http://www.gnu.org/licenses/ * +* * +\* */ +package ch.openolitor.core.eventsourcing + +import com.typesafe.scalalogging.LazyLogging +import stamina._ +import org.apache.pekko.serialization.Serializer + +/** + * Base serializer for stamina-based serialization using Pekko. + * This is a Pekko-compatible version of StaminaAkkaSerializer. + */ +abstract class StaminaPekkoSerializer private (persisters: Persisters, codec: PersistedCodec) extends Serializer with LazyLogging { + def this(persisters: List[Persister[_, _]], codec: PersistedCodec = DefaultPersistedCodec) = this(Persisters(persisters), codec) + def this(persister: Persister[_, _], persisters: Persister[_, _]*) = this(Persisters(persister :: persisters.toList), DefaultPersistedCodec) + + private val akkaSerializer = new StaminaAkkaSerializer(persisters.persisters, codec) {} + val includeManifest: Boolean = akkaSerializer.includeManifest + val identifier: Int = akkaSerializer.identifier + + override def toBinary(obj: AnyRef): Array[Byte] = { + akkaSerializer.toBinary(obj) + } + + override def fromBinary(bytes: Array[Byte], manifest: Option[Class[_]]): AnyRef = { + akkaSerializer.fromBinary(bytes, manifest) + } +} diff --git a/src/main/scala/ch/openolitor/core/filestore/ChunkedFileStoreActor.scala b/src/main/scala/ch/openolitor/core/filestore/ChunkedFileStoreActor.scala index 1f6babb0d..0481800b3 100644 --- a/src/main/scala/ch/openolitor/core/filestore/ChunkedFileStoreActor.scala +++ b/src/main/scala/ch/openolitor/core/filestore/ChunkedFileStoreActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.filestore -import akka.actor._ +import org.apache.pekko.actor._ import java.util.UUID import scala.concurrent.ExecutionContext import java.io.InputStream diff --git a/src/main/scala/ch/openolitor/core/filestore/FileStore.scala b/src/main/scala/ch/openolitor/core/filestore/FileStore.scala index d7bd4de2b..4bc14c5f2 100644 --- a/src/main/scala/ch/openolitor/core/filestore/FileStore.scala +++ b/src/main/scala/ch/openolitor/core/filestore/FileStore.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.filestore -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.models.BaseStringId import ch.openolitor.core.{ JSONSerializable, MandantConfiguration } import com.amazonaws.auth.{ AWSStaticCredentialsProvider, BasicAWSCredentials } diff --git a/src/main/scala/ch/openolitor/core/filestore/FileStoreActor.scala b/src/main/scala/ch/openolitor/core/filestore/FileStoreActor.scala index ca84418ab..53d66ad91 100644 --- a/src/main/scala/ch/openolitor/core/filestore/FileStoreActor.scala +++ b/src/main/scala/ch/openolitor/core/filestore/FileStoreActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.filestore -import akka.actor._ +import org.apache.pekko.actor._ import java.util.UUID import scala.concurrent.ExecutionContext import java.io.ByteArrayInputStream diff --git a/src/main/scala/ch/openolitor/core/filestore/FileStoreRoutes.scala b/src/main/scala/ch/openolitor/core/filestore/FileStoreRoutes.scala index dc2bd0604..929bf93bd 100644 --- a/src/main/scala/ch/openolitor/core/filestore/FileStoreRoutes.scala +++ b/src/main/scala/ch/openolitor/core/filestore/FileStoreRoutes.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.core.filestore -import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route -import akka.stream.Materializer +import org.apache.pekko.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route +import org.apache.pekko.stream.Materializer import ch.openolitor.core._ import com.typesafe.scalalogging.LazyLogging diff --git a/src/main/scala/ch/openolitor/core/filestore/batch/FileStoreBatchJobs.scala b/src/main/scala/ch/openolitor/core/filestore/batch/FileStoreBatchJobs.scala index 88a8a0d8b..47ef1f79c 100644 --- a/src/main/scala/ch/openolitor/core/filestore/batch/FileStoreBatchJobs.scala +++ b/src/main/scala/ch/openolitor/core/filestore/batch/FileStoreBatchJobs.scala @@ -23,8 +23,8 @@ package ch.openolitor.core.filestore.batch import ch.openolitor.core.SystemConfig -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import ch.openolitor.core.batch.BaseBatchJobsSupervisor import ch.openolitor.core.filestore.batch.housekeeping.TemporaryDataBucketCleanupBatchJob import ch.openolitor.core.filestore.FileStore diff --git a/src/main/scala/ch/openolitor/core/filestore/batch/housekeeping/TemporaryDataBucketCleanupBatchJob.scala b/src/main/scala/ch/openolitor/core/filestore/batch/housekeeping/TemporaryDataBucketCleanupBatchJob.scala index 13e8f1941..a0e14c2bf 100644 --- a/src/main/scala/ch/openolitor/core/filestore/batch/housekeeping/TemporaryDataBucketCleanupBatchJob.scala +++ b/src/main/scala/ch/openolitor/core/filestore/batch/housekeeping/TemporaryDataBucketCleanupBatchJob.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.filestore.batch.housekeeping -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import ch.openolitor.core.SystemConfig import ch.openolitor.core.batch.BaseBatchJob import ch.openolitor.core.batch.BatchJobs._ diff --git a/src/main/scala/ch/openolitor/core/jobs/JobQueueRoutes.scala b/src/main/scala/ch/openolitor/core/jobs/JobQueueRoutes.scala index 45c852fd8..d67e2f39e 100644 --- a/src/main/scala/ch/openolitor/core/jobs/JobQueueRoutes.scala +++ b/src/main/scala/ch/openolitor/core/jobs/JobQueueRoutes.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.core.jobs -import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route -import akka.pattern.ask -import akka.util.Timeout +import org.apache.pekko.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route +import org.apache.pekko.pattern.ask +import org.apache.pekko.util.Timeout import ch.openolitor.core._ import ch.openolitor.core.jobs.JobQueueService._ import ch.openolitor.core.security.Subject diff --git a/src/main/scala/ch/openolitor/core/jobs/JobQueueService.scala b/src/main/scala/ch/openolitor/core/jobs/JobQueueService.scala index fa371a596..a2d91eb93 100644 --- a/src/main/scala/ch/openolitor/core/jobs/JobQueueService.scala +++ b/src/main/scala/ch/openolitor/core/jobs/JobQueueService.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.jobs -import akka.actor._ -import akka.http.scaladsl.model.MediaType +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.MediaType import ch.openolitor.core.models._ import ch.openolitor.core.JSONSerializable @@ -65,7 +65,7 @@ object JobQueueService { class JobQueueService(mandantConfiguration: MandantConfiguration) extends Actor with ActorLogging { /** - * Implicit convertion from personid object model to string based representation used in akka system + * Implicit convertion from personid object model to string based representation used in pekko system */ implicit def userId2String(id: PersonId): String = id.id.toString diff --git a/src/main/scala/ch/openolitor/core/jobs/UserJobQueue.scala b/src/main/scala/ch/openolitor/core/jobs/UserJobQueue.scala index a7f130e84..abd069ef9 100644 --- a/src/main/scala/ch/openolitor/core/jobs/UserJobQueue.scala +++ b/src/main/scala/ch/openolitor/core/jobs/UserJobQueue.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.jobs -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.models.PersonId import ch.openolitor.core.ws.ClientReceiver import ch.openolitor.core.AkkaEventStream diff --git a/src/main/scala/ch/openolitor/core/mailservice/MailService.scala b/src/main/scala/ch/openolitor/core/mailservice/MailService.scala index 1fc0d9dc0..bf4e1a4b0 100644 --- a/src/main/scala/ch/openolitor/core/mailservice/MailService.scala +++ b/src/main/scala/ch/openolitor/core/mailservice/MailService.scala @@ -23,8 +23,8 @@ package ch.openolitor.core.mailservice import java.util.UUID -import akka.actor._ -import akka.persistence.SnapshotMetadata +import org.apache.pekko.actor._ +import org.apache.pekko.persistence.SnapshotMetadata import ch.openolitor.core.domain.{ AggregateRoot, _ } import ch.openolitor.core.models.PersonId import ch.openolitor.core.db.ConnectionPoolContextAware diff --git a/src/main/scala/ch/openolitor/core/proxy/Proxy.scala b/src/main/scala/ch/openolitor/core/proxy/Proxy.scala index 5323b4a94..3c0b245d0 100644 --- a/src/main/scala/ch/openolitor/core/proxy/Proxy.scala +++ b/src/main/scala/ch/openolitor/core/proxy/Proxy.scala @@ -22,13 +22,13 @@ \* */ package ch.openolitor.core.proxy -import akka.actor._ -import akka.http.scaladsl.model.{ HttpHeader, HttpRequest, HttpResponse } -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.{ RequestContext, Route } -import akka.http.scaladsl.Http -import akka.http.scaladsl.model.ws.WebSocketRequest -import akka.stream.scaladsl.{ Flow, Sink, Source } +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.{ HttpHeader, HttpRequest, HttpResponse } +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.{ RequestContext, Route } +import org.apache.pekko.http.scaladsl.Http +import org.apache.pekko.http.scaladsl.model.ws.WebSocketRequest +import org.apache.pekko.stream.scaladsl.{ Flow, Sink, Source } import ch.openolitor.core.Boot.MandantSystem import com.typesafe.scalalogging.LazyLogging import org.apache.http.HttpHeaders diff --git a/src/main/scala/ch/openolitor/core/reporting/BufferedChunkingActor.scala b/src/main/scala/ch/openolitor/core/reporting/BufferedChunkingActor.scala index 057799eb0..cb66ea683 100644 --- a/src/main/scala/ch/openolitor/core/reporting/BufferedChunkingActor.scala +++ b/src/main/scala/ch/openolitor/core/reporting/BufferedChunkingActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.reporting.ReportSystem._ import ch.openolitor.util.ZipBuilder import ch.openolitor.core.DateFormats diff --git a/src/main/scala/ch/openolitor/core/reporting/ChunkedReportResultCollector.scala b/src/main/scala/ch/openolitor/core/reporting/ChunkedReportResultCollector.scala index fe039dc13..3fba22604 100644 --- a/src/main/scala/ch/openolitor/core/reporting/ChunkedReportResultCollector.scala +++ b/src/main/scala/ch/openolitor/core/reporting/ChunkedReportResultCollector.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.reporting.ReportSystem._ import scala.util._ import ch.openolitor.core.DateFormats diff --git a/src/main/scala/ch/openolitor/core/reporting/FileStoreReportResultCollector.scala b/src/main/scala/ch/openolitor/core/reporting/FileStoreReportResultCollector.scala index f8e30d631..088f8ff77 100644 --- a/src/main/scala/ch/openolitor/core/reporting/FileStoreReportResultCollector.scala +++ b/src/main/scala/ch/openolitor/core/reporting/FileStoreReportResultCollector.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.reporting.ReportSystem._ import scala.util._ import ch.openolitor.core.filestore.FileStoreFileReference diff --git a/src/main/scala/ch/openolitor/core/reporting/HeadReportResultCollector.scala b/src/main/scala/ch/openolitor/core/reporting/HeadReportResultCollector.scala index c953c840e..5100e9b8d 100644 --- a/src/main/scala/ch/openolitor/core/reporting/HeadReportResultCollector.scala +++ b/src/main/scala/ch/openolitor/core/reporting/HeadReportResultCollector.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ -import akka.http.scaladsl.model.MediaTypes +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.MediaTypes import ch.openolitor.core.jobs.JobQueueService.FileResultPayload import ch.openolitor.core.reporting.ReportSystem._ diff --git a/src/main/scala/ch/openolitor/core/reporting/PDFReportResultCollector.scala b/src/main/scala/ch/openolitor/core/reporting/PDFReportResultCollector.scala index 947a6a5fb..2b46fa8d3 100644 --- a/src/main/scala/ch/openolitor/core/reporting/PDFReportResultCollector.scala +++ b/src/main/scala/ch/openolitor/core/reporting/PDFReportResultCollector.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ -import akka.http.scaladsl.model.MediaTypes +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.MediaTypes import ch.openolitor.buchhaltung.models.RechnungId import ch.openolitor.core.DateFormats import ch.openolitor.core.jobs.JobQueueService.FileResultPayload diff --git a/src/main/scala/ch/openolitor/core/reporting/ReportProcessorActor.scala b/src/main/scala/ch/openolitor/core/reporting/ReportProcessorActor.scala index 81dfcb940..7891d0fa8 100644 --- a/src/main/scala/ch/openolitor/core/reporting/ReportProcessorActor.scala +++ b/src/main/scala/ch/openolitor/core/reporting/ReportProcessorActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import scala.util._ import ch.openolitor.core.SystemConfig diff --git a/src/main/scala/ch/openolitor/core/reporting/ReportSystem.scala b/src/main/scala/ch/openolitor/core/reporting/ReportSystem.scala index f9b638e34..8b58655c0 100644 --- a/src/main/scala/ch/openolitor/core/reporting/ReportSystem.scala +++ b/src/main/scala/ch/openolitor/core/reporting/ReportSystem.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import spray.json._ import ch.openolitor.core.filestore._ import java.util.Locale diff --git a/src/main/scala/ch/openolitor/core/reporting/ResultCollector.scala b/src/main/scala/ch/openolitor/core/reporting/ResultCollector.scala index 29f89ae98..ffc5b7e52 100644 --- a/src/main/scala/ch/openolitor/core/reporting/ResultCollector.scala +++ b/src/main/scala/ch/openolitor/core/reporting/ResultCollector.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.JobQueueServiceReference import ch.openolitor.core.reporting.ReportSystem._ import ch.openolitor.core.jobs.JobQueueService._ diff --git a/src/main/scala/ch/openolitor/core/reporting/SingleDocumentReportPDFProcessorActor.scala b/src/main/scala/ch/openolitor/core/reporting/SingleDocumentReportPDFProcessorActor.scala index 7f470a8a4..318a96c0c 100644 --- a/src/main/scala/ch/openolitor/core/reporting/SingleDocumentReportPDFProcessorActor.scala +++ b/src/main/scala/ch/openolitor/core/reporting/SingleDocumentReportPDFProcessorActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.SystemConfig import ch.openolitor.core.reporting.pdf.PDFGeneratorActor import java.util.Locale diff --git a/src/main/scala/ch/openolitor/core/reporting/SingleDocumentReportProcessorActor.scala b/src/main/scala/ch/openolitor/core/reporting/SingleDocumentReportProcessorActor.scala index a653de29a..56622b40d 100644 --- a/src/main/scala/ch/openolitor/core/reporting/SingleDocumentReportProcessorActor.scala +++ b/src/main/scala/ch/openolitor/core/reporting/SingleDocumentReportProcessorActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import org.odftoolkit.simple._ import scala.util._ import spray.json._ diff --git a/src/main/scala/ch/openolitor/core/reporting/SingleDocumentStoreReportPDFProcessorActor.scala b/src/main/scala/ch/openolitor/core/reporting/SingleDocumentStoreReportPDFProcessorActor.scala index f3f9049d6..94bf9da5a 100644 --- a/src/main/scala/ch/openolitor/core/reporting/SingleDocumentStoreReportPDFProcessorActor.scala +++ b/src/main/scala/ch/openolitor/core/reporting/SingleDocumentStoreReportPDFProcessorActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.SystemConfig import ch.openolitor.core.filestore._ import ch.openolitor.core.filestore.FileStoreActor.StoreFile diff --git a/src/main/scala/ch/openolitor/core/reporting/ZipReportResultCollector.scala b/src/main/scala/ch/openolitor/core/reporting/ZipReportResultCollector.scala index efdfe68b7..a1642302d 100644 --- a/src/main/scala/ch/openolitor/core/reporting/ZipReportResultCollector.scala +++ b/src/main/scala/ch/openolitor/core/reporting/ZipReportResultCollector.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.reporting -import akka.actor._ -import akka.http.scaladsl.model.MediaTypes +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.MediaTypes import ch.openolitor.core.reporting.ReportSystem._ import ch.openolitor.core.DateFormats import ch.openolitor.core.jobs.JobQueueService.FileResultPayload diff --git a/src/main/scala/ch/openolitor/core/reporting/pdf/PDFGeneratorActor.scala b/src/main/scala/ch/openolitor/core/reporting/pdf/PDFGeneratorActor.scala index d67a387d7..cdd2aa895 100644 --- a/src/main/scala/ch/openolitor/core/reporting/pdf/PDFGeneratorActor.scala +++ b/src/main/scala/ch/openolitor/core/reporting/pdf/PDFGeneratorActor.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.reporting.pdf -import akka.actor._ +import org.apache.pekko.actor._ import scala.concurrent.blocking import scala.util._ import ch.openolitor.core.SystemConfig diff --git a/src/main/scala/ch/openolitor/core/reporting/pdf/PDFGeneratorService.scala b/src/main/scala/ch/openolitor/core/reporting/pdf/PDFGeneratorService.scala index 70cef8d46..45f971d94 100644 --- a/src/main/scala/ch/openolitor/core/reporting/pdf/PDFGeneratorService.scala +++ b/src/main/scala/ch/openolitor/core/reporting/pdf/PDFGeneratorService.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.core.reporting.pdf -import akka.actor.ActorSystem -import akka.http.scaladsl.model._ -import akka.http.scaladsl.Http -import akka.stream.scaladsl.FileIO +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.Http +import org.apache.pekko.stream.scaladsl.FileIO import ch.openolitor.core.SystemConfig import com.tegonal.CFEnvConfigLoader.ConfigLoader @@ -37,7 +37,7 @@ import scala.util.Try trait PDFGeneratorService { def sysConfig: SystemConfig - lazy val DefaultChunkSize: Int = ConfigLoader.loadConfig.getBytes("akka.http.parsing.max-chunk-size").toInt + lazy val DefaultChunkSize: Int = ConfigLoader.loadConfig.getBytes("pekko.http.parsing.max-chunk-size").toInt lazy val endpointUri: String = sysConfig.mandantConfiguration.config.getString("converttopdf.endpoint") diff --git a/src/main/scala/ch/openolitor/core/repositories/BaseInsertRepository.scala b/src/main/scala/ch/openolitor/core/repositories/BaseInsertRepository.scala index 2509424d6..37cf0e076 100644 --- a/src/main/scala/ch/openolitor/core/repositories/BaseInsertRepository.scala +++ b/src/main/scala/ch/openolitor/core/repositories/BaseInsertRepository.scala @@ -40,6 +40,7 @@ trait BaseInsertRepository extends BaseReadRepositorySync with InsertRepository logger.debug(s"Ignore insert event, entity already exists:${entity.id}") None case None => + logger.debug(s"BaseInsertRepository: insert entity:${entity}") withSQL(insertInto(syntaxSupport).values(params: _*)).update.apply() //publish event to stream diff --git a/src/main/scala/ch/openolitor/core/repositories/CoreReadRepository.scala b/src/main/scala/ch/openolitor/core/repositories/CoreReadRepository.scala index d8151c172..aa91cf42e 100644 --- a/src/main/scala/ch/openolitor/core/repositories/CoreReadRepository.scala +++ b/src/main/scala/ch/openolitor/core/repositories/CoreReadRepository.scala @@ -28,7 +28,7 @@ import ch.openolitor.core.db.OOAsyncDB._ import ch.openolitor.util.parsing.FilterExpr import scala.concurrent.Future import ch.openolitor.core.models.PersistenceJournalView -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait CoreReadRepository { def queryPersistenceJournal(limit: Int)(implicit asyncCpContext: MultipleAsyncConnectionPoolContext, filter: Option[FilterExpr]): Future[List[PersistenceJournalView]] diff --git a/src/main/scala/ch/openolitor/core/security/BasicAuthenticatorProvider.scala b/src/main/scala/ch/openolitor/core/security/BasicAuthenticatorProvider.scala index 31737357d..a2676e8ea 100644 --- a/src/main/scala/ch/openolitor/core/security/BasicAuthenticatorProvider.scala +++ b/src/main/scala/ch/openolitor/core/security/BasicAuthenticatorProvider.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.core.security -import akka.http.scaladsl.model.headers.{ BasicHttpCredentials, HttpChallenges } -import akka.http.scaladsl.server.{ AuthenticationFailedRejection, Directive1 } -import akka.http.scaladsl.server.AuthenticationFailedRejection.{ CredentialsMissing, CredentialsRejected } -import akka.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.model.headers.{ BasicHttpCredentials, HttpChallenges } +import org.apache.pekko.http.scaladsl.server.{ AuthenticationFailedRejection, Directive1 } +import org.apache.pekko.http.scaladsl.server.AuthenticationFailedRejection.{ CredentialsMissing, CredentialsRejected } +import org.apache.pekko.http.scaladsl.server.Directives._ import scala.concurrent.Future diff --git a/src/main/scala/ch/openolitor/core/security/LoginRouteService.scala b/src/main/scala/ch/openolitor/core/security/LoginRouteService.scala index 37e06893e..f7fd8bba7 100644 --- a/src/main/scala/ch/openolitor/core/security/LoginRouteService.scala +++ b/src/main/scala/ch/openolitor/core/security/LoginRouteService.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.core.security -import akka.actor.{ ActorRef, ActorSystem } -import akka.http.caching.scaladsl.Cache -import akka.http.scaladsl.model._ -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.directives.MarshallingDirectives.{ as, entity } +import org.apache.pekko.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.http.caching.scaladsl.Cache +import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.directives.MarshallingDirectives.{ as, entity } import ch.openolitor.core._ import ch.openolitor.core.Macros._ import ch.openolitor.core.filestore.{ DefaultFileStoreComponent, FileStoreComponent } diff --git a/src/main/scala/ch/openolitor/core/security/LoginService.scala b/src/main/scala/ch/openolitor/core/security/LoginService.scala index 1d2090d0e..93befb8ad 100644 --- a/src/main/scala/ch/openolitor/core/security/LoginService.scala +++ b/src/main/scala/ch/openolitor/core/security/LoginService.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.core.security -import akka.http.caching.scaladsl.{ Cache, CachingSettings } -import akka.http.caching.LfuCache -import akka.pattern.ask -import akka.util.Timeout +import org.apache.pekko.http.caching.scaladsl.{ Cache, CachingSettings } +import org.apache.pekko.http.caching.LfuCache +import org.apache.pekko.pattern.ask +import org.apache.pekko.util.Timeout import ch.openolitor.core.{ ActorReferences, ExecutionContextAware, SystemConfigReference } import ch.openolitor.core.Macros.copyTo import ch.openolitor.core.db.AsyncConnectionPoolContextAware diff --git a/src/main/scala/ch/openolitor/core/security/TokenCache.scala b/src/main/scala/ch/openolitor/core/security/TokenCache.scala index 60eca29db..5a2efa2a2 100644 --- a/src/main/scala/ch/openolitor/core/security/TokenCache.scala +++ b/src/main/scala/ch/openolitor/core/security/TokenCache.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.security -import akka.http.caching.scaladsl.Cache +import org.apache.pekko.http.caching.scaladsl.Cache trait TokenCache { val loginTokenCache: Cache[String, Subject] diff --git a/src/main/scala/ch/openolitor/core/security/XSRFTokenSessionAuthenticator.scala b/src/main/scala/ch/openolitor/core/security/XSRFTokenSessionAuthenticator.scala index a7e0490a0..11c7db1cf 100644 --- a/src/main/scala/ch/openolitor/core/security/XSRFTokenSessionAuthenticator.scala +++ b/src/main/scala/ch/openolitor/core/security/XSRFTokenSessionAuthenticator.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.security -import akka.http.scaladsl.server.{ Directive1, Rejection, RequestContext } -import akka.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.{ Directive1, Rejection, RequestContext } +import org.apache.pekko.http.scaladsl.server.Directives._ import ch.openolitor.core.ExecutionContextAware import com.typesafe.scalalogging.LazyLogging import org.joda.time.{ DateTime, DateTimeZone } diff --git a/src/main/scala/ch/openolitor/core/system/NonAuthRessourcesRouteService.scala b/src/main/scala/ch/openolitor/core/system/NonAuthRessourcesRouteService.scala index cdf92bde7..f25c9680e 100644 --- a/src/main/scala/ch/openolitor/core/system/NonAuthRessourcesRouteService.scala +++ b/src/main/scala/ch/openolitor/core/system/NonAuthRessourcesRouteService.scala @@ -22,9 +22,9 @@ \* */ package ch.openolitor.core.system -import akka.actor.ActorSystem -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.core.{ ActorReferences, BaseRouteService, AkkaHttpDeserializers, SystemConfig } import ch.openolitor.core.db.ConnectionPoolContextAware import ch.openolitor.core.filestore.{ DefaultFileStoreComponent, FileStoreComponent, ProjektStammdaten } @@ -38,11 +38,11 @@ trait NonAuthRessourcesRouteService extends BaseRouteService with ActorReference override implicit protected val executionContext: ExecutionContext = system.dispatcher // NonAuth-Calls shall not interact with any of the following actor-systems - override val entityStore: akka.actor.ActorRef = null - override val eventStore: akka.actor.ActorRef = null - override val mailService: akka.actor.ActorRef = null - override val reportSystem: akka.actor.ActorRef = null - override val dbEvolutionActor: akka.actor.ActorRef = null + override val entityStore: org.apache.pekko.actor.ActorRef = null + override val eventStore: org.apache.pekko.actor.ActorRef = null + override val mailService: org.apache.pekko.actor.ActorRef = null + override val reportSystem: org.apache.pekko.actor.ActorRef = null + override val dbEvolutionActor: org.apache.pekko.actor.ActorRef = null def ressourcesRoutes: Route = pathPrefix("ressource") { staticFileRoute @@ -66,8 +66,8 @@ trait NonAuthRessourcesRouteService extends BaseRouteService with ActorReference class DefaultNonAuthRessourcesRouteService( override val sysConfig: SystemConfig, override val system: ActorSystem, - override val airbrakeNotifier: akka.actor.ActorRef, - override val jobQueueService: akka.actor.ActorRef + override val airbrakeNotifier: org.apache.pekko.actor.ActorRef, + override val jobQueueService: org.apache.pekko.actor.ActorRef ) extends NonAuthRessourcesRouteService with DefaultFileStoreComponent { override implicit protected val executionContext = system.dispatcher diff --git a/src/main/scala/ch/openolitor/core/system/StatusRoutes.scala b/src/main/scala/ch/openolitor/core/system/StatusRoutes.scala index faca67148..c243bf4c9 100644 --- a/src/main/scala/ch/openolitor/core/system/StatusRoutes.scala +++ b/src/main/scala/ch/openolitor/core/system/StatusRoutes.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.system -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.core._ import scala.util.Properties diff --git a/src/main/scala/ch/openolitor/core/system/SystemRouteService.scala b/src/main/scala/ch/openolitor/core/system/SystemRouteService.scala index f4d312cc5..8fab46e75 100644 --- a/src/main/scala/ch/openolitor/core/system/SystemRouteService.scala +++ b/src/main/scala/ch/openolitor/core/system/SystemRouteService.scala @@ -22,13 +22,13 @@ \* */ package ch.openolitor.core.system -import akka.actor._ -import akka.http.scaladsl.model._ -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route -import akka.pattern.ask -import akka.stream.Materializer -import akka.util.Timeout +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route +import org.apache.pekko.pattern.ask +import org.apache.pekko.stream.Materializer +import org.apache.pekko.util.Timeout import ch.openolitor.core.{ ActorReferences, BaseRouteService, AkkaHttpDeserializers, SystemConfig } import ch.openolitor.core.data.DataImportService import ch.openolitor.core.data.DataImportService.{ ImportData, ImportResult } diff --git a/src/main/scala/ch/openolitor/core/ws/ClientMessagesActor.scala b/src/main/scala/ch/openolitor/core/ws/ClientMessagesActor.scala index 559ad1c11..cdad6e8f6 100644 --- a/src/main/scala/ch/openolitor/core/ws/ClientMessagesActor.scala +++ b/src/main/scala/ch/openolitor/core/ws/ClientMessagesActor.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.core.ws -import akka.actor._ -import akka.stream.scaladsl._ +import org.apache.pekko.actor._ +import org.apache.pekko.stream.scaladsl._ import ch.openolitor.core._ import ch.openolitor.core.models.PersonId import ch.openolitor.core.ws.ClientMessages._ diff --git a/src/main/scala/ch/openolitor/core/ws/ClientMessagesRouteService.scala b/src/main/scala/ch/openolitor/core/ws/ClientMessagesRouteService.scala index 08789e583..1fad3a17c 100644 --- a/src/main/scala/ch/openolitor/core/ws/ClientMessagesRouteService.scala +++ b/src/main/scala/ch/openolitor/core/ws/ClientMessagesRouteService.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.core.ws -import akka.actor.{ ActorRef, ActorSystem } -import akka.http.caching.scaladsl.Cache -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route -import akka.stream.scaladsl.SourceQueueWithComplete +import org.apache.pekko.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.http.caching.scaladsl.Cache +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route +import org.apache.pekko.stream.scaladsl.SourceQueueWithComplete import ch.openolitor.core.{ BaseRouteService, SystemConfig } import ch.openolitor.core.filestore.DefaultFileStoreComponent import ch.openolitor.core.models.PersonId diff --git a/src/main/scala/ch/openolitor/core/ws/ClientMessagesService.scala b/src/main/scala/ch/openolitor/core/ws/ClientMessagesService.scala index 76059e138..c441fa0a6 100644 --- a/src/main/scala/ch/openolitor/core/ws/ClientMessagesService.scala +++ b/src/main/scala/ch/openolitor/core/ws/ClientMessagesService.scala @@ -22,12 +22,12 @@ \* */ package ch.openolitor.core.ws -import akka.{ Done, NotUsed } -import akka.actor._ -import akka.http.caching.scaladsl.Cache -import akka.http.scaladsl.model.ws.{ BinaryMessage, Message, TextMessage } -import akka.stream.{ Materializer, OverflowStrategy } -import akka.stream.scaladsl._ +import org.apache.pekko.{ Done, NotUsed } +import org.apache.pekko.actor._ +import org.apache.pekko.http.caching.scaladsl.Cache +import org.apache.pekko.http.scaladsl.model.ws.{ BinaryMessage, Message, TextMessage } +import org.apache.pekko.stream.{ Materializer, OverflowStrategy } +import org.apache.pekko.stream.scaladsl._ import ch.openolitor.core._ import ch.openolitor.core.models.PersonId import ch.openolitor.core.security.Subject diff --git a/src/main/scala/ch/openolitor/helloworld/HelloWorldRoutes.scala b/src/main/scala/ch/openolitor/helloworld/HelloWorldRoutes.scala index 8db35d422..fec640039 100644 --- a/src/main/scala/ch/openolitor/helloworld/HelloWorldRoutes.scala +++ b/src/main/scala/ch/openolitor/helloworld/HelloWorldRoutes.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.helloworld -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.core._ case class HelloWorld(message: String) diff --git a/src/main/scala/ch/openolitor/kundenportal/KundenportalCommandHandler.scala b/src/main/scala/ch/openolitor/kundenportal/KundenportalCommandHandler.scala index b3f8d0eb0..2e6fcf8dc 100644 --- a/src/main/scala/ch/openolitor/kundenportal/KundenportalCommandHandler.scala +++ b/src/main/scala/ch/openolitor/kundenportal/KundenportalCommandHandler.scala @@ -35,7 +35,7 @@ import ch.openolitor.kundenportal.repositories.{ DefaultKundenportalReadReposito import ch.openolitor.stammdaten.models.{ AboId, AbwesenheitCreate, AbwesenheitId, Lieferplanung, Verrechnet, Abgeschlossen, Offen, Person } import ch.openolitor.arbeitseinsatz.models._ import ch.openolitor.core.Macros._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import scalikejdbc.DB import com.typesafe.scalalogging.LazyLogging import org.joda.time.DateTime diff --git a/src/main/scala/ch/openolitor/kundenportal/KundenportalRoutes.scala b/src/main/scala/ch/openolitor/kundenportal/KundenportalRoutes.scala index 277d7fc91..7a8331b52 100644 --- a/src/main/scala/ch/openolitor/kundenportal/KundenportalRoutes.scala +++ b/src/main/scala/ch/openolitor/kundenportal/KundenportalRoutes.scala @@ -22,11 +22,11 @@ \* */ package ch.openolitor.kundenportal -import akka.actor._ -import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route -import akka.pattern.ask +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route +import org.apache.pekko.pattern.ask import ch.openolitor.arbeitseinsatz.{ ArbeitseinsatzCommandHandler, ArbeitseinsatzJsonProtocol } import ch.openolitor.arbeitseinsatz.models._ import ch.openolitor.buchhaltung.models._ @@ -71,7 +71,7 @@ trait KundenportalRoutes import EntityStore._ def kundenportalRoute(implicit subject: Subject) = - akka.http.scaladsl.server.Directives.parameters("f".?, "g".?) { (f, g) => + org.apache.pekko.http.scaladsl.server.Directives.parameters("f".?, "g".?) { (f, g) => implicit val filter = f flatMap { filterString => UriQueryParamFilterParser.parse(filterString) } diff --git a/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalReadRepositorySyncComponent.scala b/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalReadRepositorySyncComponent.scala index ba859466b..106415f87 100644 --- a/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalReadRepositorySyncComponent.scala +++ b/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalReadRepositorySyncComponent.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.kundenportal.repositories -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core._ trait KundenportalReadRepositorySyncComponent { diff --git a/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalUpdateRepositoryComponent.scala b/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalUpdateRepositoryComponent.scala index cefc1eb2b..af85c3075 100644 --- a/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalUpdateRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalUpdateRepositoryComponent.scala @@ -25,7 +25,7 @@ package ch.openolitor.kundenportal.repositories import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } import ch.openolitor.core.repositories.BaseUpdateRepositoryComponent -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait KundenportalUpdateRepositoryComponent extends BaseUpdateRepositoryComponent { val kundenportalUpdateRepository: KundenportalUpdateRepository diff --git a/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalWriteRepositoryComponent.scala b/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalWriteRepositoryComponent.scala index 4cac05135..7b7aad04a 100644 --- a/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalWriteRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/kundenportal/repositories/KundenportalWriteRepositoryComponent.scala @@ -25,7 +25,7 @@ package ch.openolitor.kundenportal.repositories import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } import ch.openolitor.core.repositories.BaseWriteRepositoryComponent -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait KundenportalWriteRepositoryComponent extends BaseWriteRepositoryComponent { val buchhaltungWriteRepository: KundenportalWriteRepository diff --git a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateCommandHandler.scala b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateCommandHandler.scala index af1b562e4..e607c2a7f 100644 --- a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateCommandHandler.scala +++ b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateCommandHandler.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.mailtemplates -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.SystemConfig import ch.openolitor.core.db.ConnectionPoolContextAware import ch.openolitor.core.domain.EntityStore.{ InsertEntityCommand, ResultingEvent } diff --git a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateDeleteService.scala b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateDeleteService.scala index f94434886..ebb8a1d8f 100644 --- a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateDeleteService.scala +++ b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateDeleteService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.mailtemplates -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.SystemConfig import ch.openolitor.core.db.AsyncConnectionPoolContextAware import ch.openolitor.core.domain.EntityStore._ diff --git a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateEntityStoreView.scala b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateEntityStoreView.scala index b7bb6cc3c..e665204e1 100644 --- a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateEntityStoreView.scala +++ b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateEntityStoreView.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.mailtemplates -import akka.actor.{ ActorRef, ActorSystem, Props } +import org.apache.pekko.actor.{ ActorRef, ActorSystem, Props } import ch.openolitor.core.SystemConfig import ch.openolitor.core.db.ConnectionPoolContextAware import ch.openolitor.core.domain._ diff --git a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateInsertService.scala b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateInsertService.scala index 87484fe5d..37e5a571c 100644 --- a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateInsertService.scala +++ b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateInsertService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.mailtemplates -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.Macros._ import ch.openolitor.core.SystemConfig import ch.openolitor.core.db.AsyncConnectionPoolContextAware diff --git a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateRoutes.scala b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateRoutes.scala index 052bae8f1..01657e9d8 100644 --- a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateRoutes.scala +++ b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateRoutes.scala @@ -22,9 +22,9 @@ \* */ package ch.openolitor.mailtemplates -import akka.actor.{ ActorRef, ActorSystem } -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.core._ import ch.openolitor.core.db.AsyncConnectionPoolContextAware import ch.openolitor.core.filestore.{ DefaultFileStoreComponent, FileStoreComponent } diff --git a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateUpdateService.scala b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateUpdateService.scala index ef81c4ff6..08ebfe303 100644 --- a/src/main/scala/ch/openolitor/mailtemplates/MailTemplateUpdateService.scala +++ b/src/main/scala/ch/openolitor/mailtemplates/MailTemplateUpdateService.scala @@ -32,7 +32,7 @@ import ch.openolitor.core.domain._ import ch.openolitor.core.repositories.EventPublishingImplicits._ import ch.openolitor.core.Macros._ import com.typesafe.scalalogging.LazyLogging -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.SystemConfig object MailTemplateUpdateService { diff --git a/src/main/scala/ch/openolitor/mailtemplates/repositories/MailTemplateReadRepositoryComponent.scala b/src/main/scala/ch/openolitor/mailtemplates/repositories/MailTemplateReadRepositoryComponent.scala index 4bdf3959a..a11044a67 100644 --- a/src/main/scala/ch/openolitor/mailtemplates/repositories/MailTemplateReadRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/mailtemplates/repositories/MailTemplateReadRepositoryComponent.scala @@ -23,7 +23,7 @@ package ch.openolitor.mailtemplates.repositories import ch.openolitor.core.DefaultActorSystemReference -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait MailTemplateReadRepositoryComponent { val mailTemplateReadRepositoryAsync: MailTemplateReadRepositoryAsync diff --git a/src/main/scala/ch/openolitor/mailtemplates/repositories/MailTemplateWriteRepositoryComponent.scala b/src/main/scala/ch/openolitor/mailtemplates/repositories/MailTemplateWriteRepositoryComponent.scala index fdcb9f260..a6a3a4b98 100644 --- a/src/main/scala/ch/openolitor/mailtemplates/repositories/MailTemplateWriteRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/mailtemplates/repositories/MailTemplateWriteRepositoryComponent.scala @@ -24,7 +24,7 @@ package ch.openolitor.mailtemplates.repositories import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } import ch.openolitor.core.repositories.BaseWriteRepositoryComponent -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait MailTemplateWriteRepositoryComponent extends BaseWriteRepositoryComponent { val mailTemplateWriteRepository: MailTemplateWriteRepository diff --git a/src/main/scala/ch/openolitor/reports/ReportAktionenService.scala b/src/main/scala/ch/openolitor/reports/ReportAktionenService.scala index f5d2b9a21..53dcbf4b7 100644 --- a/src/main/scala/ch/openolitor/reports/ReportAktionenService.scala +++ b/src/main/scala/ch/openolitor/reports/ReportAktionenService.scala @@ -26,7 +26,7 @@ import ch.openolitor.core._ import ch.openolitor.core.db._ import ch.openolitor.core.domain._ import com.typesafe.scalalogging.LazyLogging -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.reports.repositories.DefaultReportsWriteRepositoryComponent import ch.openolitor.reports.repositories.ReportsWriteRepositoryComponent diff --git a/src/main/scala/ch/openolitor/reports/ReportsCommandHandler.scala b/src/main/scala/ch/openolitor/reports/ReportsCommandHandler.scala index 30bcd3f4b..35b723c0c 100644 --- a/src/main/scala/ch/openolitor/reports/ReportsCommandHandler.scala +++ b/src/main/scala/ch/openolitor/reports/ReportsCommandHandler.scala @@ -26,7 +26,7 @@ import ch.openolitor.core.domain._ import ch.openolitor.reports.models._ import scala.util._ import ch.openolitor.reports.models._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core._ import ch.openolitor.core.db.ConnectionPoolContextAware import ch.openolitor.core.db.AsyncConnectionPoolContextAware diff --git a/src/main/scala/ch/openolitor/reports/ReportsDBEventEntityListener.scala b/src/main/scala/ch/openolitor/reports/ReportsDBEventEntityListener.scala index 196dfe716..a4b7521a6 100644 --- a/src/main/scala/ch/openolitor/reports/ReportsDBEventEntityListener.scala +++ b/src/main/scala/ch/openolitor/reports/ReportsDBEventEntityListener.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.reports -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.models._ import spray.json._ import ch.openolitor.reports.models._ diff --git a/src/main/scala/ch/openolitor/reports/ReportsDeleteService.scala b/src/main/scala/ch/openolitor/reports/ReportsDeleteService.scala index 6828a3ce7..263c7d279 100644 --- a/src/main/scala/ch/openolitor/reports/ReportsDeleteService.scala +++ b/src/main/scala/ch/openolitor/reports/ReportsDeleteService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.reports -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core._ import ch.openolitor.core.db._ import ch.openolitor.core.domain.EntityStore._ diff --git a/src/main/scala/ch/openolitor/reports/ReportsEntityStoreView.scala b/src/main/scala/ch/openolitor/reports/ReportsEntityStoreView.scala index 62e6ee8f1..17feb7304 100644 --- a/src/main/scala/ch/openolitor/reports/ReportsEntityStoreView.scala +++ b/src/main/scala/ch/openolitor/reports/ReportsEntityStoreView.scala @@ -25,11 +25,11 @@ package ch.openolitor.reports import ch.openolitor.core.domain._ import ch.openolitor.core._ import ch.openolitor.core.db.ConnectionPoolContextAware -import akka.actor.Props -import akka.actor.ActorSystem +import org.apache.pekko.actor.Props +import org.apache.pekko.actor.ActorSystem import ch.openolitor.reports.repositories.DefaultReportsWriteRepositoryComponent import ch.openolitor.reports.repositories.ReportsWriteRepositoryComponent -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef object ReportsEntityStoreView { def props(dbEvolutionActor: ActorRef, airbrakeNotifier: ActorRef)(implicit sysConfig: SystemConfig, system: ActorSystem): Props = Props(classOf[DefaultReportsEntityStoreView], dbEvolutionActor, sysConfig, system, airbrakeNotifier) diff --git a/src/main/scala/ch/openolitor/reports/ReportsInsertService.scala b/src/main/scala/ch/openolitor/reports/ReportsInsertService.scala index cb310f468..32c613f33 100644 --- a/src/main/scala/ch/openolitor/reports/ReportsInsertService.scala +++ b/src/main/scala/ch/openolitor/reports/ReportsInsertService.scala @@ -30,7 +30,7 @@ import ch.openolitor.reports.models._ import scalikejdbc.DB import com.typesafe.scalalogging.LazyLogging import ch.openolitor.core.domain.EntityStore._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.Macros._ import ch.openolitor.core.Macros._ import ch.openolitor.reports.repositories.DefaultReportsWriteRepositoryComponent diff --git a/src/main/scala/ch/openolitor/reports/ReportsRoutes.scala b/src/main/scala/ch/openolitor/reports/ReportsRoutes.scala index fb5439291..7f864e143 100644 --- a/src/main/scala/ch/openolitor/reports/ReportsRoutes.scala +++ b/src/main/scala/ch/openolitor/reports/ReportsRoutes.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.reports -import akka.actor._ -import akka.http.scaladsl.server.Directives._ +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.server.Directives._ import ch.openolitor.core._ import ch.openolitor.core.db._ import ch.openolitor.core.filestore._ diff --git a/src/main/scala/ch/openolitor/reports/ReportsUpdateService.scala b/src/main/scala/ch/openolitor/reports/ReportsUpdateService.scala index 37d092e7f..3b4cca300 100644 --- a/src/main/scala/ch/openolitor/reports/ReportsUpdateService.scala +++ b/src/main/scala/ch/openolitor/reports/ReportsUpdateService.scala @@ -29,7 +29,7 @@ import ch.openolitor.reports.models._ import scalikejdbc.DB import com.typesafe.scalalogging.LazyLogging import ch.openolitor.core.domain.EntityStore._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.models.PersonId import ch.openolitor.reports.repositories.DefaultReportsWriteRepositoryComponent import ch.openolitor.reports.repositories.ReportsWriteRepositoryComponent diff --git a/src/main/scala/ch/openolitor/reports/SyncReportsRoutes.scala b/src/main/scala/ch/openolitor/reports/SyncReportsRoutes.scala index b25115b96..95ba553c8 100644 --- a/src/main/scala/ch/openolitor/reports/SyncReportsRoutes.scala +++ b/src/main/scala/ch/openolitor/reports/SyncReportsRoutes.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.reports -import akka.actor._ -import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.core._ import ch.openolitor.core.db._ import ch.openolitor.core.filestore._ diff --git a/src/main/scala/ch/openolitor/reports/repositories/ReportsReadRepositorySyncComponent.scala b/src/main/scala/ch/openolitor/reports/repositories/ReportsReadRepositorySyncComponent.scala index e74442d4d..ac68de7fc 100644 --- a/src/main/scala/ch/openolitor/reports/repositories/ReportsReadRepositorySyncComponent.scala +++ b/src/main/scala/ch/openolitor/reports/repositories/ReportsReadRepositorySyncComponent.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.reports.repositories -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.DefaultActorSystemReference trait ReportsReadRepositorySyncComponent { diff --git a/src/main/scala/ch/openolitor/reports/repositories/ReportsUpdateRepositoryComponent.scala b/src/main/scala/ch/openolitor/reports/repositories/ReportsUpdateRepositoryComponent.scala index 8af7a8c68..3c55b3561 100644 --- a/src/main/scala/ch/openolitor/reports/repositories/ReportsUpdateRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/reports/repositories/ReportsUpdateRepositoryComponent.scala @@ -25,7 +25,7 @@ package ch.openolitor.reports.repositories import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } import ch.openolitor.core.repositories.BaseUpdateRepositoryComponent -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait ReportsUpdateRepositoryComponent extends BaseUpdateRepositoryComponent { val reportsUpdateRepository: ReportsUpdateRepository diff --git a/src/main/scala/ch/openolitor/reports/repositories/ReportsWriteRepositoryComponent.scala b/src/main/scala/ch/openolitor/reports/repositories/ReportsWriteRepositoryComponent.scala index d121477ee..f9b6362a8 100644 --- a/src/main/scala/ch/openolitor/reports/repositories/ReportsWriteRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/reports/repositories/ReportsWriteRepositoryComponent.scala @@ -25,7 +25,7 @@ package ch.openolitor.reports.repositories import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } import ch.openolitor.core.repositories.BaseWriteRepositoryComponent -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait ReportsWriteRepositoryComponent extends BaseWriteRepositoryComponent { val reportsWriteRepository: ReportsWriteRepository diff --git a/src/main/scala/ch/openolitor/stammdaten/DefaultMailCommandForwarder.scala b/src/main/scala/ch/openolitor/stammdaten/DefaultMailCommandForwarder.scala index 5bc70fbb6..4c8cab621 100644 --- a/src/main/scala/ch/openolitor/stammdaten/DefaultMailCommandForwarder.scala +++ b/src/main/scala/ch/openolitor/stammdaten/DefaultMailCommandForwarder.scala @@ -22,9 +22,9 @@ \* */ package ch.openolitor.stammdaten -import akka.actor.ActorRef -import akka.pattern.ask -import akka.util.Timeout +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.pattern.ask +import org.apache.pekko.util.Timeout import ch.openolitor.core.db.AsyncConnectionPoolContextAware import ch.openolitor.core.domain.EventTransactionMetadata import ch.openolitor.core.eventsourcing.CoreEventStoreSerializer diff --git a/src/main/scala/ch/openolitor/stammdaten/MailCommandForwarder.scala b/src/main/scala/ch/openolitor/stammdaten/MailCommandForwarder.scala index 3c5d38dcb..b0a621504 100644 --- a/src/main/scala/ch/openolitor/stammdaten/MailCommandForwarder.scala +++ b/src/main/scala/ch/openolitor/stammdaten/MailCommandForwarder.scala @@ -31,9 +31,9 @@ import ch.openolitor.core.repositories.EventPublishingImplicits._ import ch.openolitor.core.db.AsyncConnectionPoolContextAware import ch.openolitor.stammdaten.eventsourcing.StammdatenEventStoreSerializer import ch.openolitor.core.EventStream -import akka.actor.ActorRef -import akka.pattern.ask -import akka.util.Timeout +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.pattern.ask +import org.apache.pekko.util.Timeout import scalikejdbc._ import com.typesafe.scalalogging.LazyLogging diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenAktionenService.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenAktionenService.scala index 5a7687789..f0c679f17 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenAktionenService.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenAktionenService.scala @@ -22,9 +22,9 @@ \* */ package ch.openolitor.stammdaten -import akka.actor.{ ActorRef, ActorSystem } -import akka.pattern.ask -import akka.util.Timeout +import org.apache.pekko.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.pattern.ask +import org.apache.pekko.util.Timeout import ch.openolitor.core.Macros._ import ch.openolitor.core._ import ch.openolitor.core.db._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenCommandHandler.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenCommandHandler.scala index 5da9d203d..5eedbf3b1 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenCommandHandler.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenCommandHandler.scala @@ -33,8 +33,8 @@ import scalikejdbc.DB import ch.openolitor.stammdaten.models._ import ch.openolitor.stammdaten.repositories._ import ch.openolitor.core.exceptions._ -import akka.actor.{ ActorRef, ActorSystem } -import akka.persistence.journal.EmptyEventSeq +import org.apache.pekko.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.persistence.journal.EmptyEventSeq import ch.openolitor.core._ import ch.openolitor.core.db.ConnectionPoolContextAware import ch.openolitor.core.Macros._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenDBEventEntityListener.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenDBEventEntityListener.scala index 4dcea6b71..950def61a 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenDBEventEntityListener.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenDBEventEntityListener.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.stammdaten -import akka.actor._ +import org.apache.pekko.actor._ import spray.json._ import scalikejdbc._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenDeleteService.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenDeleteService.scala index 02ee18546..5fc612211 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenDeleteService.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenDeleteService.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.stammdaten -import akka.actor._ +import org.apache.pekko.actor._ import scalikejdbc._ import ch.openolitor.core._ import ch.openolitor.core.models._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenEntityStoreView.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenEntityStoreView.scala index c5305dc3b..728e1ca2b 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenEntityStoreView.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenEntityStoreView.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.stammdaten -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core._ import ch.openolitor.core.db.ConnectionPoolContextAware import ch.openolitor.core.domain._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenGeneratedEventsListener.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenGeneratedEventsListener.scala index 7a7ef932e..84a8e1d7d 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenGeneratedEventsListener.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenGeneratedEventsListener.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.stammdaten -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.SystemConfig import ch.openolitor.stammdaten.models._ import ch.openolitor.stammdaten.repositories._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenInsertService.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenInsertService.scala index 54441242d..065d1f16e 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenInsertService.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenInsertService.scala @@ -30,7 +30,7 @@ import ch.openolitor.stammdaten.repositories._ import scalikejdbc.DB import com.typesafe.scalalogging.LazyLogging import ch.openolitor.core.domain.EntityStore._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.models._ import org.joda.time.LocalDate import ch.openolitor.core.Macros._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenMailListener.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenMailListener.scala index 93683eeed..3ebdd0829 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenMailListener.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenMailListener.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.stammdaten -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.SystemConfig import ch.openolitor.core.mailservice.MailService._ import ch.openolitor.stammdaten.models._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenOpenRoutes.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenOpenRoutes.scala index fb882f0a9..7993c7b79 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenOpenRoutes.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenOpenRoutes.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.stammdaten -import akka.actor._ -import akka.http.scaladsl.model.{ ContentType, MediaTypes } -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.server.Route +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.{ ContentType, MediaTypes } +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.buchhaltung.repositories.{ BuchhaltungReadRepositoryAsyncComponent, DefaultBuchhaltungReadRepositoryAsyncComponent } import ch.openolitor.buchhaltung.BuchhaltungJsonProtocol import ch.openolitor.core._ diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenRoutes.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenRoutes.scala index 19623a995..2fca5472b 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenRoutes.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenRoutes.scala @@ -22,8 +22,8 @@ \* */ package ch.openolitor.stammdaten -import akka.http.scaladsl.model.StatusCodes -import akka.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.server.Directives._ import org.joda.time.DateTime import spray.json._ import ch.openolitor.core._ @@ -31,10 +31,10 @@ import ch.openolitor.core.domain._ import ch.openolitor.core.db._ import scala.util._ -import akka.pattern.ask +import org.apache.pekko.pattern.ask import scala.concurrent.duration._ -import akka.util.Timeout +import org.apache.pekko.util.Timeout import ch.openolitor.stammdaten.models._ import ch.openolitor.core.models._ import ch.openolitor.core.Macros._ @@ -43,9 +43,9 @@ import stamina.Persister import ch.openolitor.stammdaten.reporting._ import com.typesafe.scalalogging.LazyLogging import ch.openolitor.core.filestore._ -import akka.actor._ -import akka.http.scaladsl.model.headers.{ `Content-Disposition`, ContentDispositionTypes } -import akka.http.scaladsl.server.Route +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model.headers.{ `Content-Disposition`, ContentDispositionTypes } +import org.apache.pekko.http.scaladsl.server.Route import ch.openolitor.buchhaltung.repositories.BuchhaltungReadRepositoryAsyncComponent import ch.openolitor.buchhaltung.repositories.DefaultBuchhaltungReadRepositoryAsyncComponent import ch.openolitor.buchhaltung.BuchhaltungJsonProtocol diff --git a/src/main/scala/ch/openolitor/stammdaten/StammdatenUpdateService.scala b/src/main/scala/ch/openolitor/stammdaten/StammdatenUpdateService.scala index dd7731888..44caf55ef 100644 --- a/src/main/scala/ch/openolitor/stammdaten/StammdatenUpdateService.scala +++ b/src/main/scala/ch/openolitor/stammdaten/StammdatenUpdateService.scala @@ -33,7 +33,7 @@ import ch.openolitor.core.exceptions._ import scalikejdbc.DB import com.typesafe.scalalogging.LazyLogging import ch.openolitor.core.domain.EntityStore._ -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.stammdaten.models.AbotypModify import ch.openolitor.core.models.PersonId import scalikejdbc.DBSession diff --git a/src/main/scala/ch/openolitor/stammdaten/batch/StammdatenBatchJobs.scala b/src/main/scala/ch/openolitor/stammdaten/batch/StammdatenBatchJobs.scala index 9cbdfd137..32c20f074 100644 --- a/src/main/scala/ch/openolitor/stammdaten/batch/StammdatenBatchJobs.scala +++ b/src/main/scala/ch/openolitor/stammdaten/batch/StammdatenBatchJobs.scala @@ -23,11 +23,11 @@ package ch.openolitor.stammdaten.batch import ch.openolitor.core.SystemConfig -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import ch.openolitor.stammdaten.repositories.DefaultStammdatenWriteRepositoryComponent import ch.openolitor.core.batch.BaseBatchJobsSupervisor -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef import ch.openolitor.stammdaten.batch.calculations.KorbStatusCalculation import ch.openolitor.stammdaten.batch.calculations.AktiveAbosCalculation import ch.openolitor.stammdaten.batch.calculations.LieferungCounterCalculation diff --git a/src/main/scala/ch/openolitor/stammdaten/batch/calculations/AktiveAbosCalculation.scala b/src/main/scala/ch/openolitor/stammdaten/batch/calculations/AktiveAbosCalculation.scala index 50d0da622..dedf17d6c 100644 --- a/src/main/scala/ch/openolitor/stammdaten/batch/calculations/AktiveAbosCalculation.scala +++ b/src/main/scala/ch/openolitor/stammdaten/batch/calculations/AktiveAbosCalculation.scala @@ -23,8 +23,8 @@ package ch.openolitor.stammdaten.batch.calculations import ch.openolitor.core.SystemConfig -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import ch.openolitor.core.batch.BaseBatchJob import scala.concurrent.duration._ import ch.openolitor.core.batch.BatchJobs._ @@ -33,7 +33,7 @@ import ch.openolitor.core.db.AsyncConnectionPoolContextAware import ch.openolitor.stammdaten.repositories.DefaultStammdatenWriteRepositoryComponent import scalikejdbc._ import ch.openolitor.stammdaten.repositories.StammdatenRepositoryQueries -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef object AktiveAbosCalculation { def props(sysConfig: SystemConfig, system: ActorSystem, entityStore: ActorRef): Props = Props(classOf[AktiveAbosCalculation], sysConfig, system, entityStore) diff --git a/src/main/scala/ch/openolitor/stammdaten/batch/calculations/KorbStatusCalculation.scala b/src/main/scala/ch/openolitor/stammdaten/batch/calculations/KorbStatusCalculation.scala index ab4c951de..b06c7a6c0 100644 --- a/src/main/scala/ch/openolitor/stammdaten/batch/calculations/KorbStatusCalculation.scala +++ b/src/main/scala/ch/openolitor/stammdaten/batch/calculations/KorbStatusCalculation.scala @@ -23,8 +23,8 @@ package ch.openolitor.stammdaten.batch.calculations import ch.openolitor.core.SystemConfig -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import ch.openolitor.core.batch.BaseBatchJob import ch.openolitor.stammdaten.StammdatenDBMappings import scalikejdbc._ diff --git a/src/main/scala/ch/openolitor/stammdaten/batch/calculations/LieferungCounterCalculation.scala b/src/main/scala/ch/openolitor/stammdaten/batch/calculations/LieferungCounterCalculation.scala index 95a074743..0587d8295 100644 --- a/src/main/scala/ch/openolitor/stammdaten/batch/calculations/LieferungCounterCalculation.scala +++ b/src/main/scala/ch/openolitor/stammdaten/batch/calculations/LieferungCounterCalculation.scala @@ -23,8 +23,8 @@ package ch.openolitor.stammdaten.batch.calculations import ch.openolitor.core.SystemConfig -import akka.actor.ActorSystem -import akka.actor.Props +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.actor.Props import ch.openolitor.core.batch.BaseBatchJob import ch.openolitor.stammdaten.StammdatenDBMappings import scalikejdbc._ diff --git a/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenReadRepositorySyncComponent.scala b/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenReadRepositorySyncComponent.scala index cd030c1e5..51f1fc777 100644 --- a/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenReadRepositorySyncComponent.scala +++ b/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenReadRepositorySyncComponent.scala @@ -24,7 +24,7 @@ package ch.openolitor.stammdaten.repositories import ch.openolitor.core.DefaultActorSystemReference -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait StammdatenReadRepositorySyncComponent { val stammdatenReadRepository: StammdatenReadRepositorySync diff --git a/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenUpdateRepositoryComponent.scala b/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenUpdateRepositoryComponent.scala index 404999b7a..a62795f58 100644 --- a/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenUpdateRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenUpdateRepositoryComponent.scala @@ -25,7 +25,7 @@ package ch.openolitor.stammdaten.repositories import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } import ch.openolitor.core.repositories.BaseUpdateRepositoryComponent -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem trait StammdatenUpdateRepositoryComponent extends BaseUpdateRepositoryComponent { val stammdatenUpdateRepository: StammdatenUpdateRepository diff --git a/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenWriteRepositoryComponent.scala b/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenWriteRepositoryComponent.scala index 8cc9e9532..f04ca950a 100644 --- a/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenWriteRepositoryComponent.scala +++ b/src/main/scala/ch/openolitor/stammdaten/repositories/StammdatenWriteRepositoryComponent.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.stammdaten.repositories -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.repositories.BaseWriteRepositoryComponent import ch.openolitor.core.{ AkkaEventStream, DefaultActorSystemReference } diff --git a/src/main/scala/ch/openolitor/util/AirbrakeNotifier.scala b/src/main/scala/ch/openolitor/util/AirbrakeNotifier.scala index c6809f86a..1c495e8ad 100644 --- a/src/main/scala/ch/openolitor/util/AirbrakeNotifier.scala +++ b/src/main/scala/ch/openolitor/util/AirbrakeNotifier.scala @@ -22,9 +22,9 @@ \* */ package ch.openolitor.util -import akka.actor._ -import akka.http.scaladsl.model._ -import akka.http.scaladsl.Http +import org.apache.pekko.actor._ +import org.apache.pekko.http.scaladsl.model._ +import org.apache.pekko.http.scaladsl.Http import ch.openolitor.core.SystemConfig import ch.openolitor.util.ConfigUtil._ diff --git a/src/main/scala/ch/openolitor/util/ByteStringUtil.scala b/src/main/scala/ch/openolitor/util/ByteStringUtil.scala index 557e44b19..fd93fcd00 100644 --- a/src/main/scala/ch/openolitor/util/ByteStringUtil.scala +++ b/src/main/scala/ch/openolitor/util/ByteStringUtil.scala @@ -24,7 +24,7 @@ package ch.openolitor.util import java.io.InputStream import scala.util.Try -import akka.util.ByteString +import org.apache.pekko.util.ByteString object ByteStringUtil { def readFromInputStream(is: InputStream): Try[ByteString] = { diff --git a/src/main/scala/ch/openolitor/util/ParseImportDataApp.scala b/src/main/scala/ch/openolitor/util/ParseImportDataApp.scala index f6fb09602..62aafc598 100644 --- a/src/main/scala/ch/openolitor/util/ParseImportDataApp.scala +++ b/src/main/scala/ch/openolitor/util/ParseImportDataApp.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.util -import akka.actor._ +import org.apache.pekko.actor._ import ch.openolitor.core.data._ import ch.openolitor.core.data.DataImportParser._ import java.io.File diff --git a/src/test/resources/application-test.conf b/src/test/resources/application-test.conf index ba21808cc..0c574490f 100644 --- a/src/test/resources/application-test.conf +++ b/src/test/resources/application-test.conf @@ -13,12 +13,12 @@ openolitor { slick = ${openolitor.test.slick} } - # the akka-persistence-snapshot-store in use + # the pekko-persistence-snapshot-store in use jdbc-snapshot-store { slick = ${openolitor.test.slick} } - # the akka-persistence-query provider in use + # the pekko-persistence-query provider in use jdbc-read-journal { slick = ${openolitor.test.slick} } @@ -96,4 +96,14 @@ openolitor { expires_after_access_hours: 4 } } +} + +pekko { + loglevel = DEBUG + + actor.debug { + receive = on + autoreceive = on + lifecycle = on + } } \ No newline at end of file diff --git a/src/test/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzRoutesAdminSetupSpec.scala b/src/test/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzRoutesAdminSetupSpec.scala index 9ed21bd5c..04a8bcd5a 100644 --- a/src/test/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzRoutesAdminSetupSpec.scala +++ b/src/test/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzRoutesAdminSetupSpec.scala @@ -1,7 +1,7 @@ package ch.openolitor.arbeitseinsatz -import akka.http.scaladsl.model.{ Multipart, StatusCodes } -import akka.http.scaladsl.testkit.WSProbe +import org.apache.pekko.http.scaladsl.model.{ Multipart, StatusCodes } +import org.apache.pekko.http.scaladsl.testkit.WSProbe import ch.openolitor.arbeitseinsatz.models._ import ch.openolitor.core.{ BaseRoutesWithDBSpec, SpecSubjects } import ch.openolitor.core.db.WithWriteRepositories diff --git a/src/test/scala/ch/openolitor/arbeitseinsatz/MockArbeitseinsatzRoutes.scala b/src/test/scala/ch/openolitor/arbeitseinsatz/MockArbeitseinsatzRoutes.scala index d979f5b80..2689b62cb 100644 --- a/src/test/scala/ch/openolitor/arbeitseinsatz/MockArbeitseinsatzRoutes.scala +++ b/src/test/scala/ch/openolitor/arbeitseinsatz/MockArbeitseinsatzRoutes.scala @@ -1,6 +1,6 @@ package ch.openolitor.arbeitseinsatz -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.arbeitseinsatz.repositories.DefaultArbeitseinsatzReadRepositoryAsyncComponent import ch.openolitor.core.{ MockInMemoryActorReferences, SystemConfig } import ch.openolitor.core.db.MockDBComponent diff --git a/src/test/scala/ch/openolitor/buchhaltung/BuchhaltungInsertServiceSpec.scala b/src/test/scala/ch/openolitor/buchhaltung/BuchhaltungInsertServiceSpec.scala index 153c68606..c09a39e95 100644 --- a/src/test/scala/ch/openolitor/buchhaltung/BuchhaltungInsertServiceSpec.scala +++ b/src/test/scala/ch/openolitor/buchhaltung/BuchhaltungInsertServiceSpec.scala @@ -28,7 +28,7 @@ import ch.openolitor.buchhaltung.models._ import org.joda.time.DateTime import ch.openolitor.core.MandantConfiguration import ch.openolitor.core.SystemConfig -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.models.PersonId class BuchhaltungInsertServiceSpec extends Specification { diff --git a/src/test/scala/ch/openolitor/buchhaltung/BuchhaltungRoutesRechnungSpec.scala b/src/test/scala/ch/openolitor/buchhaltung/BuchhaltungRoutesRechnungSpec.scala index 08e14879d..f5693ba1a 100644 --- a/src/test/scala/ch/openolitor/buchhaltung/BuchhaltungRoutesRechnungSpec.scala +++ b/src/test/scala/ch/openolitor/buchhaltung/BuchhaltungRoutesRechnungSpec.scala @@ -1,6 +1,6 @@ package ch.openolitor.buchhaltung -import akka.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.model.StatusCodes import ch.openolitor.buchhaltung.models.{ Rechnung, RechnungenContainer, RechnungsPosition, RechnungsPositionenCreateRechnungen } import ch.openolitor.core.{ BaseRoutesWithDBSpec, SpecSubjects } import ch.openolitor.core.db.WithWriteRepositories diff --git a/src/test/scala/ch/openolitor/buchhaltung/MockBuchhaltungRoutes.scala b/src/test/scala/ch/openolitor/buchhaltung/MockBuchhaltungRoutes.scala index e3a25f9a6..ab6c6a870 100644 --- a/src/test/scala/ch/openolitor/buchhaltung/MockBuchhaltungRoutes.scala +++ b/src/test/scala/ch/openolitor/buchhaltung/MockBuchhaltungRoutes.scala @@ -1,6 +1,6 @@ package ch.openolitor.buchhaltung -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.buchhaltung.repositories.DefaultBuchhaltungReadRepositoryAsyncComponent import ch.openolitor.core.{ MockInMemoryActorReferences, SystemConfig } import ch.openolitor.core.db.MockDBComponent diff --git a/src/test/scala/ch/openolitor/core/BaseSpec.scala b/src/test/scala/ch/openolitor/core/BaseSpec.scala index 951686b55..b807dddf3 100644 --- a/src/test/scala/ch/openolitor/core/BaseSpec.scala +++ b/src/test/scala/ch/openolitor/core/BaseSpec.scala @@ -1,8 +1,8 @@ package ch.openolitor.core -import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport -import akka.http.scaladsl.testkit.{ RouteTestTimeout, Specs2RouteTest } -import akka.testkit.TestProbe +import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport +import org.apache.pekko.http.scaladsl.testkit.{ RouteTestTimeout, Specs2RouteTest } +import org.apache.pekko.testkit.TestProbe import ch.openolitor.core.db.WithInMemoryDatabase import ch.openolitor.core.filestore.{ MockFileStoreComponent, WithInMemoryFileStore } import ch.openolitor.core.models._ @@ -20,7 +20,7 @@ trait BaseSpec extends Specification with ScalaCheck with Matchers { } trait BaseRoutesSpec extends BaseSpec with Specs2RouteTest with SprayJsonSupport with AkkaHttpDeserializers with BaseJsonProtocol with EntityStoreReference with MockFileStoreComponent with MockActorReferences with LazyLogging { - import akka.testkit._ + import org.apache.pekko.testkit._ implicit val timeout = RouteTestTimeout(defaultTimeout.dilated) @@ -63,7 +63,7 @@ trait BaseRoutesWithDBSpec extends BaseRoutesSpec with WithInMemoryPdfGenerator } /** - * @return a [[akka.testkit.TestProbe]] listening on the eventStream for [[ch.openolitor.core.models.DBEvent]]s. + * @return a [[pekko.testkit.TestProbe]] listening on the eventStream for [[ch.openolitor.core.models.DBEvent]]s. */ protected def initializeDBEventProbe() = { val probe = TestProbe() diff --git a/src/test/scala/ch/openolitor/core/EventMatchers.scala b/src/test/scala/ch/openolitor/core/EventMatchers.scala index 69ba79946..8a284ac62 100644 --- a/src/test/scala/ch/openolitor/core/EventMatchers.scala +++ b/src/test/scala/ch/openolitor/core/EventMatchers.scala @@ -1,6 +1,6 @@ package ch.openolitor.core -import akka.testkit.TestProbe +import org.apache.pekko.testkit.TestProbe import ch.openolitor.core.models._ import com.typesafe.scalalogging.LazyLogging import org.specs2.matcher.MatchResult diff --git a/src/test/scala/ch/openolitor/core/MockActorReferences.scala b/src/test/scala/ch/openolitor/core/MockActorReferences.scala index aecd1adc4..802b54e4a 100644 --- a/src/test/scala/ch/openolitor/core/MockActorReferences.scala +++ b/src/test/scala/ch/openolitor/core/MockActorReferences.scala @@ -1,7 +1,7 @@ package ch.openolitor.core -import akka.actor.ActorRef -import akka.testkit.TestProbe +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.testkit.TestProbe trait MockActorReferences extends ActorReferences with SystemConfigReference with ActorSystemReference { private lazy val mailServiceProbe = TestProbe()(system) diff --git a/src/test/scala/ch/openolitor/core/MockInMemoryActorReferences.scala b/src/test/scala/ch/openolitor/core/MockInMemoryActorReferences.scala index 08b81bbaa..fc94b9cf0 100644 --- a/src/test/scala/ch/openolitor/core/MockInMemoryActorReferences.scala +++ b/src/test/scala/ch/openolitor/core/MockInMemoryActorReferences.scala @@ -1,6 +1,6 @@ package ch.openolitor.core -import akka.actor.ActorRef +import org.apache.pekko.actor.ActorRef import ch.openolitor.core.MockInMemoryActorReferences.MockStartedServices import ch.openolitor.core.batch.BatchJobs.InitializeBatchJob import ch.openolitor.core.domain.SystemEvents.SystemStarted diff --git a/src/test/scala/ch/openolitor/core/WsInteractionsForReports.scala b/src/test/scala/ch/openolitor/core/WsInteractionsForReports.scala index c013dcfa0..2e0d62f57 100644 --- a/src/test/scala/ch/openolitor/core/WsInteractionsForReports.scala +++ b/src/test/scala/ch/openolitor/core/WsInteractionsForReports.scala @@ -1,7 +1,7 @@ package ch.openolitor.core -import akka.http.scaladsl.testkit.WSProbe -import akka.testkit.TestProbe +import org.apache.pekko.http.scaladsl.testkit.WSProbe +import org.apache.pekko.testkit.TestProbe import ch.openolitor.core.jobs.JobQueueService.{ FetchJobResult, FileResultPayload, JobResult } import ch.openolitor.core.reporting.AsyncReportServiceResult import ch.openolitor.core.ws.MockClientMessagesRouteService diff --git a/src/test/scala/ch/openolitor/core/db/WithInMemoryDatabase.scala b/src/test/scala/ch/openolitor/core/db/WithInMemoryDatabase.scala index c733599c6..055ee79be 100644 --- a/src/test/scala/ch/openolitor/core/db/WithInMemoryDatabase.scala +++ b/src/test/scala/ch/openolitor/core/db/WithInMemoryDatabase.scala @@ -12,8 +12,8 @@ import org.testcontainers.containers.{ MariaDBContainer => JavaMariaDBContainer import org.testcontainers.utility.MountableFile import java.util.Collections -import akka.testkit.TestProbe -import akka.util.Timeout +import org.apache.pekko.testkit.TestProbe +import org.apache.pekko.util.Timeout import ch.openolitor.core.db.evolution.scripts.Scripts import ch.openolitor.core.db.evolution.DBEvolutionActor.{ CheckDBEvolution, DBEvolutionState } import ch.openolitor.stammdaten.models.KundeId diff --git a/src/test/scala/ch/openolitor/core/filestore/MockFileStoreComponent.scala b/src/test/scala/ch/openolitor/core/filestore/MockFileStoreComponent.scala index 18f29a167..936c66b8b 100644 --- a/src/test/scala/ch/openolitor/core/filestore/MockFileStoreComponent.scala +++ b/src/test/scala/ch/openolitor/core/filestore/MockFileStoreComponent.scala @@ -1,6 +1,6 @@ package ch.openolitor.core.filestore -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.MandantConfiguration import scala.collection.concurrent.TrieMap diff --git a/src/test/scala/ch/openolitor/core/filestore/WithInMemoryFileStore.scala b/src/test/scala/ch/openolitor/core/filestore/WithInMemoryFileStore.scala index 6fc73f452..7138a96f5 100644 --- a/src/test/scala/ch/openolitor/core/filestore/WithInMemoryFileStore.scala +++ b/src/test/scala/ch/openolitor/core/filestore/WithInMemoryFileStore.scala @@ -1,6 +1,6 @@ package ch.openolitor.core.filestore -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.config.ModifyingSystemConfigReference import com.typesafe.config.{ Config, ConfigValueFactory } import io.findify.s3mock.S3Mock diff --git a/src/test/scala/ch/openolitor/core/mailservice/MailServiceMock.scala b/src/test/scala/ch/openolitor/core/mailservice/MailServiceMock.scala index 3a67e927f..4a78885f8 100644 --- a/src/test/scala/ch/openolitor/core/mailservice/MailServiceMock.scala +++ b/src/test/scala/ch/openolitor/core/mailservice/MailServiceMock.scala @@ -22,7 +22,7 @@ \* */ package ch.openolitor.core.mailservice -import akka.actor._ +import org.apache.pekko.actor._ import MailService.SendMailEvent import MailService.SendMailCommand import org.joda.time.DateTime diff --git a/src/test/scala/ch/openolitor/core/mailservice/MailServiceSpec.scala b/src/test/scala/ch/openolitor/core/mailservice/MailServiceSpec.scala index 7f7efe183..7b80dfb5d 100644 --- a/src/test/scala/ch/openolitor/core/mailservice/MailServiceSpec.scala +++ b/src/test/scala/ch/openolitor/core/mailservice/MailServiceSpec.scala @@ -23,10 +23,10 @@ package ch.openolitor.core.mailservice import org.specs2.mutable.Specification -import akka.testkit.TestKit -import akka.actor.ActorSystem +import org.apache.pekko.testkit.TestKit +import org.apache.pekko.actor.ActorSystem import org.specs2.specification.Scope -import akka.testkit.TestProbe +import org.apache.pekko.testkit.TestProbe import ch.openolitor.core.SystemConfig import ch.openolitor.core.MandantConfiguration import com.tegonal.CFEnvConfigLoader.ConfigLoader diff --git a/src/test/scala/ch/openolitor/core/security/LoginRouteServiceSpec.scala b/src/test/scala/ch/openolitor/core/security/LoginRouteServiceSpec.scala index 8c834998a..ebbb8ae20 100644 --- a/src/test/scala/ch/openolitor/core/security/LoginRouteServiceSpec.scala +++ b/src/test/scala/ch/openolitor/core/security/LoginRouteServiceSpec.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.core.security -import akka.actor.{ ActorRef, ActorSystem } -import akka.http.caching.scaladsl.Cache -import akka.http.caching.LfuCache -import akka.testkit.{ TestActorRef, TestProbe } +import org.apache.pekko.actor.{ ActorRef, ActorSystem } +import org.apache.pekko.http.caching.scaladsl.Cache +import org.apache.pekko.http.caching.LfuCache +import org.apache.pekko.testkit.{ TestActorRef, TestProbe } import ch.openolitor.core.{ SpecSubjects, SystemConfig } import ch.openolitor.core.db.MultipleAsyncConnectionPoolContext import ch.openolitor.core.domain.SystemEvents.PersonChangedOtpSecret diff --git a/src/test/scala/ch/openolitor/core/security/XSRFTokenSessionAuthenticatorImplSpec.scala b/src/test/scala/ch/openolitor/core/security/XSRFTokenSessionAuthenticatorImplSpec.scala index a3a88c217..6330bd3eb 100644 --- a/src/test/scala/ch/openolitor/core/security/XSRFTokenSessionAuthenticatorImplSpec.scala +++ b/src/test/scala/ch/openolitor/core/security/XSRFTokenSessionAuthenticatorImplSpec.scala @@ -22,14 +22,14 @@ \* */ package ch.openolitor.core.security -import akka.actor.ActorSystem -import akka.http.caching.LfuCache -import akka.http.caching.scaladsl.Cache -import akka.http.scaladsl.model.{ HttpMethod, HttpMethods, StatusCodes } -import akka.http.scaladsl.model.headers._ -import akka.http.scaladsl.server._ -import akka.http.scaladsl.server.Directives._ -import akka.http.scaladsl.testkit.Specs2RouteTest +import org.apache.pekko.actor.ActorSystem +import org.apache.pekko.http.caching.LfuCache +import org.apache.pekko.http.caching.scaladsl.Cache +import org.apache.pekko.http.scaladsl.model.{ HttpMethod, HttpMethods, StatusCodes } +import org.apache.pekko.http.scaladsl.model.headers._ +import org.apache.pekko.http.scaladsl.server._ +import org.apache.pekko.http.scaladsl.server.Directives._ +import org.apache.pekko.http.scaladsl.testkit.Specs2RouteTest import ch.openolitor.core.models.PersonId import ch.openolitor.stammdaten.models.KundeId import org.joda.time.DateTime diff --git a/src/test/scala/ch/openolitor/core/ws/MockClientMessagesRouteService.scala b/src/test/scala/ch/openolitor/core/ws/MockClientMessagesRouteService.scala index 73daacbae..c0763ef93 100644 --- a/src/test/scala/ch/openolitor/core/ws/MockClientMessagesRouteService.scala +++ b/src/test/scala/ch/openolitor/core/ws/MockClientMessagesRouteService.scala @@ -1,6 +1,6 @@ package ch.openolitor.core.ws -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.buchhaltung.repositories.DefaultBuchhaltungReadRepositoryAsyncComponent import ch.openolitor.core.{ MockInMemoryActorReferences, SpecSubjects, SystemConfig } import ch.openolitor.core.db.MockDBComponent diff --git a/src/test/scala/ch/openolitor/helloworld/RouteServiceSpec.scala b/src/test/scala/ch/openolitor/helloworld/RouteServiceSpec.scala index 7e95e0be6..3573a5b74 100644 --- a/src/test/scala/ch/openolitor/helloworld/RouteServiceSpec.scala +++ b/src/test/scala/ch/openolitor/helloworld/RouteServiceSpec.scala @@ -22,10 +22,10 @@ \* */ package ch.openolitor.helloworld -import akka.actor.ActorRef -import akka.http.scaladsl.model.StatusCodes.{ MethodNotAllowed, NotFound } -import akka.http.scaladsl.server.Route -import akka.http.scaladsl.testkit.Specs2RouteTest +import org.apache.pekko.actor.ActorRef +import org.apache.pekko.http.scaladsl.model.StatusCodes.{ MethodNotAllowed, NotFound } +import org.apache.pekko.http.scaladsl.server.Route +import org.apache.pekko.http.scaladsl.testkit.Specs2RouteTest import ch.openolitor.core.filestore.FileStore import org.specs2.concurrent.ExecutionEnv import org.specs2.mutable.Specification diff --git a/src/test/scala/ch/openolitor/kundenportal/MockKundenportalRoutes.scala b/src/test/scala/ch/openolitor/kundenportal/MockKundenportalRoutes.scala index d5eb41a3f..c554c38c5 100644 --- a/src/test/scala/ch/openolitor/kundenportal/MockKundenportalRoutes.scala +++ b/src/test/scala/ch/openolitor/kundenportal/MockKundenportalRoutes.scala @@ -1,6 +1,6 @@ package ch.openolitor.kundenportal -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.core.{ MockInMemoryActorReferences, SystemConfig } import ch.openolitor.core.db.MockDBComponent import ch.openolitor.core.filestore.MockFileStoreComponent diff --git a/src/test/scala/ch/openolitor/stammdaten/MockStammdatenRoutes.scala b/src/test/scala/ch/openolitor/stammdaten/MockStammdatenRoutes.scala index 1deae72c6..c9137f36d 100644 --- a/src/test/scala/ch/openolitor/stammdaten/MockStammdatenRoutes.scala +++ b/src/test/scala/ch/openolitor/stammdaten/MockStammdatenRoutes.scala @@ -1,6 +1,6 @@ package ch.openolitor.stammdaten -import akka.actor.ActorSystem +import org.apache.pekko.actor.ActorSystem import ch.openolitor.buchhaltung.repositories.DefaultBuchhaltungReadRepositoryAsyncComponent import ch.openolitor.core.{ MockInMemoryActorReferences, SystemConfig } import ch.openolitor.core.db.MockDBComponent diff --git a/src/test/scala/ch/openolitor/stammdaten/StammdatenRouteServiceInteractions.scala b/src/test/scala/ch/openolitor/stammdaten/StammdatenRouteServiceInteractions.scala index 4ac1a9cdf..7a41e979a 100644 --- a/src/test/scala/ch/openolitor/stammdaten/StammdatenRouteServiceInteractions.scala +++ b/src/test/scala/ch/openolitor/stammdaten/StammdatenRouteServiceInteractions.scala @@ -1,6 +1,6 @@ package ch.openolitor.stammdaten -import akka.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.model.StatusCodes import ch.openolitor.core.{ BaseRoutesWithDBSpec, SpecSubjects } import ch.openolitor.core.models.EntityCreated import ch.openolitor.core.security.Subject diff --git a/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesLieferplanungSpec.scala b/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesLieferplanungSpec.scala index e251d5df6..6f6eab301 100644 --- a/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesLieferplanungSpec.scala +++ b/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesLieferplanungSpec.scala @@ -1,7 +1,7 @@ package ch.openolitor.stammdaten -import akka.http.scaladsl.model.{ ContentTypes, Multipart, StatusCodes } -import akka.http.scaladsl.testkit.WSProbe +import org.apache.pekko.http.scaladsl.model.{ ContentTypes, Multipart, StatusCodes } +import org.apache.pekko.http.scaladsl.testkit.WSProbe import ch.openolitor.core.{ BaseRoutesWithDBSpec, SpecSubjects } import ch.openolitor.core.models.EntityCreated import ch.openolitor.core.reporting.AsyncReportServiceResult diff --git a/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesProduzentenSpec.scala b/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesProduzentenSpec.scala index a05c2b363..4b59ad911 100644 --- a/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesProduzentenSpec.scala +++ b/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesProduzentenSpec.scala @@ -1,7 +1,7 @@ package ch.openolitor.stammdaten -import akka.http.scaladsl.model.{ Multipart, StatusCodes } -import akka.http.scaladsl.testkit.WSProbe +import org.apache.pekko.http.scaladsl.model.{ Multipart, StatusCodes } +import org.apache.pekko.http.scaladsl.testkit.WSProbe import ch.openolitor.core.{ BaseRoutesWithDBSpec, SpecSubjects } import ch.openolitor.core.reporting.AsyncReportServiceResult import ch.openolitor.core.security.Subject diff --git a/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesProjektSpec.scala b/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesProjektSpec.scala index 998e293c3..d9d5574b9 100644 --- a/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesProjektSpec.scala +++ b/src/test/scala/ch/openolitor/stammdaten/StammdatenRoutesProjektSpec.scala @@ -1,6 +1,6 @@ package ch.openolitor.stammdaten -import akka.http.scaladsl.model.StatusCodes +import org.apache.pekko.http.scaladsl.model.StatusCodes import ch.openolitor.core.{ BaseRoutesWithDBSpec, SpecSubjects } import ch.openolitor.core.security.Subject import ch.openolitor.stammdaten.models.{ Projekt, ProjektModify }