akka · johanandren · Jan 16, 2024 · Dec 19, 2023 · Dec 20, 2023 · Dec 20, 2023
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -74,7 +74,7 @@ jobs:
           jvm: temurin:1.11
 
       - name: Compile all code with fatal warnings for Java 11, Scala 2.13 and Scala 3
-        run: sbt "clean ; +IntegrationTest/compile"
+        run: sbt "clean ; +compile; Test/compile; akka-projection-integration/Test/compile"
 
   check-docs:
     name: Check Docs

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
@@ -30,4 +30,4 @@ jobs:
         uses: scalacenter/sbt-dependency-submission@6807cf91e9dc7af7c314b988d56d928d5828605b
         with:
           modules-ignore: examples_2.13
-          configs-ignore: test It scala-tool scala-doc-tool
+          configs-ignore: test scala-tool scala-doc-tool
diff --git a/.github/workflows/integration-tests-cassandra.yml b/.github/workflows/integration-tests-cassandra.yml
@@ -48,7 +48,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-cassandra/It/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-cassandra-integration/test" ${{ matrix.extraOpts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/integration-tests-grpc.yml b/.github/workflows/integration-tests-grpc.yml
@@ -48,7 +48,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-grpc-tests/It/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-grpc-integration/test" ${{ matrix.extraOpts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/integration-tests-jdbc.yml b/.github/workflows/integration-tests-jdbc.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Copy license acceptance
         run: |-
-          cp container-license-acceptance.txt akka-projection-jdbc/src/it/resources/container-license-acceptance.txt
+          cp container-license-acceptance.txt akka-projection-jdbc-integration/src/test/resources/container-license-acceptance.txt
 
       - name: Cache Coursier cache
         # https://github.com/coursier/cache-action/releases
@@ -51,7 +51,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-jdbc/It/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-jdbc-integration/test" ${{ matrix.extraOpts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/integration-tests-kafka.yml b/.github/workflows/integration-tests-kafka.yml
@@ -47,7 +47,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-kafka-tests/It/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-kafka-integration/test" ${{ matrix.extraOpts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/integration-tests-r2dbc.yml b/.github/workflows/integration-tests-r2dbc.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Run integration tests with with Scala and Java ${{ matrix.jdkVersion }}
         # -Dconf.resource=application-postgres.conf but it's the default through application.conf as well
         run: |-
-          sbt akka-projection-r2dbc/IntegrationTest/test
+          sbt akka-projection-r2dbc-integration/test
 
   test-r2dbc-yugabyte:
     name: Run r2dbc tests with Yugabyte
@@ -101,7 +101,7 @@ jobs:
 
       - name: Run integration tests with with Scala and Java ${{ matrix.jdkVersion }}
         run: |-
-          sbt -Dconfig.resource=application-yugabyte.conf akka-projection-r2dbc/IntegrationTest/test
+          sbt -Dconfig.resource=application-yugabyte.conf akka-projection-r2dbc-integration/test
 
 
   test-r2dbc-h2:
@@ -143,4 +143,4 @@ jobs:
 
       - name: Run integration tests with with Scala and Java ${{ matrix.jdkVersion }}
         run: |-
-          sbt -Dconfig.resource=application-h2.conf akka-projection-r2dbc/IntegrationTest/test
+          sbt -Dconfig.resource=application-h2.conf akka-projection-r2dbc-integration/test
diff --git a/.github/workflows/integration-tests-slick.yml b/.github/workflows/integration-tests-slick.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Copy license acceptance
         run: |-
-          cp container-license-acceptance.txt akka-projection-slick/src/it/resources/container-license-acceptance.txt
+          cp container-license-acceptance.txt akka-projection-slick-integration/src/test/resources/container-license-acceptance.txt
 
       - name: Cache Coursier cache
         # https://github.com/coursier/cache-action/releases
@@ -51,7 +51,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-slick/It/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-slick-integration/test" ${{ matrix.extraOpts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,5 @@ akka-projection-slick/src/it/resources/container-license-acceptance.txt
 # attachments created by scripts/prepare-downloads.sh
 akka-distributed-cluster-docs/src/main/paradox/attachments
 akka-edge-docs/src/main/paradox/attachments
+# needed for aggregate project, but should not be checked in
+akka-projection-integration
diff --git a/...on/cassandra/CassandraProjectionTest.java → ...on/cassandra/CassandraProjectionTest.java b/...on/cassandra/CassandraProjectionTest.java → ...on/cassandra/CassandraProjectionTest.java
diff --git a/...ssandra/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml b/...ssandra/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml
diff --git a/.../cassandra/CassandraOffsetStoreSpec.scala → .../cassandra/CassandraOffsetStoreSpec.scala b/.../cassandra/CassandraOffsetStoreSpec.scala → .../cassandra/CassandraOffsetStoreSpec.scala
diff --git a/...n/cassandra/CassandraProjectionSpec.scala → ...n/cassandra/CassandraProjectionSpec.scala b/...n/cassandra/CassandraProjectionSpec.scala → ...n/cassandra/CassandraProjectionSpec.scala
diff --git a/.../cassandra/ContainerSessionProvider.scala → .../cassandra/ContainerSessionProvider.scala b/.../cassandra/ContainerSessionProvider.scala → .../cassandra/ContainerSessionProvider.scala
diff --git a/...ests/src/it/resources/application-h2.conf → ...on/src/test/resources/application-h2.conf b/...ests/src/it/resources/application-h2.conf → ...on/src/test/resources/application-h2.conf
diff --git a/...ests/src/it/resources/db/default-init.sql → ...on/src/test/resources/db/default-init.sql b/...ests/src/it/resources/db/default-init.sql → ...on/src/test/resources/db/default-init.sql
diff --git a/...c-tests/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml b/...c-tests/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml
diff --git a/...c-tests/src/it/resources/persistence.conf → ...ation/src/test/resources/persistence.conf b/...c-tests/src/it/resources/persistence.conf → ...ation/src/test/resources/persistence.conf
diff --git a/...kka/projection/grpc/IntegrationSpec.scala → ...kka/projection/grpc/IntegrationSpec.scala b/...kka/projection/grpc/IntegrationSpec.scala → ...kka/projection/grpc/IntegrationSpec.scala
diff --git a/...a/projection/grpc/TestContainerConf.scala → ...a/projection/grpc/TestContainerConf.scala b/...a/projection/grpc/TestContainerConf.scala → ...a/projection/grpc/TestContainerConf.scala
diff --git a/...scala/akka/projection/grpc/TestData.scala → ...scala/akka/projection/grpc/TestData.scala b/...scala/akka/projection/grpc/TestData.scala → ...scala/akka/projection/grpc/TestData.scala
diff --git a/...kka/projection/grpc/TestDbLifecycle.scala → ...kka/projection/grpc/TestDbLifecycle.scala b/...kka/projection/grpc/TestDbLifecycle.scala → ...kka/projection/grpc/TestDbLifecycle.scala
diff --git a/...ala/akka/projection/grpc/TestEntity.scala → ...ala/akka/projection/grpc/TestEntity.scala b/...ala/akka/projection/grpc/TestEntity.scala → ...ala/akka/projection/grpc/TestEntity.scala
diff --git a/...er/scaladsl/EventTimestampQuerySpec.scala → ...er/scaladsl/EventTimestampQuerySpec.scala b/...er/scaladsl/EventTimestampQuerySpec.scala → ...er/scaladsl/EventTimestampQuerySpec.scala
diff --git a/...onsumer/scaladsl/LoadEventQuerySpec.scala → ...onsumer/scaladsl/LoadEventQuerySpec.scala b/...onsumer/scaladsl/LoadEventQuerySpec.scala → ...onsumer/scaladsl/LoadEventQuerySpec.scala
diff --git a/...grpc/producer/EventProducerPushSpec.scala → ...grpc/producer/EventProducerPushSpec.scala b/...grpc/producer/EventProducerPushSpec.scala → ...grpc/producer/EventProducerPushSpec.scala
diff --git a/...producer/ProducerFilterEndToEndSpec.scala → ...producer/ProducerFilterEndToEndSpec.scala b/...producer/ProducerFilterEndToEndSpec.scala → ...producer/ProducerFilterEndToEndSpec.scala
diff --git a/...on/grpc/producer/ProducerPushSample.scala → ...on/grpc/producer/ProducerPushSample.scala b/...on/grpc/producer/ProducerPushSample.scala → ...on/grpc/producer/ProducerPushSample.scala
diff --git a/...cer/TopicProducerFilterEndToEndSpec.scala → ...cer/TopicProducerFilterEndToEndSpec.scala b/...cer/TopicProducerFilterEndToEndSpec.scala → ...cer/TopicProducerFilterEndToEndSpec.scala
diff --git a/...tion/EdgeReplicationIntegrationSpec.scala → ...tion/EdgeReplicationIntegrationSpec.scala b/...tion/EdgeReplicationIntegrationSpec.scala → ...tion/EdgeReplicationIntegrationSpec.scala
diff --git a/...geReplicationJavaDSLIntegrationSpec.scala → ...geReplicationJavaDSLIntegrationSpec.scala b/...geReplicationJavaDSLIntegrationSpec.scala → ...geReplicationJavaDSLIntegrationSpec.scala
diff --git a/...EdgeReplicationMultiIntegrationSpec.scala → ...EdgeReplicationMultiIntegrationSpec.scala b/...EdgeReplicationMultiIntegrationSpec.scala → ...EdgeReplicationMultiIntegrationSpec.scala
diff --git a/.../IndirectReplicationIntegrationSpec.scala → .../IndirectReplicationIntegrationSpec.scala b/.../IndirectReplicationIntegrationSpec.scala → .../IndirectReplicationIntegrationSpec.scala
diff --git a/...tion/PushReplicationIntegrationSpec.scala → ...tion/PushReplicationIntegrationSpec.scala b/...tion/PushReplicationIntegrationSpec.scala → ...tion/PushReplicationIntegrationSpec.scala
diff --git a/...lication/ReplicationIntegrationSpec.scala → ...lication/ReplicationIntegrationSpec.scala b/...lication/ReplicationIntegrationSpec.scala → ...lication/ReplicationIntegrationSpec.scala
diff --git a/...n/ReplicationJavaDSLIntegrationSpec.scala → ...n/ReplicationJavaDSLIntegrationSpec.scala b/...n/ReplicationJavaDSLIntegrationSpec.scala → ...n/ReplicationJavaDSLIntegrationSpec.scala
diff --git a/...jdbc/src/it/resources/db/default-init.sql → ...on/src/test/resources/db/default-init.sql b/...jdbc/src/it/resources/db/default-init.sql → ...on/src/test/resources/db/default-init.sql
diff --git a/...on-jdbc/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml b/...on-jdbc/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml
diff --git a/...n/jdbc/JdbcContainerOffsetStoreSpec.scala → ...n/jdbc/JdbcContainerOffsetStoreSpec.scala b/...n/jdbc/JdbcContainerOffsetStoreSpec.scala → ...n/jdbc/JdbcContainerOffsetStoreSpec.scala
diff --git a/...projection/jdbc/JdbcOffsetStoreSpec.scala → ...projection/jdbc/JdbcOffsetStoreSpec.scala b/...projection/jdbc/JdbcOffsetStoreSpec.scala → ...projection/jdbc/JdbcOffsetStoreSpec.scala
diff --git a/.../projection/jdbc/JdbcProjectionSpec.scala → .../projection/jdbc/JdbcProjectionSpec.scala b/.../projection/jdbc/JdbcProjectionSpec.scala → .../projection/jdbc/JdbcProjectionSpec.scala
diff --git a/...a-tests/src/it/resources/application.conf → ...ation/src/test/resources/application.conf b/...a-tests/src/it/resources/application.conf → ...ation/src/test/resources/application.conf
diff --git a/...a-tests/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml b/...a-tests/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml
diff --git a/...ction/kafka/KafkaSourceProviderSpec.scala → ...ction/kafka/KafkaSourceProviderSpec.scala b/...ction/kafka/KafkaSourceProviderSpec.scala → ...ction/kafka/KafkaSourceProviderSpec.scala
diff --git a/...akka/projection/kafka/KafkaSpecBase.scala → ...akka/projection/kafka/KafkaSpecBase.scala b/...akka/projection/kafka/KafkaSpecBase.scala → ...akka/projection/kafka/KafkaSpecBase.scala
diff --git a/...gration/KafkaToSlickIntegrationSpec.scala → ...gration/KafkaToSlickIntegrationSpec.scala b/...gration/KafkaToSlickIntegrationSpec.scala → ...gration/KafkaToSlickIntegrationSpec.scala
diff --git a/...2dbc/src/it/resources/application-h2.conf → ...on/src/test/resources/application-h2.conf b/...2dbc/src/it/resources/application-h2.conf → ...on/src/test/resources/application-h2.conf
diff --git a/...rc/it/resources/application-postgres.conf → .../test/resources/application-postgres.conf b/...rc/it/resources/application-postgres.conf → .../test/resources/application-postgres.conf
diff --git a/...rc/it/resources/application-yugabyte.conf → .../test/resources/application-yugabyte.conf b/...rc/it/resources/application-yugabyte.conf → .../test/resources/application-yugabyte.conf
diff --git a/...n-r2dbc/src/it/resources/application.conf → ...ation/src/test/resources/application.conf b/...n-r2dbc/src/it/resources/application.conf → ...ation/src/test/resources/application.conf
diff --git a/...n-r2dbc/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml b/...n-r2dbc/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml
diff --git a/.../akka/projection/TestStatusObserver.scala → .../akka/projection/TestStatusObserver.scala b/.../akka/projection/TestStatusObserver.scala → .../akka/projection/TestStatusObserver.scala
diff --git a/...jection/r2dbc/ChangeSliceRangesSpec.scala → ...jection/r2dbc/ChangeSliceRangesSpec.scala b/...jection/r2dbc/ChangeSliceRangesSpec.scala → ...jection/r2dbc/ChangeSliceRangesSpec.scala
diff --git a/...tion/r2dbc/DurableStateEndToEndSpec.scala → ...tion/r2dbc/DurableStateEndToEndSpec.scala b/...tion/r2dbc/DurableStateEndToEndSpec.scala → ...tion/r2dbc/DurableStateEndToEndSpec.scala
diff --git a/...jection/r2dbc/EventSourcedChaosSpec.scala → ...jection/r2dbc/EventSourcedChaosSpec.scala b/...jection/r2dbc/EventSourcedChaosSpec.scala → ...jection/r2dbc/EventSourcedChaosSpec.scala
diff --git a/...tion/r2dbc/EventSourcedEndToEndSpec.scala → ...tion/r2dbc/EventSourcedEndToEndSpec.scala b/...tion/r2dbc/EventSourcedEndToEndSpec.scala → ...tion/r2dbc/EventSourcedEndToEndSpec.scala
diff --git a/...ection/r2dbc/EventSourcedPubSubSpec.scala → ...ection/r2dbc/EventSourcedPubSubSpec.scala b/...ection/r2dbc/EventSourcedPubSubSpec.scala → ...ection/r2dbc/EventSourcedPubSubSpec.scala
diff --git a/...ojection/r2dbc/R2dbcOffsetStoreSpec.scala → ...ojection/r2dbc/R2dbcOffsetStoreSpec.scala b/...ojection/r2dbc/R2dbcOffsetStoreSpec.scala → ...ojection/r2dbc/R2dbcOffsetStoreSpec.scala
diff --git a/...ion/r2dbc/R2dbcOffsetStoreStateSpec.scala → ...ion/r2dbc/R2dbcOffsetStoreStateSpec.scala b/...ion/r2dbc/R2dbcOffsetStoreStateSpec.scala → ...ion/r2dbc/R2dbcOffsetStoreStateSpec.scala
diff --git a/...rojection/r2dbc/R2dbcProjectionSpec.scala → ...rojection/r2dbc/R2dbcProjectionSpec.scala b/...rojection/r2dbc/R2dbcProjectionSpec.scala → ...rojection/r2dbc/R2dbcProjectionSpec.scala
diff --git a/.../R2dbcTimestampOffsetProjectionSpec.scala → .../R2dbcTimestampOffsetProjectionSpec.scala b/.../R2dbcTimestampOffsetProjectionSpec.scala → .../R2dbcTimestampOffsetProjectionSpec.scala
diff --git a/...r2dbc/R2dbcTimestampOffsetStoreSpec.scala → ...r2dbc/R2dbcTimestampOffsetStoreSpec.scala b/...r2dbc/R2dbcTimestampOffsetStoreSpec.scala → ...r2dbc/R2dbcTimestampOffsetStoreSpec.scala
diff --git a/...r2dbc/StartFromSnapshotEndToEndSpec.scala → ...r2dbc/StartFromSnapshotEndToEndSpec.scala b/...r2dbc/StartFromSnapshotEndToEndSpec.scala → ...r2dbc/StartFromSnapshotEndToEndSpec.scala
diff --git a/...ala/akka/projection/r2dbc/TestClock.scala → ...ala/akka/projection/r2dbc/TestClock.scala b/...ala/akka/projection/r2dbc/TestClock.scala → ...ala/akka/projection/r2dbc/TestClock.scala
diff --git a/...la/akka/projection/r2dbc/TestConfig.scala → ...la/akka/projection/r2dbc/TestConfig.scala b/...la/akka/projection/r2dbc/TestConfig.scala → ...la/akka/projection/r2dbc/TestConfig.scala
diff --git a/...cala/akka/projection/r2dbc/TestData.scala → ...cala/akka/projection/r2dbc/TestData.scala b/...cala/akka/projection/r2dbc/TestData.scala → ...cala/akka/projection/r2dbc/TestData.scala
diff --git a/...ka/projection/r2dbc/TestDbLifecycle.scala → ...ka/projection/r2dbc/TestDbLifecycle.scala b/...ka/projection/r2dbc/TestDbLifecycle.scala → ...ka/projection/r2dbc/TestDbLifecycle.scala
diff --git a/...n/r2dbc/TestSourceProviderWithInput.scala → ...n/r2dbc/TestSourceProviderWithInput.scala b/...n/r2dbc/TestSourceProviderWithInput.scala → ...n/r2dbc/TestSourceProviderWithInput.scala
diff --git a/...n-slick/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml b/...n-slick/src/it/resources/logback-test.xml → ...ation/src/test/resources/logback-test.xml
diff --git a/...slick/SlickContainerOffsetStoreSpec.scala → ...slick/SlickContainerOffsetStoreSpec.scala b/...slick/SlickContainerOffsetStoreSpec.scala → ...slick/SlickContainerOffsetStoreSpec.scala
diff --git a/...ojection/slick/SlickOffsetStoreSpec.scala → ...ojection/slick/SlickOffsetStoreSpec.scala b/...ojection/slick/SlickOffsetStoreSpec.scala → ...ojection/slick/SlickOffsetStoreSpec.scala
@@ -4,10 +4,6 @@
 
 package akka.projection.slick
 
-import java.time.Instant
-import java.util.UUID
-import scala.concurrent.Await
-import scala.concurrent.duration._
 import akka.Done
 import akka.actor.Scheduler
 import akka.actor.testkit.typed.scaladsl.LogCapturing
@@ -30,7 +26,11 @@ import org.scalatest.wordspec.AnyWordSpecLike
 import slick.basic.DatabaseConfig
 import slick.jdbc.JdbcProfile
 
+import java.time.Instant
+import java.util.UUID
+import scala.concurrent.Await
 import scala.concurrent.ExecutionContext
+import scala.concurrent.duration._
 
 object SlickOffsetStoreSpec {
 

diff --git a/...rojection/slick/SlickProjectionSpec.scala → ...rojection/slick/SlickProjectionSpec.scala b/...rojection/slick/SlickProjectionSpec.scala → ...rojection/slick/SlickProjectionSpec.scala
diff --git a/akka-projection-slick/src/test/resources/logback-test.xml b/akka-projection-slick/src/test/resources/logback-test.xml