Fix suffix problem with workflow api. Now the workflow service will have the same exact name given by the user, while the workflow manager will be suffixed with WorkflowManager (#225)

Author: slinkydeveloper

examples/src/main/java/my/restate/sdk/examples/Loan.java renamed to examples/src/main/java/my/restate/sdk/examples/LoanWorkflow.java

@@ -37,7 +37,7 @@
 import org.apache.logging.log4j.Logger;
 
 @Service(ServiceType.WORKFLOW)
-public class Loan {
+public class LoanWorkflow {
 
   // --- Data types used by the Loan Worfklow
 
@@ -86,7 +86,7 @@ public BigDecimal getAmount() {
     }
   }
 
-  private static final Logger LOG = LogManager.getLogger(Loan.class);
+  private static final Logger LOG = LogManager.getLogger(LoanWorkflow.class);
 
   private static final StateKey<Status> STATUS =
       StateKey.of("status", JacksonSerdes.of(Status.class));
@@ -160,7 +160,7 @@ public void rejectLoan(WorkflowSharedContext ctx) {
 
   public static void main(String[] args) {
     RestateHttpEndpointBuilder.builder()
-        .with(new Loan())
+        .with(new LoanWorkflow())
         .withService(new MockBank())
         .buildAndListen();
 
@@ -176,7 +176,7 @@ public static void main(String[] args) {
     // To invoke the workflow:
     Channel restateChannel =
         NettyChannelBuilder.forAddress("127.0.0.1", 8080).usePlaintext().build();
-    LoanExternalClient client = new LoanExternalClient(restateChannel, "my-loan");
+    LoanWorkflowExternalClient client = new LoanWorkflowExternalClient(restateChannel, "my-loan");
 
     WorkflowExecutionState state =
         client.submit(

sdk-workflow-api/src/main/java/dev/restate/sdk/workflow/impl/WorkflowCodegenUtil.java

@@ -281,11 +281,7 @@ public static <T> Optional<T> getState(
 
   public static <Req, Res> MethodDescriptor<Req, Res> generateMethodDescriptorForWorkflowManager(
       MethodDescriptor<Req, Res> original, String workflowFqsn) {
-    String workflowServiceFqsn =
-        workflowFqsn
-            +
-            // This is simple name because our template service doesn't have a package!
-            original.getServiceName();
+    String workflowServiceFqsn = workflowFqsn + WorkflowMangledDescriptors.MANAGER_SERVICE_SUFFIX;
     return original.toBuilder()
         .setFullMethodName(
             MethodDescriptor.generateFullMethodName(
@@ -295,43 +291,28 @@ public static <Req, Res> MethodDescriptor<Req, Res> generateMethodDescriptorForW
 
   public static <Req, Res> MethodDescriptor<Req, Res> generateMethodDescriptorForWorkflow(
       MethodDescriptor<Req, Res> original, String workflowFqsn, String methodName) {
-    String workflowServiceFqsn =
-        workflowFqsn
-            +
-            // This is simple name because our template service doesn't have a package!
-            original.getServiceName();
     return original.toBuilder()
         .setFullMethodName(
             MethodDescriptor.generateFullMethodName(
-                workflowServiceFqsn, DescriptorUtils.toMethodName(methodName)))
+                workflowFqsn, DescriptorUtils.toMethodName(methodName)))
         .build();
   }
 
   public static MethodDescriptor<InvokeRequest, SubmitResponse>
       generateMethodDescriptorForWorkflowSubmit(String workflowFqsn) {
-    String workflowServiceFqsn =
-        workflowFqsn
-            +
-            // This is simple name because our template service doesn't have a package!
-            WorkflowGrpc.getSubmitMethod().getServiceName();
     return WorkflowGrpc.getSubmitMethod().toBuilder()
         .setFullMethodName(
             MethodDescriptor.generateFullMethodName(
-                workflowServiceFqsn, WorkflowGrpc.getSubmitMethod().getBareMethodName()))
+                workflowFqsn, WorkflowGrpc.getSubmitMethod().getBareMethodName()))
         .build();
   }
 
   public static MethodDescriptor<InvokeRequest, Empty>
       generateMethodDescriptorForWorkflowInternalStart(String workflowFqsn) {
-    String workflowServiceFqsn =
-        workflowFqsn
-            +
-            // This is simple name because our template service doesn't have a package!
-            WorkflowGrpc.getInternalStartMethod().getServiceName();
     return WorkflowGrpc.getInternalStartMethod().toBuilder()
         .setFullMethodName(
             MethodDescriptor.generateFullMethodName(
-                workflowServiceFqsn, WorkflowGrpc.getInternalStartMethod().getBareMethodName()))
+                workflowFqsn, WorkflowGrpc.getInternalStartMethod().getBareMethodName()))
         .build();
   }
 }

sdk-workflow-api/src/main/java/dev/restate/sdk/workflow/impl/WorkflowMangledDescriptors.java

@@ -18,6 +18,8 @@
 
 class WorkflowMangledDescriptors {
 
+  static final String MANAGER_SERVICE_SUFFIX = "InternalManager";
+
   private final Descriptors.FileDescriptor outputFileDescriptor;
   private final String workflowServiceFqsn;
   private final String workflowServiceSimpleName;
@@ -84,7 +86,7 @@ public static WorkflowMangledDescriptors mangle(WorkflowServicesBundle workflowS
             workflowServicesBundle.getSimpleName(),
             workflowServicesBundle.getSharedMethods());
     String workflowManagerServiceSimpleName =
-        mangleWorkflowOrchestratorDescriptor(
+        mangleWorkflowManagerDescriptor(
             protoDescriptorBuilder, workflowServicesBundle.getSimpleName());
 
     String workflowServiceFqcn =
@@ -116,13 +118,12 @@ public static WorkflowMangledDescriptors mangle(WorkflowServicesBundle workflowS
 
   private static String mangleWorkflowDescriptor(
       DescriptorProtos.FileDescriptorProto.Builder protoDescriptorBuilder,
-      String prefix,
+      String newSimpleName,
       Set<String> methods) {
     var serviceDescriptorBuilder = protoDescriptorBuilder.getServiceBuilder(0);
 
     // Prefix service name
-    String newServiceName = prefix + protoDescriptorBuilder.getService(0).getName();
-    serviceDescriptorBuilder.setName(newServiceName);
+    serviceDescriptorBuilder.setName(newSimpleName);
 
     // Unroll methods
     assert serviceDescriptorBuilder.getMethodCount() == 3;
@@ -136,13 +137,13 @@ private static String mangleWorkflowDescriptor(
     // Update original descriptor builder
     protoDescriptorBuilder.setService(0, serviceDescriptorBuilder);
 
-    return newServiceName;
+    return newSimpleName;
   }
 
-  private static String mangleWorkflowOrchestratorDescriptor(
+  private static String mangleWorkflowManagerDescriptor(
       DescriptorProtos.FileDescriptorProto.Builder protoDescriptorBuilder, String prefix) {
     // Prefix service name
-    String newServiceName = prefix + protoDescriptorBuilder.getService(1).getName();
+    String newServiceName = prefix + MANAGER_SERVICE_SUFFIX;
     protoDescriptorBuilder.setService(
         1, protoDescriptorBuilder.getServiceBuilder(1).setName(newServiceName));