Update Java/Kotlin examples (#261)

* Update Java/Kotlin examples

* Add Kotlin Spring boot example, fix java spring boot example

* Few cosmetic small improvements to the examples

* Remove stuff not needed anymore

* Fix Kotlin

* Last minute package renaming

* Finish updates

* Add .idea to improve the experience with code generator

Author: slinkydeveloper

.github/workflows/release.yml

@@ -47,6 +47,7 @@ jobs:
                   kotlin-hello-world-lambda-cdk.zip
                   kotlin-patterns-use-cases.zip
                   kotlin-hello-world-gradle.zip
+                  kotlin-hello-world-gradle-spring-boot.zip
                   typescript-basics.zip
                   typescript-food-ordering.zip
                   typescript-chat-bot.zip

.gitignore

@@ -1,6 +1,6 @@
 # IDEs
+/.idea
 .vscode
-.idea
 *.iml
 
 # NodeJS

.tools/prepare_release_zip.sh

@@ -40,6 +40,7 @@ create_release_zip kotlin/end-to-end-applications/kmp-android-todo-app kotlin-km
 create_release_zip kotlin/integrations/kotlin-gradle-lambda-cdk kotlin-hello-world-lambda-cdk
 create_release_zip kotlin/patterns-use-cases kotlin-patterns-use-cases
 create_release_zip kotlin/templates/kotlin-gradle kotlin-hello-world-gradle
+create_release_zip kotlin/templates/kotlin-gradle-spring-boot kotlin-hello-world-gradle-spring-boot
 
 create_release_zip typescript/basics typescript-basics
 create_release_zip typescript/end-to-end-applications/food-ordering typescript-food-ordering

.tools/run_jvm_tests.sh

@@ -10,6 +10,7 @@ pushd $PROJECT_ROOT/java/templates/java-maven && mvn verify && popd
 pushd $PROJECT_ROOT/java/templates/java-maven-quarkus && mvn verify && popd
 pushd $PROJECT_ROOT/java/templates/java-maven-spring-boot && mvn verify && popd
 pushd $PROJECT_ROOT/kotlin/templates/kotlin-gradle && ./gradlew --console=plain check && popd
+pushd $PROJECT_ROOT/kotlin/templates/kotlin-gradle-spring-boot && ./gradlew --console=plain check && popd
 
 pushd $PROJECT_ROOT/java/basics && ./gradlew --console=plain check && popd
 pushd $PROJECT_ROOT/kotlin/basics && ./gradlew --console=plain check && popd
@@ -25,4 +26,6 @@ pushd $PROJECT_ROOT/java/end-to-end-applications/food-ordering/app && ./gradlew
 pushd $PROJECT_ROOT/java/end-to-end-applications/subway-fare-calculator && ./gradlew --console=plain check && popd
 pushd $PROJECT_ROOT/java/end-to-end-applications/workflow-interpreter && mvn verify && popd
 pushd $PROJECT_ROOT/kotlin/end-to-end-applications/food-ordering/app && ./gradlew --console=plain check && popd
-pushd $PROJECT_ROOT/kotlin/end-to-end-applications/kmp-android-todo-app && ./gradlew --console=plain check && popd
+
+# This needs the Android SDK
+# pushd $PROJECT_ROOT/kotlin/end-to-end-applications/kmp-android-todo-app && ./gradlew --console=plain check && popd

.tools/update_jvm_examples.sh

@@ -19,6 +19,7 @@ search_and_replace_version_maven $PROJECT_ROOT/java/templates/java-maven
 search_and_replace_version_maven $PROJECT_ROOT/java/templates/java-maven-quarkus
 search_and_replace_version_maven $PROJECT_ROOT/java/templates/java-maven-spring-boot
 search_and_replace_version_gradle $PROJECT_ROOT/kotlin/templates/kotlin-gradle
+search_and_replace_version_gradle $PROJECT_ROOT/kotlin/templates/kotlin-gradle-spring-boot
 
 search_and_replace_version_gradle $PROJECT_ROOT/java/integrations/java-spring
 search_and_replace_version_gradle $PROJECT_ROOT/kotlin/integrations/kotlin-gradle-lambda-cdk/lambda
@@ -34,7 +35,7 @@ search_and_replace_version_gradle $PROJECT_ROOT/java/tutorials/tour-of-restate-j
 search_and_replace_version_gradle $PROJECT_ROOT/java/end-to-end-applications/subway-fare-calculator
 search_and_replace_version_gradle $PROJECT_ROOT/java/end-to-end-applications/food-ordering/app/restate-app
 search_and_replace_version_gradle $PROJECT_ROOT/java/end-to-end-applications/food-ordering/app/restaurant
-search_and_replace_version_gradle $PROJECT_ROOT/java/end-to-end-applications/workflow-interpreter
+search_and_replace_version_maven $PROJECT_ROOT/java/end-to-end-applications/workflow-interpreter
 search_and_replace_version_gradle $PROJECT_ROOT/kotlin/end-to-end-applications/food-ordering/app/restate-app
 search_and_replace_version_gradle $PROJECT_ROOT/kotlin/end-to-end-applications/food-ordering/app/restaurant
 search_and_replace_version_gradle $PROJECT_ROOT/kotlin/end-to-end-applications/kmp-android-todo-app/server

java/basics/.gitignore

@@ -28,7 +28,6 @@ hs_err_pid*
 # Ignore Gradle build output directory
 build
 
-.idea
 *.iml
 
 # Unignore the gradle wrapper

java/basics/.idea/compiler.xml

@@ -9,26 +9,22 @@ repositories {
   mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "2.0.0"
 
 dependencies {
   annotationProcessor("dev.restate:sdk-api-gen:$restateVersion")
 
   // Restate SDK
-  implementation("dev.restate:sdk-api:$restateVersion")
-  implementation("dev.restate:sdk-http-vertx:$restateVersion")
-  // To use Jackson to read/write state entries (optional)
-  implementation("dev.restate:sdk-serde-jackson:$restateVersion")
+  implementation("dev.restate:sdk-java-http:$restateVersion")
+
+  implementation("org.apache.logging.log4j:log4j-api:2.24.1")
 
   // Jackson parameter names
   // https://github.com/FasterXML/jackson-modules-java8/tree/2.14/parameter-names
   implementation("com.fasterxml.jackson.module:jackson-module-parameter-names:2.16.1")
   // Jackson java8 types
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.16.1")
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1")
-
-  // Logging (optional)
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
 }
 
 // Set main class

java/basics/build.gradle.kts

@@ -1,10 +1,10 @@
 package building_blocks;
 
 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.http.vertx.RestateHttpEndpointBuilder;
+import dev.restate.sdk.endpoint.Endpoint;
+import dev.restate.sdk.http.vertx.RestateHttpServer;
 import virtual_objects.GreeterObjectClient;
 
 import java.time.Duration;
@@ -45,12 +45,12 @@ public void run(Context ctx) throws Exception {
 
         // 4. DURABLE PROMISES: tracked by Restate, can be moved between processes and survive failures
         // Awakeables: block the workflow until notified by another handler
-        var awakeable = ctx.awakeable(JsonSerdes.STRING);
+        var awakeable = ctx.awakeable(String.class);
         // Wait on the promise
         // If the process crashes while waiting, Restate will recover the promise somewhere else
         String greeting = awakeable.await();
         // Another process can resolve the awakeable via its ID
-        ctx.awakeableHandle(awakeable.id()).resolve(JsonSerdes.STRING, "hello");
+        ctx.awakeableHandle(awakeable.id()).resolve(String.class, "hello");
 
         // 5. DURABLE TIMERS: sleep or wait for a timeout, tracked by Restate and recoverable
         // When this runs on FaaS, the handler suspends and the timer is tracked by Restate
@@ -60,7 +60,7 @@ public void run(Context ctx) throws Exception {
         // Example of waiting on a promise (call/awakeable/...) or a timeout
         awakeable.await(Duration.ofSeconds(5000));
         // Example of scheduling a handler for later on
-        GreeterObjectClient.fromContext(ctx, "my-obj-key").send(Duration.ofDays(1)).ungreet();
+        GreeterObjectClient.fromContext(ctx, "my-obj-key").send().ungreet(Duration.ofDays(1));
 
         // 7. PERSIST RESULTS: avoid re-execution of actions on retries
         // Use this for non-deterministic actions or interaction with APIs, DBs, ...
@@ -71,8 +71,6 @@ public void run(Context ctx) throws Exception {
     }
 
     public static void main(String[] args) {
-        RestateHttpEndpointBuilder.builder()
-                .bind(new MyService())
-                .buildAndListen();
+        RestateHttpServer.listen(Endpoint.bind(new MyService()));
     }
 }

java/basics/src/main/java/building_blocks/MyService.java

@@ -1,10 +1,10 @@
 package durable_execution;
 
-import dev.restate.sdk.JsonSerdes;
 import dev.restate.sdk.Context;
 import dev.restate.sdk.annotation.Handler;
 import dev.restate.sdk.annotation.Service;
-import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder;
+import dev.restate.sdk.endpoint.Endpoint;
+import dev.restate.sdk.http.vertx.RestateHttpServer;
 import utils.SubscriptionRequest;
 
 import static utils.ExampleStubs.*;
@@ -40,7 +40,7 @@ public void add(Context ctx, SubscriptionRequest req) {
 
         // ctx.run persists results of successful actions and skips execution on retries
         // Failed actions (timeouts, API downtime, etc.) get retried
-        var payRef = ctx.run(JsonSerdes.STRING, () ->
+        var payRef = ctx.run(String.class, () ->
                 createRecurringPayment(req.creditCard(), paymentId));
 
         for (String subscription : req.subscriptions()) {
@@ -50,9 +50,7 @@ public void add(Context ctx, SubscriptionRequest req) {
 
     public static void main(String[] args) {
         // Create an HTTP endpoint to serve your services
-        RestateHttpEndpointBuilder.builder()
-                .bind(new SubscriptionService())
-                .buildAndListen();
+        RestateHttpServer.listen(Endpoint.bind(new SubscriptionService()));
     }
 }