Move the Conductor client out to dev.dbos:transact-enterprise

gradle/libs.versions.toml

@@ -5,7 +5,6 @@ cron-utils = "9.2.1"
 hibernate = "7.4.10.Final"
 hikaricp = "7.1.0"
 jackson = "3.2.3"
-java-websocket = "1.6.0"
 jaxb-api = "4.0.5"
 jdbi = "3.54.0"
 # jOOQ pinned to 3.19.x for JDK 17 compat https://www.jooq.org/download/support-matrix-jdk
@@ -42,7 +41,6 @@ assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 cron-utils = { module = "com.cronutils:cron-utils", version.ref = "cron-utils" }
 hikaricp = { module = "com.zaxxer:HikariCP", version.ref = "hikaricp" }
 jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
-java-websocket = { module = "org.java-websocket:Java-WebSocket", version.ref = "java-websocket" }
 jaxb-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version.ref = "jaxb-api" }
 jdbi-core = { module = "org.jdbi:jdbi3-core", version.ref = "jdbi" }
 jdbi-spring = { module = "org.jdbi:jdbi3-spring", version.ref = "jdbi" }

transact-spring-boot-starter/src/main/java/dev/dbos/transact/spring/DBOSProperties.java

@@ -92,7 +92,10 @@ public void setVersion(String version) {
   /** DBOS Cloud conductor connection properties. */
   public static class Conductor {
 
-    /** Conductor API key. */
+    /**
+     * Conductor API key. Connecting to Conductor requires {@code dev.dbos:transact-enterprise} on
+     * the class path.
+     */
     private String key;
 
     /** Conductor domain. */

transact/build.gradle.kts

@@ -25,7 +25,6 @@ dependencies {
   testImplementation(libs.system.stubs.jupiter)
   testRuntimeOnly(libs.junit.platform.launcher)
 
-  testImplementation(libs.java.websocket)
   testImplementation(libs.kryo)
   testImplementation(libs.logback.classic)
   testImplementation(libs.maven.artifact)

transact/src/main/java/dev/dbos/transact/admin/AdminServer.java

@@ -1,6 +1,5 @@
 package dev.dbos.transact.admin;
 
-import dev.dbos.transact.conductor.protocol.WorkflowsOutput;
 import dev.dbos.transact.database.SystemDatabase;
 import dev.dbos.transact.execution.DBOSExecutor;
 import dev.dbos.transact.json.JsonUtility;

transact/src/main/java/dev/dbos/transact/admin/ListQueuedWorkflowsRequest.java

@@ -1,6 +1,5 @@
 package dev.dbos.transact.admin;
 
-import dev.dbos.transact.conductor.protocol.StringOrListDeserializer;
 import dev.dbos.transact.workflow.ListWorkflowsInput;
 import dev.dbos.transact.workflow.WorkflowState;
 

transact/src/main/java/dev/dbos/transact/admin/ListWorkflowsRequest.java

@@ -1,6 +1,5 @@
 package dev.dbos.transact.admin;
 
-import dev.dbos.transact.conductor.protocol.StringOrListDeserializer;
 import dev.dbos.transact.workflow.ListWorkflowsInput;
 import dev.dbos.transact.workflow.WorkflowState;
 

transact/src/main/java/dev/dbos/transact/conductor/protocol/StringOrListDeserializer.java → transact/src/main/java/dev/dbos/transact/admin/StringOrListDeserializer.java

@@ -1,4 +1,4 @@
-package dev.dbos.transact.conductor.protocol;
+package dev.dbos.transact.admin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@
 import tools.jackson.databind.DeserializationContext;
 import tools.jackson.databind.ValueDeserializer;
 
-public class StringOrListDeserializer extends ValueDeserializer<List<String>> {
+class StringOrListDeserializer extends ValueDeserializer<List<String>> {
   @Override
   public List<String> deserialize(JsonParser p, DeserializationContext ctxt) {
     if (p.currentToken() == JsonToken.START_ARRAY) {

transact/src/main/java/dev/dbos/transact/conductor/protocol/WorkflowsOutput.java → transact/src/main/java/dev/dbos/transact/admin/WorkflowsOutput.java

@@ -1,11 +1,11 @@
-package dev.dbos.transact.conductor.protocol;
+package dev.dbos.transact.admin;
 
 import dev.dbos.transact.json.JsonUtility;
 import dev.dbos.transact.workflow.WorkflowStatus;
 
 import java.util.Objects;
 
-public class WorkflowsOutput {
+class WorkflowsOutput {
   public String WorkflowUUID;
 
   // Note, remaining fields are optional