From 66b3b9c8574dcd4242c9679c51659785087eb8c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Andr=C3=A9n?= <johan@markatta.com>
Date: Fri, 8 Dec 2023 11:11:28 +0100
Subject: [PATCH] Java should be working now (but isn't replicating back to
 cloud)

---
 samples/grpc/local-drone-control-java/pom.xml        |  2 +-
 .../src/main/java/charging/ChargingStation.java      |  9 +++++++--
 .../src/main/resources/grpc.conf                     |  6 ++++++
 .../restaurant-drone-deliveries-service-java/pom.xml |  2 +-
 .../src/main/java/charging/ChargingStation.java      | 12 ++++++------
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/samples/grpc/local-drone-control-java/pom.xml b/samples/grpc/local-drone-control-java/pom.xml
index 27ac6df1a..2d086d208 100644
--- a/samples/grpc/local-drone-control-java/pom.xml
+++ b/samples/grpc/local-drone-control-java/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.1-M1</akka.version>
-        <akka-projection.version>1.5.1-M1-10-16681325-SNAPSHOT</akka-projection.version>
+        <akka-projection.version>1.5.1-M1-16-e358cac2-SNAPSHOT</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.0</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.0</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
diff --git a/samples/grpc/local-drone-control-java/src/main/java/charging/ChargingStation.java b/samples/grpc/local-drone-control-java/src/main/java/charging/ChargingStation.java
index 97138da98..50206c89c 100644
--- a/samples/grpc/local-drone-control-java/src/main/java/charging/ChargingStation.java
+++ b/samples/grpc/local-drone-control-java/src/main/java/charging/ChargingStation.java
@@ -158,8 +158,13 @@ public static Behavior<Command> create(
             Behaviors.withTimers(
                 (TimerScheduler<Command> timers) ->
                     replicatedBehaviors.setup(
-                        replicationContext ->
-                            new ChargingStation(context, replicationContext, timers))));
+                        replicationContext -> {
+                          context
+                              .getLog()
+                              .info(
+                                  "Charging Station {} starting up", replicationContext.entityId());
+                          return new ChargingStation(context, replicationContext, timers);
+                        })));
   }
 
   private static Duration durationUntil(Instant instant) {
diff --git a/samples/grpc/local-drone-control-java/src/main/resources/grpc.conf b/samples/grpc/local-drone-control-java/src/main/resources/grpc.conf
index d399bb5c0..241b0fad0 100644
--- a/samples/grpc/local-drone-control-java/src/main/resources/grpc.conf
+++ b/samples/grpc/local-drone-control-java/src/main/resources/grpc.conf
@@ -31,3 +31,9 @@ akka.projection.grpc.consumer {
   }
   stream-id = "delivery-events"
 }
+
+akka.projection.grpc {
+  producer {
+    query-plugin-id = "akka.persistence.r2dbc.query"
+  }
+}
\ No newline at end of file
diff --git a/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml b/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml
index aa63192cb..ce01436cb 100644
--- a/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml
+++ b/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.1-M1</akka.version>
-        <akka-projection.version>1.5.1-M1-10-16681325-SNAPSHOT</akka-projection.version>
+        <akka-projection.version>1.5.1-M1-16-e358cac2-SNAPSHOT</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.0</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.0</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
diff --git a/samples/grpc/restaurant-drone-deliveries-service-java/src/main/java/charging/ChargingStation.java b/samples/grpc/restaurant-drone-deliveries-service-java/src/main/java/charging/ChargingStation.java
index 9dd658cdc..9f5fc9b31 100644
--- a/samples/grpc/restaurant-drone-deliveries-service-java/src/main/java/charging/ChargingStation.java
+++ b/samples/grpc/restaurant-drone-deliveries-service-java/src/main/java/charging/ChargingStation.java
@@ -154,12 +154,12 @@ public static Behavior<Command> create(
                 (TimerScheduler<Command> timers) ->
                     replicatedBehaviors.setup(
                         replicationContext -> {
-                          context.getLog().info(
-                              "Charging Station {} starting up",
-                              replicationContext.entityId());
-                          return new ChargingStation(context, replicationContext, timers)
-                        })
-                ));
+                          context
+                              .getLog()
+                              .info(
+                                  "Charging Station {} starting up", replicationContext.entityId());
+                          return new ChargingStation(context, replicationContext, timers);
+                        })));
   }
 
   private static Duration durationUntil(Instant instant) {