From 7d037974e8d647a9d4680f63ae125da1e8566376 Mon Sep 17 00:00:00 2001
From: Francesco Guardiani <francescoguard@gmail.com>
Date: Wed, 11 Oct 2023 18:22:01 +0200
Subject: [PATCH] Renamings of Java artifacts (#204)

---
 services/java-services/build.gradle.kts              |  8 ++------
 .../src/main/java/dev/restate/e2e/services/Main.java |  6 ++----
 settings.gradle.kts                                  | 12 +++++-------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/services/java-services/build.gradle.kts b/services/java-services/build.gradle.kts
index cfb4334e..9de59246 100644
--- a/services/java-services/build.gradle.kts
+++ b/services/java-services/build.gradle.kts
@@ -10,9 +10,8 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.restate.sdk.core)
-  implementation(libs.restate.sdk.blocking)
-  implementation(libs.restate.sdk.vertx)
+  implementation(libs.restate.sdk.java.blocking)
+  implementation(libs.restate.sdk.http.vertx)
   implementation(libs.restate.sdk.jackson)
 
   implementation(project(":contracts"))
@@ -25,9 +24,6 @@ dependencies {
   implementation(platform(libs.jackson.bom))
   implementation(libs.jackson.core)
   implementation(libs.jackson.databind)
-
-  implementation(platform(libs.vertx.bom))
-  implementation(libs.vertx.core)
 }
 
 jib {
diff --git a/services/java-services/src/main/java/dev/restate/e2e/services/Main.java b/services/java-services/src/main/java/dev/restate/e2e/services/Main.java
index 9e0c4919..3ed2402f 100644
--- a/services/java-services/src/main/java/dev/restate/e2e/services/Main.java
+++ b/services/java-services/src/main/java/dev/restate/e2e/services/Main.java
@@ -20,8 +20,7 @@
 import dev.restate.e2e.services.singletoncounter.SingletonCounterGrpc;
 import dev.restate.e2e.services.upgradetest.UpgradeTestService;
 import dev.restate.e2e.services.upgradetest.UpgradeTestServiceGrpc;
-import dev.restate.sdk.vertx.RestateHttpEndpointBuilder;
-import io.vertx.core.Vertx;
+import dev.restate.sdk.http.vertx.RestateHttpEndpointBuilder;
 import java.util.Objects;
 
 public class Main {
@@ -32,8 +31,7 @@ public static void main(String[] args) {
             System.getenv("SERVICES"),
             "SERVICES env variable needs to specify which service to run.");
 
-    RestateHttpEndpointBuilder restateHttpEndpointBuilder =
-        RestateHttpEndpointBuilder.builder(Vertx.vertx());
+    RestateHttpEndpointBuilder restateHttpEndpointBuilder = RestateHttpEndpointBuilder.builder();
     for (String service : env.split(",")) {
       switch (service.trim()) {
         case ListServiceGrpc.SERVICE_NAME:
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b89985e8..aa471d3c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -37,9 +37,10 @@ dependencyResolutionManagement {
 
       // Libraries
       library("restate-sdk-core", "dev.restate.sdk", "sdk-core").versionRef("restate")
-      library("restate-sdk-blocking", "dev.restate.sdk", "sdk-blocking").versionRef("restate")
+      library("restate-sdk-java-blocking", "dev.restate.sdk", "sdk-java-blocking")
+          .versionRef("restate")
       library("restate-sdk-jackson", "dev.restate.sdk", "sdk-serde-jackson").versionRef("restate")
-      library("restate-sdk-vertx", "dev.restate.sdk", "sdk-vertx").versionRef("restate")
+      library("restate-sdk-http-vertx", "dev.restate.sdk", "sdk-http-vertx").versionRef("restate")
 
       library("protoc", "com.google.protobuf", "protoc").versionRef("protobuf")
       library("protobuf-java", "com.google.protobuf", "protobuf-java").versionRef("protobuf")
@@ -56,9 +57,6 @@ dependencyResolutionManagement {
       // Replace javax.annotations-api with tomcat annotations
       library("javax-annotation-api", "org.apache.tomcat", "annotations-api").version("6.0.53")
 
-      library("vertx-bom", "io.vertx:vertx-stack-depchain:4.4.5")
-      library("vertx-core", "io.vertx", "vertx-core").withoutVersion()
-
       library("jackson-bom", "com.fasterxml.jackson", "jackson-bom").versionRef("jackson")
       library("jackson-core", "com.fasterxml.jackson.core", "jackson-core").withoutVersion()
       library("jackson-databind", "com.fasterxml.jackson.core", "jackson-databind").withoutVersion()
@@ -95,8 +93,8 @@ if (!System.getenv("JAVA_SDK_LOCAL_BUILD").isNullOrEmpty()) {
   includeBuild("../sdk-java") {
     dependencySubstitution {
       substitute(module("dev.restate.sdk:sdk-core")).using(project(":sdk-core"))
-      substitute(module("dev.restate.sdk:sdk-blocking")).using(project(":sdk-blocking"))
-      substitute(module("dev.restate.sdk:sdk-vertx")).using(project(":sdk-vertx"))
+      substitute(module("dev.restate.sdk:sdk-java-blocking")).using(project(":sdk-java-blocking"))
+      substitute(module("dev.restate.sdk:sdk-http-vertx")).using(project(":sdk-http-vertx"))
       substitute(module("dev.restate.sdk:sdk-serde-jackson")).using(project(":sdk-serde-jackson"))
     }
   }