Revert "Assorted changes for new Java SDK (#213)"

This reverts commit 28ded7c.
restatedev · Nov 20, 2024 · 587c163 · 587c163
1 parent 28ded7c
commit 587c163
Show file tree

Hide file tree

Showing 39 changed files with 116 additions and 682 deletions.
diff --git a/basics/basics-java/build.gradle.kts b/basics/basics-java/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
   mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   annotationProcessor("dev.restate:sdk-api-gen:$restateVersion")
@@ -28,7 +28,7 @@ dependencies {
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1")
 
   // Logging (optional)
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+  implementation("org.apache.logging.log4j:log4j-core:2.20.0")
 }
 
 // Set main class

diff --git a/basics/basics-kotlin/build.gradle.kts b/basics/basics-kotlin/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
   mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   // Annotation processor
@@ -22,10 +22,10 @@ dependencies {
   implementation("dev.restate:sdk-http-vertx:$restateVersion")
 
   // Logging (optional)
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+  implementation("org.apache.logging.log4j:log4j-core:2.23.0")
 
   // Kotlinx serialization (optional)
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
 }
 
 // Setup Java/Kotlin compiler target

diff --git a/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
     mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
     // Restate SDK
@@ -31,7 +31,7 @@ dependencies {
     implementation("org.apache.kafka:kafka-clients:3.6.1")
 
     // Logging (optional)
-    implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+    implementation("org.apache.logging.log4j:log4j-core:2.20.0")
 }
 
 // Set main class

diff --git a/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/restaurant/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
     mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
     // Kafka
@@ -24,7 +24,7 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2")
 
     // Logging (optional)
-    implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+    implementation("org.apache.logging.log4j:log4j-core:2.20.0")
 }
 
 

diff --git a/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 repositories { mavenCentral() }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   // Restate SDK
@@ -18,7 +18,7 @@ dependencies {
   implementation("org.apache.kafka:kafka-clients:3.6.1")
 
   // Logging (optional)
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+  implementation("org.apache.logging.log4j:log4j-core:2.23.0")
 }
 
 // Set main class

diff --git a/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 repositories { mavenCentral() }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   // Kafka

diff --git a/end-to-end-applications/kotlin/kmp-android-todo-app/server/build.gradle.kts b/end-to-end-applications/kotlin/kmp-android-todo-app/server/build.gradle.kts
@@ -11,7 +11,7 @@ version = "1.0.0"
 val restateVersion = "1.1.0"
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(11)
 }
 
 dependencies {
@@ -24,7 +24,7 @@ dependencies {
     implementation("dev.restate:sdk-api-kotlin:$restateVersion")
     implementation("dev.restate:sdk-http-vertx:$restateVersion")
 
-    implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+    implementation("org.apache.logging.log4j:log4j-core:2.23.0")
 }
 
 application {

diff --git a/end-to-end-applications/kotlin/kmp-android-todo-app/shared/build.gradle.kts b/end-to-end-applications/kotlin/kmp-android-todo-app/shared/build.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
 
     jvm()
 
-    jvmToolchain(17)
+    jvmToolchain(11)
 
     sourceSets {
         commonMain.dependencies {

diff --git a/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts b/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
   mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   annotationProcessor("dev.restate:sdk-api-gen:$restateVersion")
@@ -31,7 +31,7 @@ dependencies {
   implementation("com.google.code.gson:gson:2.10.1")
 
   // Logging (optional)
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+  implementation("org.apache.logging.log4j:log4j-core:2.20.0")
 }
 
 // Set main class

diff --git a/patterns-use-cases/integrations/java-spring/build.gradle.kts b/patterns-use-cases/integrations/java-spring/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 group = "dev.restate.examples"
 version = "0.0.1-SNAPSHOT"
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 java {
 	toolchain {
@@ -31,13 +31,15 @@ dependencies {
 	implementation("org.springframework.boot", "spring-boot-starter-data-jpa")
 
 	// Restate SDK
-	implementation("dev.restate:sdk-spring-boot-starter:$restateVersion")
+	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("org.postgresql", "postgresql")
 
 	// Logging (optional)
-	implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+	implementation("org.apache.logging.log4j:log4j-core:2.20.0")
 }
 
 // Set main class

diff --git a/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/AppMain.java b/patterns-use-cases/integrations/java-spring/src/main/java/dev/restate/examples/AppMain.java
@@ -1,11 +1,9 @@
 package dev.restate.examples;
 
-import dev.restate.sdk.springboot.EnableRestate;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-@EnableRestate
 public class AppMain {
 
   public static void main(String[] args) {

diff --git a/...use-cases/integrations/java-spring/src/main/java/dev/restate/examples/ProductService.java b/...use-cases/integrations/java-spring/src/main/java/dev/restate/examples/ProductService.java
@@ -8,20 +8,16 @@
 import dev.restate.sdk.common.Serde;
 import dev.restate.sdk.common.TerminalException;
 import dev.restate.sdk.serde.jackson.JacksonSerdes;
-import dev.restate.sdk.springboot.RestateVirtualObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-@RestateVirtualObject
+@Component
+@VirtualObject
 public class ProductService {
 
-  private static final Serde<Product> productSerde = JacksonSerdes.of(Product.class);
+  @Autowired private ProductRepository productRepository;
 
-  private final ProductRepository productRepository;
-
-  public ProductService(ProductRepository productRepository) {
-    this.productRepository = productRepository;
-  }
+  private Serde<Product> productSerde = JacksonSerdes.of(Product.class);
 
   @Handler
   public Product getProductInformation(ObjectContext ctx) {

diff --git a/...se-cases/integrations/java-spring/src/main/java/dev/restate/examples/RestateEndpoint.java b/...se-cases/integrations/java-spring/src/main/java/dev/restate/examples/RestateEndpoint.java
@@ -0,0 +1,18 @@
+package dev.restate.examples;
+
+import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RestateEndpoint implements ApplicationRunner {
+
+  @Autowired private ProductService productService;
+
+  @Override
+  public void run(ApplicationArguments args) throws Exception {
+    RestateHttpEndpointBuilder.builder().bind(productService).buildAndListen();
+  }
+}
diff --git a/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts b/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
   mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   annotationProcessor("dev.restate:sdk-api-gen:$restateVersion")

diff --git a/patterns-use-cases/sagas/sagas-java/build.gradle.kts b/patterns-use-cases/sagas/sagas-java/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
   mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   annotationProcessor("dev.restate:sdk-api-gen:$restateVersion")
@@ -21,5 +21,5 @@ dependencies {
   implementation("dev.restate:sdk-serde-jackson:$restateVersion")
 
   // Logging (optional)
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+  implementation("org.apache.logging.log4j:log4j-core:2.20.0")
 }
diff --git a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
   mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   // Annotation processor
@@ -22,10 +22,10 @@ dependencies {
   implementation("dev.restate:sdk-http-vertx:$restateVersion")
 
   // Logging (optional)
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
+  implementation("org.apache.logging.log4j:log4j-core:2.23.0")
 
   // Kotlinx serialization (optional)
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
 }
 
 // Setup Java/Kotlin compiler target

diff --git a/templates/java-gradle/README.md b/templates/java-gradle/README.md
@@ -3,9 +3,3 @@
 Sample project configuration of a Restate service using the Java SDK and HTTP server. 
 
 Have a look at the [Java Quickstart guide](https://docs.restate.dev/get_started/quickstart?sdk=java) for more information on how to use this project.
-
-To run:
-
-```shell
-./gradlew run
-```
diff --git a/templates/java-gradle/build.gradle.kts b/templates/java-gradle/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
   mavenCentral()
 }
 
-val restateVersion = "1.2.0"
+val restateVersion = "1.1.1"
 
 dependencies {
   annotationProcessor("dev.restate:sdk-api-gen:$restateVersion")
@@ -21,18 +21,10 @@ dependencies {
   implementation("dev.restate:sdk-serde-jackson:$restateVersion")
 
   // Logging (optional)
-  implementation("org.apache.logging.log4j:log4j-core:2.24.1")
-
-  testImplementation(platform("org.junit:junit-bom:5.11.3"))
-  testImplementation("org.junit.jupiter:junit-jupiter")
-  testImplementation("dev.restate:sdk-testing:$restateVersion")
+  implementation("org.apache.logging.log4j:log4j-core:2.20.0")
 }
 
 // Set main class
 application {
   mainClass.set("my.example.Greeter")
-}
-
-tasks.named<Test>("test") {
-  useJUnitPlatform()
 }
diff --git a/templates/java-gradle/src/main/java/my/example/Greeter.java b/templates/java-gradle/src/main/java/my/example/Greeter.java
@@ -25,7 +25,7 @@ public class Greeter {
 
   @Handler
   public String greet(Context ctx, String greeting) {
-    return "Hello " + greeting;
+    return greeting;
   }
 
   public static void main(String[] args) {

diff --git a/templates/java-gradle/src/test/java/my/example/GreeterTest.java b/templates/java-gradle/src/test/java/my/example/GreeterTest.java
diff --git a/templates/java-maven-quarkus/pom.xml b/templates/java-maven-quarkus/pom.xml
@@ -15,7 +15,7 @@
         <quarkus.platform.version>3.15.1</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.3.1</surefire-plugin.version>
-        <restate.version>1.2.0</restate.version>
+        <restate.version>1.1.1</restate.version>
     </properties>
 
     <dependencyManagement>

diff --git a/templates/java-maven-spring-boot/README.md b/templates/java-maven-spring-boot/README.md
@@ -9,5 +9,5 @@ Have a look at the [Java Quickstart guide](https://docs.restate.dev/get_started/
 To start the service, simply run:
 
 ```shell
-$ mvn compile spring-boot:run
+$ mvn spring-boot:run
 ```