More fixes, samples now verified to run again

akka · Sep 7, 2023 · 36386e2 · 36386e2
1 parent 552ffc2
commit 36386e2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/samples/grpc/local-drone-control-java/pom.xml b/samples/grpc/local-drone-control-java/pom.xml
@@ -19,7 +19,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.0-M1</akka.version>
         <akka-projection.version>1.5.0-M4</akka-projection.version>
-        <akka-persistence-r2dbc.version>1.2.0-M3</akka-persistence-r2dbc.version>
+        <akka-persistence-r2dbc.version>1.2.0-M5</akka-persistence-r2dbc.version>
         <akka-management.version>1.4.0</akka-management.version>
         <akka-diagnostics.version>2.0.1</akka-diagnostics.version>
         <akka-grpc.version>2.3.4</akka-grpc.version>

diff --git a/samples/grpc/local-drone-control-java/src/main/java/local/drones/DeliveryEvents.java b/samples/grpc/local-drone-control-java/src/main/java/local/drones/DeliveryEvents.java
@@ -39,7 +39,9 @@ public static Behavior<ProjectionBehavior.Command> projectionBehavior(
                         new ConsumerFilter.ExcludeRegexEntityIds(Collections.singleton(".*")),
                         new ConsumerFilter.IncludeTopics(
                             Collections.singleton(settings.locationId)))),
-            GrpcClientSettings.fromConfig("akka.projection.grpc.consumer.client", system),
+            GrpcClientSettings.fromConfig(
+                system.settings().config().getConfig("akka.projection.grpc.consumer.client"),
+                system),
             Arrays.asList(central.deliveries.proto.DeliveryEvents.getDescriptor()));
 
     // single projection handling all slices

diff --git a/samples/grpc/local-drone-control-scala/src/main/scala/local/drones/DeliveryEvents.scala b/samples/grpc/local-drone-control-scala/src/main/scala/local/drones/DeliveryEvents.scala
@@ -32,7 +32,9 @@ object DeliveryEvents {
           Vector(
             ConsumerFilter.ExcludeRegexEntityIds(Set(".*")),
             ConsumerFilter.IncludeTopics(Set(settings.locationId)))),
-        GrpcClientSettings.fromConfig("akka.projection.grpc.consumer.client"),
+        GrpcClientSettings.fromConfig(
+          system.settings.config
+            .getConfig("akka.projection.grpc.consumer.client")),
         List(central.deliveries.proto.DeliveryEventsProto.javaDescriptor))
 
     // single projection handling all slices

diff --git a/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml b/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml
@@ -19,7 +19,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.0-M1</akka.version>
         <akka-projection.version>1.5.0-M4</akka-projection.version>
-        <akka-persistence-r2dbc.version>1.2.0-M3</akka-persistence-r2dbc.version>
+        <akka-persistence-r2dbc.version>1.2.0-M5</akka-persistence-r2dbc.version>
         <akka-management.version>1.4.0</akka-management.version>
         <akka-diagnostics.version>2.0.1</akka-diagnostics.version>
         <akka-grpc.version>2.3.4</akka-grpc.version>

diff --git a/samples/grpc/restaurant-drone-deliveries-service-scala/src/main/scala/central/Main.scala b/samples/grpc/restaurant-drone-deliveries-service-scala/src/main/scala/central/Main.scala
@@ -7,7 +7,7 @@ import akka.management.scaladsl.AkkaManagement
 import central.deliveries.DeliveryEvents
 import central.deliveries.RestaurantDeliveries
 import central.deliveries.RestaurantDeliveriesServiceImpl
-import central.drones.{Drone, DroneOverviewServiceImpl, LocalDroneEvents}
+import central.drones.{ Drone, DroneOverviewServiceImpl, LocalDroneEvents }
 import org.slf4j.LoggerFactory
 
 import scala.util.control.NonFatal
@@ -46,7 +46,7 @@ object Main {
       LocalDroneEvents.pushedEventsGrpcHandler(system)
     val deliveryEventsProducerService =
       DeliveryEvents.eventProducerService(system)
-    val droneOverviewService = new DroneOverviewServiceImpl(system)
+    val droneOverviewService = new DroneOverviewServiceImpl(system, settings)
     val restaurantDeliveriesService =
       new RestaurantDeliveriesServiceImpl(system, settings)