Update Java code snippets to SDK v1.0 (#385)

* Update Java code snippets * Update Java concept code snippets * Fix serving docs virtual threads * Update kotlin docs to new version
restatedev · Jun 3, 2024 · 0793c5e · 0793c5e
1 parent d730ee5
commit 0793c5e
Show file tree

Hide file tree

Showing 27 changed files with 90 additions and 88 deletions.
diff --git a/code_snippets/java/build.gradle.kts b/code_snippets/java/build.gradle.kts
@@ -7,9 +7,10 @@ plugins {
 
 repositories {
   mavenCentral()
+  mavenLocal()
 }
 
-val restateVersion = "0.9.0"
+val restateVersion = "0.10.0-SNAPSHOT"
 
 dependencies {
   // Restate SDK

diff --git a/code_snippets/java/src/main/java/concepts/buildingblocks/part0/OrderWorkflow.java b/code_snippets/java/src/main/java/concepts/buildingblocks/part0/OrderWorkflow.java
@@ -5,10 +5,11 @@
 import concepts.buildingblocks.types.StatusEnum;
 import concepts.buildingblocks.utils.PaymentClient;
 import concepts.buildingblocks.utils.RestaurantClient;
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
+import dev.restate.sdk.common.Serde;
 import dev.restate.sdk.common.StateKey;
 import dev.restate.sdk.serde.jackson.JacksonSerdes;
 
@@ -27,7 +28,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
 
         // 2. Handle payment
         String token = ctx.random().nextUUID().toString();
-        boolean paid = ctx.run(CoreSerdes.JSON_BOOLEAN, () ->
+        boolean paid = ctx.run(JsonSerdes.BOOLEAN, () ->
             PaymentClient.charge(id, token, order.getTotalCost()));
 
         if (!paid) {
@@ -40,7 +41,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
         ctx.sleep(Duration.ofMillis(order.getDeliveryDelay()));
 
         // 4. Trigger preparation
-        var awakeable = ctx.awakeable(CoreSerdes.VOID);
+        var awakeable = ctx.awakeable(Serde.VOID);
         ctx.run(() ->
             RestaurantClient.prepare(id, awakeable.id()));
         ctx.set(STATUS, StatusEnum.IN_PREPARATION);

diff --git a/code_snippets/java/src/main/java/concepts/buildingblocks/part1_functions/OrderWorkflow.java b/code_snippets/java/src/main/java/concepts/buildingblocks/part1_functions/OrderWorkflow.java
@@ -5,10 +5,11 @@
 import concepts.buildingblocks.types.StatusEnum;
 import concepts.buildingblocks.utils.PaymentClient;
 import concepts.buildingblocks.utils.RestaurantClient;
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
+import dev.restate.sdk.common.Serde;
 import dev.restate.sdk.common.StateKey;
 import dev.restate.sdk.serde.jackson.JacksonSerdes;
 
@@ -28,7 +29,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
 
         // 2. Handle payment
         String token = ctx.random().nextUUID().toString();
-        boolean paid = ctx.run(CoreSerdes.JSON_BOOLEAN, () ->
+        boolean paid = ctx.run(JsonSerdes.BOOLEAN, () ->
             PaymentClient.charge(id, token, order.getTotalCost()));
 
         if (!paid) {
@@ -41,7 +42,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
         ctx.sleep(Duration.ofMillis(order.getDeliveryDelay()));
 
         // 4. Trigger preparation
-        var awakeable = ctx.awakeable(CoreSerdes.VOID);
+        var awakeable = ctx.awakeable(Serde.VOID);
         ctx.run(() ->
             RestaurantClient.prepare(id, awakeable.id()));
         ctx.set(STATUS, StatusEnum.IN_PREPARATION);

diff --git a/code_snippets/java/src/main/java/concepts/buildingblocks/part2_rpc/OrderWorkflow.java b/code_snippets/java/src/main/java/concepts/buildingblocks/part2_rpc/OrderWorkflow.java
@@ -5,10 +5,11 @@
 import concepts.buildingblocks.types.StatusEnum;
 import concepts.buildingblocks.utils.PaymentClient;
 import concepts.buildingblocks.utils.RestaurantClient;
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
+import dev.restate.sdk.common.Serde;
 import dev.restate.sdk.common.StateKey;
 import dev.restate.sdk.serde.jackson.JacksonSerdes;
 
@@ -27,7 +28,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
 
         // 2. Handle payment
         String token = ctx.random().nextUUID().toString();
-        boolean paid = ctx.run(CoreSerdes.JSON_BOOLEAN, () ->
+        boolean paid = ctx.run(JsonSerdes.BOOLEAN, () ->
             PaymentClient.charge(id, token, order.getTotalCost()));
 
         if (!paid) {
@@ -40,7 +41,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
         ctx.sleep(Duration.ofMillis(order.getDeliveryDelay()));
 
         // 4. Trigger preparation
-        var awakeable = ctx.awakeable(CoreSerdes.VOID);
+        var awakeable = ctx.awakeable(Serde.VOID);
         ctx.run(() ->
             RestaurantClient.prepare(id, awakeable.id()));
         ctx.set(STATUS, StatusEnum.IN_PREPARATION);

diff --git a/code_snippets/java/src/main/java/concepts/buildingblocks/part3_promises/OrderWorkflow.java b/code_snippets/java/src/main/java/concepts/buildingblocks/part3_promises/OrderWorkflow.java
@@ -5,10 +5,11 @@
 import concepts.buildingblocks.types.StatusEnum;
 import concepts.buildingblocks.utils.PaymentClient;
 import concepts.buildingblocks.utils.RestaurantClient;
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
+import dev.restate.sdk.common.Serde;
 import dev.restate.sdk.common.StateKey;
 import dev.restate.sdk.serde.jackson.JacksonSerdes;
 
@@ -27,7 +28,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
 
         // 2. Handle payment
         String token = ctx.random().nextUUID().toString();
-        boolean paid = ctx.run(CoreSerdes.JSON_BOOLEAN, () ->
+        boolean paid = ctx.run(JsonSerdes.BOOLEAN, () ->
             PaymentClient.charge(id, token, order.getTotalCost()));
 
         if (!paid) {
@@ -41,7 +42,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
 
         // 4. Trigger preparation
         // focus
-        var awakeable = ctx.awakeable(CoreSerdes.VOID);
+        var awakeable = ctx.awakeable(Serde.VOID);
         ctx.run(() ->
             // focus
             RestaurantClient.prepare(id, awakeable.id()));

diff --git a/code_snippets/java/src/main/java/concepts/buildingblocks/part4_state/OrderWorkflow.java b/code_snippets/java/src/main/java/concepts/buildingblocks/part4_state/OrderWorkflow.java
@@ -5,10 +5,11 @@
 import concepts.buildingblocks.types.StatusEnum;
 import concepts.buildingblocks.utils.PaymentClient;
 import concepts.buildingblocks.utils.RestaurantClient;
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
+import dev.restate.sdk.common.Serde;
 import dev.restate.sdk.common.StateKey;
 import dev.restate.sdk.serde.jackson.JacksonSerdes;
 
@@ -30,7 +31,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
 
         // 2. Handle payment
         String token = ctx.random().nextUUID().toString();
-        boolean paid = ctx.run(CoreSerdes.JSON_BOOLEAN, () ->
+        boolean paid = ctx.run(JsonSerdes.BOOLEAN, () ->
             PaymentClient.charge(id, token, order.getTotalCost()));
 
         if (!paid) {
@@ -45,7 +46,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
         ctx.sleep(Duration.ofMillis(order.getDeliveryDelay()));
 
         // 4. Trigger preparation
-        var awakeable = ctx.awakeable(CoreSerdes.VOID);
+        var awakeable = ctx.awakeable(Serde.VOID);
         ctx.run(() ->
             RestaurantClient.prepare(id, awakeable.id()));
         // focus

diff --git a/..._snippets/java/src/main/java/concepts/buildingblocks/part5_sideeffects/OrderWorkflow.java b/..._snippets/java/src/main/java/concepts/buildingblocks/part5_sideeffects/OrderWorkflow.java
@@ -5,10 +5,11 @@
 import concepts.buildingblocks.types.StatusEnum;
 import concepts.buildingblocks.utils.PaymentClient;
 import concepts.buildingblocks.utils.RestaurantClient;
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
+import dev.restate.sdk.common.Serde;
 import dev.restate.sdk.common.StateKey;
 import dev.restate.sdk.serde.jackson.JacksonSerdes;
 
@@ -28,7 +29,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
         // 2. Handle payment
         String token = ctx.random().nextUUID().toString();
         // focus(1:2)
-        boolean paid = ctx.run(CoreSerdes.JSON_BOOLEAN, () ->
+        boolean paid = ctx.run(JsonSerdes.BOOLEAN, () ->
             PaymentClient.charge(id, token, order.getTotalCost()));
 
         if (!paid) {
@@ -41,7 +42,7 @@ public void process(ObjectContext ctx, OrderRequest order) {
         ctx.sleep(Duration.ofMillis(order.getDeliveryDelay()));
 
         // 4. Trigger preparation
-        var awakeable = ctx.awakeable(CoreSerdes.VOID);
+        var awakeable = ctx.awakeable(Serde.VOID);
         // focus(1:2)
         ctx.run(() ->
             RestaurantClient.prepare(id, awakeable.id()));

diff --git a/code_snippets/java/src/main/java/concepts/buildingblocks/types/OrderRequest.java b/code_snippets/java/src/main/java/concepts/buildingblocks/types/OrderRequest.java
@@ -13,13 +13,12 @@ public class OrderRequest {
     private final double totalCost;
     private final int deliveryDelay;
 
-    @JsonCreator
     public OrderRequest(
-            @JsonProperty("orderId") String orderId,
-            @JsonProperty("restaurantId") String restaurantId,
-            @JsonProperty("products") Product[] products,
-            @JsonProperty("totalCost") double totalCost,
-            @JsonProperty("deliveryDelay") int deliveryDelay) {
+            String orderId,
+            String restaurantId,
+            Product[] products,
+            double totalCost,
+            int deliveryDelay) {
         this.orderId = orderId;
         this.restaurantId = restaurantId;
         this.products = products;

diff --git a/code_snippets/java/src/main/java/concepts/buildingblocks/types/Product.java b/code_snippets/java/src/main/java/concepts/buildingblocks/types/Product.java
@@ -9,9 +9,9 @@ class Product {
     private final int quantity;
 
     public Product(
-            @JsonProperty("productId") String productId,
-            @JsonProperty("description") String description,
-            @JsonProperty("quantity") int quantity) {
+            String productId,
+            String description,
+            int quantity) {
         this.productId = productId;
         this.description = description;
         this.quantity = quantity;

diff --git a/code_snippets/java/src/main/java/concepts/invocations/GreetCounterObject.java b/code_snippets/java/src/main/java/concepts/invocations/GreetCounterObject.java
@@ -1,16 +1,16 @@
 package concepts.invocations;
 
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
 import dev.restate.sdk.common.StateKey;
 
 @VirtualObject
 public class GreetCounterObject {
 
     public final static StateKey<Integer> COUNT =
-            StateKey.of("count", CoreSerdes.JSON_INT);
+            StateKey.of("count", JsonSerdes.INT);
 
     @Handler
     public int greet(ObjectContext ctx, String greeting){

diff --git a/code_snippets/java/src/main/java/concepts/services/Greeter.java b/code_snippets/java/src/main/java/concepts/services/Greeter.java
@@ -1,9 +1,9 @@
 package concepts.services;
 
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
 import dev.restate.sdk.common.StateKey;
 import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder;
 
@@ -18,7 +18,7 @@
 public class Greeter {
 
     public final static StateKey<Integer> COUNT =
-            StateKey.of("count", CoreSerdes.JSON_INT);
+            StateKey.of("count", JsonSerdes.INT);
 
     @Handler
     public String greet(ObjectContext ctx, String greeting) {

diff --git a/code_snippets/java/src/main/java/concepts/services/RoleUpdateService.java b/code_snippets/java/src/main/java/concepts/services/RoleUpdateService.java
@@ -1,9 +1,12 @@
 package concepts.services;
 
+import concepts.services.types.SystemA;
+import concepts.services.types.SystemB;
+import concepts.services.types.UpdateRequest;
 import dev.restate.sdk.Context;
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.Service;
-import dev.restate.sdk.common.CoreSerdes;
 import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder;
 
 /**
@@ -18,14 +21,14 @@ public class RoleUpdateService {
 
   @Handler
   public void applyRoleUpdate(Context ctx, UpdateRequest req) {
-    boolean success = ctx.run(CoreSerdes.JSON_BOOLEAN, () ->
+    boolean success = ctx.run(JsonSerdes.BOOLEAN, () ->
         SystemA.applyUserRole(req.getUserId(), req.getRole()));
     if (!success) {
         return;
     }
 
     for(String permission: req.getPermissions()) {
-        ctx.run(CoreSerdes.JSON_BOOLEAN, () ->
+        ctx.run(JsonSerdes.BOOLEAN, () ->
           SystemB.applyPermission(req.getUserId(), permission));
     }
   }

diff --git a/.../main/java/concepts/services/SystemA.java → ...java/concepts/services/types/SystemA.java b/.../main/java/concepts/services/SystemA.java → ...java/concepts/services/types/SystemA.java
@@ -1,4 +1,4 @@
-package concepts.services;
+package concepts.services.types;
 
 public class SystemA {
     public static boolean applyUserRole(String userId, String role) {

diff --git a/.../main/java/concepts/services/SystemB.java → ...java/concepts/services/types/SystemB.java b/.../main/java/concepts/services/SystemB.java → ...java/concepts/services/types/SystemB.java
@@ -1,4 +1,4 @@
-package concepts.services;
+package concepts.services.types;
 
 public class SystemB {
     public static boolean applyPermission(String userId, String permission) {

diff --git a/...java/concepts/services/UpdateRequest.java → ...oncepts/services/types/UpdateRequest.java b/...java/concepts/services/UpdateRequest.java → ...oncepts/services/types/UpdateRequest.java
@@ -1,4 +1,4 @@
-package concepts.services;
+package concepts.services.types;
 
 public class UpdateRequest {
     private String userId;

diff --git a/code_snippets/java/src/main/java/develop/Awakeables.java b/code_snippets/java/src/main/java/develop/Awakeables.java
@@ -1,14 +1,14 @@
 package develop;
 
 import dev.restate.sdk.Awakeable;
+import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.ObjectContext;
-import dev.restate.sdk.common.CoreSerdes;
 
 public class Awakeables {
 
     public void awakeables(ObjectContext ctx) {
         // <start_create>
-        Awakeable<String> awakeable = ctx.awakeable(CoreSerdes.JSON_STRING);
+        Awakeable<String> awakeable = ctx.awakeable(JsonSerdes.STRING);
         String awakeableId = awakeable.id();
 
         ctx.run(() -> triggerTaskAndDeliverId(awakeableId));
@@ -18,7 +18,7 @@ public void awakeables(ObjectContext ctx) {
 
         // <start_resolve>
         ctx.awakeableHandle(awakeableId)
-                .resolve(CoreSerdes.JSON_STRING, "hello");
+                .resolve(JsonSerdes.STRING, "hello");
         // <end_resolve>
 
         // <start_reject>

diff --git a/code_snippets/java/src/main/java/develop/Greeter.java b/code_snippets/java/src/main/java/develop/Greeter.java
@@ -8,7 +8,7 @@
 @VirtualObject
 public class Greeter {
 
-  private static final StateKey<Integer> COUNT = StateKey.of("count", CoreSerdes.JSON_INT);
+  private static final StateKey<Integer> COUNT = StateKey.of("count", JsonSerdes.INT);
 
   @Handler
   public String greet(ObjectContext ctx, String greeting) {

diff --git a/code_snippets/java/src/main/java/develop/MyService.java b/code_snippets/java/src/main/java/develop/MyService.java
@@ -1,12 +1,8 @@
 package develop;
 
 import dev.restate.sdk.Context;
-import dev.restate.sdk.ObjectContext;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.Service;
-import dev.restate.sdk.annotation.VirtualObject;
-import dev.restate.sdk.common.CoreSerdes;
-import dev.restate.sdk.common.StateKey;
 import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder;
 
 import java.util.UUID;