Merge branch 'main' into devhawk/dynamic-queues

Author: devhawk

transact/src/main/java/dev/dbos/transact/execution/DBOSExecutor.java

@@ -1178,6 +1178,14 @@ private <T, E extends Exception> T runStepInternal(
 
   // Workflow Execution Methods
 
+  // helper method to validate that @Workflow methods are not invoked from the startWorkflow lambda
+  public void validateNonWorkflowInvocation() {
+    var hook = hookHolder.get();
+    if (hook != null) {
+      throw new RuntimeException("Only @Workflow functions may run in this context");
+    }
+  }
+
   // execute a workflow via a proxy
   public Object runWorkflow(
       Object target, String instanceName, Method method, Object[] args, Workflow wfTag)

transact/src/main/java/dev/dbos/transact/internal/DBOSInvocationHandler.java

@@ -57,15 +57,18 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Exceptio
     var implMethod = target.getClass().getMethod(method.getName(), method.getParameterTypes());
     implMethod.setAccessible(true);
 
+    var executor = executor();
     var wfTag = implMethod.getAnnotation(Workflow.class);
     if (wfTag != null) {
-      return executor().runWorkflow(target, instanceName, implMethod, args, wfTag);
+      return executor.runWorkflow(target, instanceName, implMethod, args, wfTag);
     }
 
+    executor.validateNonWorkflowInvocation();
+
     var stepTag = implMethod.getAnnotation(Step.class);
     if (stepTag != null) {
       var options = StepOptions.create(stepTag, method);
-      return executor().runStep(() -> implMethod.invoke(target, args), options, null);
+      return executor.runStep(() -> implMethod.invoke(target, args), options, null);
     }
 
     return method.invoke(target, args);