Prepare thoth version supporting jackson 3 and pekko

.github/workflows/publish.yml

@@ -1,7 +1,7 @@
 name: Publish
 on:
   push:
-    branches: [master]
+    branches: [master, support/*]
 jobs:
   publish:
     runs-on: ubuntu-latest

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Stop docker
         run: docker compose -f docker-compose.test.yml down
       - name: Run sample application test
-        run: ./gradlew :sample:test
+        run: ./gradlew :thoth-sample:test
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
         if: always()

build.gradle

@@ -28,20 +28,24 @@ subprojects {
     }
 
     ext {
+        lombokVersion         = "1.18.44"
         scalaVersion          = "2.13"
-        alpakkaKafkaVersion   = "2.0.7"
-        jacksonVersion        = "2.18.4"
-        akkaVersion           = "2.6.14"
-        vavrVersion           = "0.10.6"
-        vavrJacksonVersion    = "0.10.3"
-        jooqVersion           = "3.20.4"
-        jooqAsyncVersion      = "2.4.0-rc1"
-        functionalJsonVersion = "1.0.5-rc1"
-        kafkaVersion          = "3.0.1"
+        pekkoKafkaVersion     = "1.1.0"
+        jacksonVersion        = "3.1.0"
+        pekkoVersion          = "1.4.0"
+        vavrVersion           = "1.0.1"
+        vavrJacksonVersion    = "1.0.0"
+        jooqVersion           = "3.21.1"
+        jooqAsyncVersion      = "3.0.0-RC1"
+        functionalJsonVersion = "2.0.0-RC1"
+        kafkaVersion          = "3.9.2"
         reactorKafkaVersion   = "1.3.23"
-        reactorVersion        = "3.7.7"
-        vertxSqlVersion       = "5.0.0"
+        reactorVersion        = "3.8.4"
+        vertxSqlVersion       = "5.0.10"
         testContainerVersion  = "1.21.1"
+        jupiterVersion        = "6.0.3"
+        assertJVersion        = "3.27.7"
+        mockitoCoreVersion    = "5.18.0"
     }
 
     test {

settings.gradle

@@ -8,18 +8,18 @@
  */
 
 rootProject.name = 'thoth'
-include 'commons-events'
+include 'thoth-commons-events'
 include 'thoth-core'
 include 'thoth-jooq'
-include 'thoth-core-akka'
-include 'thoth-jooq-akka'
-include 'thoth-kafka-consumer-akka'
+include 'thoth-core-pekko'
+include 'thoth-jooq-pekko'
+include 'thoth-kafka-consumer-pekko'
 include 'thoth-core-reactor'
 include 'thoth-jooq-reactor'
 include 'thoth-kafka-consumer-reactor'
 include 'thoth-tck'
-include 'sample'
-include 'demo:demo-in-memory'
-include 'demo:demo-in-memory-vanilla'
-include 'demo:demo-postgres-kafka'
-include 'demo:demo-postgres-kafka-reactive'
+include 'thoth-sample'
+include 'thoth-demo:demo-in-memory'
+include 'thoth-demo:demo-in-memory-vanilla'
+include 'thoth-demo:demo-postgres-kafka'
+include 'thoth-demo:demo-postgres-kafka-reactive'

thoth-core-pekko/build.gradle

@@ -0,0 +1,34 @@
+
+dependencies {
+    implementation project(':thoth-commons-events')
+    implementation project(':thoth-core')
+    implementation project(':thoth-kafka-consumer-pekko')
+    implementation("io.vavr:vavr:$vavrVersion")
+    implementation("io.vavr:vavr-jackson:$vavrJacksonVersion")
+
+    implementation "org.apache.pekko:pekko-actor_$scalaVersion:$pekkoVersion"
+    implementation "org.apache.pekko:pekko-stream_$scalaVersion:$pekkoVersion"
+    implementation "org.apache.pekko:pekko-slf4j_$scalaVersion:$pekkoVersion"
+    implementation "org.apache.pekko:pekko-connectors-kafka_$scalaVersion:$pekkoKafkaVersion"
+
+    implementation 'org.scala-lang:scala-library:2.13.8'
+    implementation("com.fasterxml.uuid:java-uuid-generator:3.1.5")
+    implementation("tools.jackson.core:jackson-databind:$jacksonVersion")
+    implementation("fr.maif:functional-json:$functionalJsonVersion")
+
+    testImplementation("org.testcontainers:kafka:$testContainerVersion")
+    testImplementation("org.testcontainers:junit-jupiter:$testContainerVersion")
+    testImplementation "org.apache.pekko:pekko-testkit_$scalaVersion:$pekkoVersion"
+    testImplementation("org.apache.pekko:pekko-stream-testkit_$scalaVersion:$pekkoVersion")
+    testImplementation "org.apache.pekko:pekko-connectors-kafka-testkit_$scalaVersion:$pekkoKafkaVersion"
+    testImplementation("org.assertj:assertj-core:$assertJVersion")
+    testImplementation('com.h2database:h2:2.2.220')
+    testImplementation("org.mockito:mockito-core:$mockitoCoreVersion")
+    testImplementation(platform("org.junit:junit-bom:$jupiterVersion"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+}
+
+test {
+    useJUnitPlatform()
+}

thoth-core-akka/src/main/java/fr/maif/akka/AkkaExecutionContext.java → thoth-core-pekko/src/main/java/fr/maif/akka/AkkaExecutionContext.java

@@ -1,6 +1,6 @@
 package fr.maif.akka;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 import scala.concurrent.ExecutionContext;
 import scala.concurrent.ExecutionContextExecutorService;
 

thoth-core-akka/src/main/java/fr/maif/akka/eventsourcing/DefaultAggregateStore.java → thoth-core-pekko/src/main/java/fr/maif/akka/eventsourcing/DefaultAggregateStore.java

@@ -1,8 +1,8 @@
 package fr.maif.akka.eventsourcing;
 
-import akka.actor.ActorSystem;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Source;
 import fr.maif.eventsourcing.*;
 import fr.maif.eventsourcing.impl.AbstractDefaultAggregateStore;
 import org.reactivestreams.Publisher;

thoth-core-akka/src/main/java/fr/maif/akka/eventsourcing/InMemoryEventStore.java → thoth-core-pekko/src/main/java/fr/maif/akka/eventsourcing/InMemoryEventStore.java

@@ -1,11 +1,11 @@
 package fr.maif.akka.eventsourcing;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.stream.Materializer;
-import akka.stream.OverflowStrategy;
-import akka.stream.javadsl.*;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.OverflowStrategy;
+import org.apache.pekko.stream.javadsl.*;
 import fr.maif.concurrent.CompletionStages;
 import fr.maif.eventsourcing.Event;
 import fr.maif.eventsourcing.EventEnvelope;

thoth-core-akka/src/main/java/fr/maif/akka/eventsourcing/KafkaEventPublisher.java → thoth-core-pekko/src/main/java/fr/maif/akka/eventsourcing/KafkaEventPublisher.java

@@ -1,17 +1,17 @@
 package fr.maif.akka.eventsourcing;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.japi.Pair;
-import akka.kafka.ProducerMessage;
-import akka.kafka.ProducerSettings;
-import akka.kafka.javadsl.Producer;
-import akka.stream.KillSwitches;
-import akka.stream.Materializer;
-import akka.stream.OverflowStrategy;
-import akka.stream.RestartSettings;
-import akka.stream.UniqueKillSwitch;
-import akka.stream.javadsl.*;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.kafka.ProducerMessage;
+import org.apache.pekko.kafka.ProducerSettings;
+import org.apache.pekko.kafka.javadsl.Producer;
+import org.apache.pekko.stream.KillSwitches;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.OverflowStrategy;
+import org.apache.pekko.stream.RestartSettings;
+import org.apache.pekko.stream.UniqueKillSwitch;
+import org.apache.pekko.stream.javadsl.*;
 import fr.maif.eventsourcing.EventStore.ConcurrentReplayStrategy;
 import fr.maif.eventsourcing.Event;
 import fr.maif.eventsourcing.EventEnvelope;

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/Convertions.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/Convertions.java

@@ -1,8 +1,8 @@
 package fr.maif.akka.jdbc;
 
-import akka.japi.Pair;
-import akka.japi.tuple.Tuple3;
-import akka.japi.tuple.Tuple4;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.tuple.Tuple3;
+import org.apache.pekko.japi.tuple.Tuple4;
 import fr.maif.akka.jdbc.function.ResultSetExtractor;
 
 import java.math.BigDecimal;

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/JdbcExecutionContext.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/JdbcExecutionContext.java

@@ -1,6 +1,6 @@
 package fr.maif.akka.jdbc;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 import fr.maif.akka.AkkaExecutionContext;
 
 public class JdbcExecutionContext extends AkkaExecutionContext {

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/Sql.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/Sql.java

@@ -1,9 +1,9 @@
 package fr.maif.akka.jdbc;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 import fr.maif.akka.jdbc.query.SqlContext;
 import fr.maif.akka.jdbc.function.ResultSetExtractor;
 import fr.maif.akka.jdbc.query.SelectQueryBuilder;

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/exceptions/ExceptionsHandler.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/exceptions/ExceptionsHandler.java

@@ -1,7 +1,7 @@
 package fr.maif.akka.jdbc.exceptions;
 
-import akka.japi.function.Creator;
-import akka.japi.function.Effect;
+import org.apache.pekko.japi.function.Creator;
+import org.apache.pekko.japi.function.Effect;
 
 /**
  * Created by adelegue on 29/04/2016.

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/query/SelectQueryBuilder.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/query/SelectQueryBuilder.java

@@ -1,10 +1,10 @@
 package fr.maif.akka.jdbc.query;
 
-import akka.NotUsed;
-import akka.stream.ActorAttributes;
-import akka.stream.Attributes;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.ActorAttributes;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
 import fr.maif.akka.jdbc.function.ResultSetExtractor;
 import fr.maif.akka.jdbc.stream.source.SelectQuerySource;
 

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/query/SqlContext.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/query/SqlContext.java

@@ -1,6 +1,6 @@
 package fr.maif.akka.jdbc.query;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 
 import java.sql.Connection;
 

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/query/UpdateQueryBuilder.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/query/UpdateQueryBuilder.java

@@ -1,10 +1,10 @@
 package fr.maif.akka.jdbc.query;
 
-import akka.NotUsed;
-import akka.stream.ActorAttributes;
-import akka.stream.Attributes;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.stream.ActorAttributes;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
 import fr.maif.akka.jdbc.stream.source.UpdateQuerySource;
 import fr.maif.akka.jdbc.stream.source.UpdateQueryWithResultedIdSource;
 

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/stream/source/SelectQuerySource.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/stream/source/SelectQuerySource.java

@@ -1,13 +1,13 @@
 package fr.maif.akka.jdbc.stream.source;
 
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.stream.Attributes;
-import akka.stream.Outlet;
-import akka.stream.SourceShape;
-import akka.stream.stage.AbstractOutHandler;
-import akka.stream.stage.GraphStage;
-import akka.stream.stage.GraphStageLogic;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.Outlet;
+import org.apache.pekko.stream.SourceShape;
+import org.apache.pekko.stream.stage.AbstractOutHandler;
+import org.apache.pekko.stream.stage.GraphStage;
+import org.apache.pekko.stream.stage.GraphStageLogic;
 import fr.maif.akka.jdbc.function.ResultSetExtractor;
 import fr.maif.akka.jdbc.query.Query;
 import fr.maif.akka.jdbc.query.SqlContext;

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/stream/source/UpdateQuerySource.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/stream/source/UpdateQuerySource.java

@@ -1,13 +1,13 @@
 package fr.maif.akka.jdbc.stream.source;
 
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.stream.Attributes;
-import akka.stream.Outlet;
-import akka.stream.SourceShape;
-import akka.stream.stage.AbstractOutHandler;
-import akka.stream.stage.GraphStage;
-import akka.stream.stage.GraphStageLogic;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.Outlet;
+import org.apache.pekko.stream.SourceShape;
+import org.apache.pekko.stream.stage.AbstractOutHandler;
+import org.apache.pekko.stream.stage.GraphStage;
+import org.apache.pekko.stream.stage.GraphStageLogic;
 import fr.maif.akka.jdbc.query.Query;
 import fr.maif.akka.jdbc.query.SqlContext;
 import fr.maif.akka.jdbc.stream.ResourcesHelper;

thoth-core-akka/src/main/java/fr/maif/akka/jdbc/stream/source/UpdateQueryWithResultedIdSource.java → thoth-core-pekko/src/main/java/fr/maif/akka/jdbc/stream/source/UpdateQueryWithResultedIdSource.java

@@ -1,13 +1,13 @@
 package fr.maif.akka.jdbc.stream.source;
 
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.stream.Attributes;
-import akka.stream.Outlet;
-import akka.stream.SourceShape;
-import akka.stream.stage.AbstractOutHandler;
-import akka.stream.stage.GraphStage;
-import akka.stream.stage.GraphStageLogic;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.stream.Attributes;
+import org.apache.pekko.stream.Outlet;
+import org.apache.pekko.stream.SourceShape;
+import org.apache.pekko.stream.stage.AbstractOutHandler;
+import org.apache.pekko.stream.stage.GraphStage;
+import org.apache.pekko.stream.stage.GraphStageLogic;
 import fr.maif.akka.jdbc.query.Query;
 import fr.maif.akka.jdbc.query.SqlContext;
 import fr.maif.akka.jdbc.stream.ResourcesHelper;

thoth-core-akka/src/main/java/fr/maif/akka/kafka/KafkaSettings.java → thoth-core-pekko/src/main/java/fr/maif/akka/kafka/KafkaSettings.java

@@ -1,8 +1,8 @@
 package fr.maif.akka.kafka;
 
-import akka.actor.ActorSystem;
-import akka.kafka.ConsumerSettings;
-import akka.kafka.ProducerSettings;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.kafka.ConsumerSettings;
+import org.apache.pekko.kafka.ProducerSettings;
 import com.typesafe.config.Config;
 import fr.maif.akka.config.Configs;
 import io.vavr.Tuple;