Fixes from code review

Evanthx · Evanthx · commit 039abcf10dbe · 2026-04-14T16:47:19.000-07:00
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/README.md b/core/src/main/java/io/temporal/samples/nexusmessaging/README.md
@@ -9,7 +9,7 @@ operations. There are two self-contained examples, each in its own directory:
 | **Nexus service** | `NexusGreetingService` | `NexusRemoteGreetingService`                                 |
 
 Each directory is fully self-contained for clarity. The
-`GreetingWorkflow`, `GreetingWorkflowImpl`, `GreetingActivity` and `GreetingActivityImpl` classes are **identical** between the two — only the
+`GreetingWorkflow`, `GreetingWorkflowImpl`, `GreetingActivity` and `GreetingActivityImpl` classes are pretty much the same between the two — only the
 Nexus service interface and its implementation differ. This highlights that the same workflow can be
 exposed through Nexus in different ways depending on whether the caller needs lifecycle control.
 
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/README.md b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/README.md
@@ -41,19 +41,19 @@ variables or by editing the TOML file (see the `envconfig` sample for details).
 In one terminal, start the handler worker:
 
 ```bash
-./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexus_messaging.callerpattern.handler.HandlerWorker
+./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexusmessaging.callerpattern.handler.HandlerWorker
 ```
 
 In a second terminal, start the caller worker:
 
 ```bash
-./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexus_messaging.callerpattern.caller.CallerWorker
+./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexusmessaging.callerpattern.caller.CallerWorker
 ```
 
 In a third terminal, start the caller workflow:
 
 ```bash
-./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexus_messaging.callerpattern.caller.CallerStarter
+./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexusmessaging.callerpattern.caller.CallerStarter
 ```
 
 Expected output:
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/caller/CallerStarter.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/caller/CallerStarter.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.callerpattern.caller;
+package io.temporal.samples.nexusmessaging.callerpattern.caller;
 
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowOptions;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/caller/CallerWorker.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/caller/CallerWorker.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.callerpattern.caller;
+package io.temporal.samples.nexusmessaging.callerpattern.caller;
 
 import io.temporal.client.WorkflowClient;
 import io.temporal.envconfig.ClientConfigProfile;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/caller/CallerWorkflow.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/caller/CallerWorkflow.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.callerpattern.caller;
+package io.temporal.samples.nexusmessaging.callerpattern.caller;
 
 import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/caller/CallerWorkflowImpl.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/caller/CallerWorkflowImpl.java
@@ -1,8 +1,8 @@
-package io.temporal.samples.nexus_messaging.callerpattern.caller;
+package io.temporal.samples.nexusmessaging.callerpattern.caller;
 
 import io.temporal.failure.ApplicationFailure;
-import io.temporal.samples.nexus_messaging.callerpattern.service.Language;
-import io.temporal.samples.nexus_messaging.callerpattern.service.NexusGreetingService;
+import io.temporal.samples.nexusmessaging.callerpattern.service.Language;
+import io.temporal.samples.nexusmessaging.callerpattern.service.NexusGreetingService;
 import io.temporal.workflow.NexusOperationOptions;
 import io.temporal.workflow.NexusServiceOptions;
 import io.temporal.workflow.Workflow;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/GreetingActivity.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/GreetingActivity.java
@@ -1,8 +1,8 @@
-package io.temporal.samples.nexus_messaging.callerpattern.handler;
+package io.temporal.samples.nexusmessaging.callerpattern.handler;
 
 import io.temporal.activity.ActivityInterface;
 import io.temporal.activity.ActivityMethod;
-import io.temporal.samples.nexus_messaging.callerpattern.service.Language;
+import io.temporal.samples.nexusmessaging.callerpattern.service.Language;
 
 @ActivityInterface
 public interface GreetingActivity {
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/GreetingActivityImpl.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/GreetingActivityImpl.java
@@ -1,6 +1,6 @@
-package io.temporal.samples.nexus_messaging.callerpattern.handler;
+package io.temporal.samples.nexusmessaging.callerpattern.handler;
 
-import io.temporal.samples.nexus_messaging.callerpattern.service.Language;
+import io.temporal.samples.nexusmessaging.callerpattern.service.Language;
 import java.util.EnumMap;
 import java.util.Map;
 
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/GreetingWorkflow.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/GreetingWorkflow.java
@@ -1,7 +1,7 @@
-package io.temporal.samples.nexus_messaging.callerpattern.handler;
+package io.temporal.samples.nexusmessaging.callerpattern.handler;
 
-import io.temporal.samples.nexus_messaging.callerpattern.service.Language;
-import io.temporal.samples.nexus_messaging.callerpattern.service.NexusGreetingService;
+import io.temporal.samples.nexusmessaging.callerpattern.service.Language;
+import io.temporal.samples.nexusmessaging.callerpattern.service.NexusGreetingService;
 import io.temporal.workflow.QueryMethod;
 import io.temporal.workflow.SignalMethod;
 import io.temporal.workflow.UpdateMethod;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/GreetingWorkflowImpl.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/GreetingWorkflowImpl.java
@@ -1,9 +1,9 @@
-package io.temporal.samples.nexus_messaging.callerpattern.handler;
+package io.temporal.samples.nexusmessaging.callerpattern.handler;
 
 import io.temporal.activity.ActivityOptions;
 import io.temporal.failure.ApplicationFailure;
-import io.temporal.samples.nexus_messaging.callerpattern.service.Language;
-import io.temporal.samples.nexus_messaging.callerpattern.service.NexusGreetingService;
+import io.temporal.samples.nexusmessaging.callerpattern.service.Language;
+import io.temporal.samples.nexusmessaging.callerpattern.service.NexusGreetingService;
 import io.temporal.workflow.Workflow;
 import java.time.Duration;
 import java.util.ArrayList;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/HandlerWorker.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/HandlerWorker.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.callerpattern.handler;
+package io.temporal.samples.nexusmessaging.callerpattern.handler;
 
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowExecutionAlreadyStarted;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/NexusGreetingServiceImpl.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/handler/NexusGreetingServiceImpl.java
@@ -1,11 +1,11 @@
-package io.temporal.samples.nexus_messaging.callerpattern.handler;
+package io.temporal.samples.nexusmessaging.callerpattern.handler;
 
 import io.nexusrpc.handler.OperationHandler;
 import io.nexusrpc.handler.OperationImpl;
 import io.nexusrpc.handler.ServiceImpl;
 import io.temporal.nexus.Nexus;
-import io.temporal.samples.nexus_messaging.callerpattern.service.Language;
-import io.temporal.samples.nexus_messaging.callerpattern.service.NexusGreetingService;
+import io.temporal.samples.nexusmessaging.callerpattern.service.Language;
+import io.temporal.samples.nexusmessaging.callerpattern.service.NexusGreetingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,7 +24,7 @@ public class NexusGreetingServiceImpl {
   // This example assumes you might have multiple workflows, one for each user.
   // If you had a single workflow for all users, then you could remove the
   // getWorkflowId method, remove the user ID from each input, and just
-  // use the single worflow ID in the getWorkflowStub method below.
+  // use the single workflow ID in the getWorkflowStub method below.
   public static String getWorkflowId(String userId) {
     return WORKFLOW_ID_PREFIX + userId;
   }
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/service/Language.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/service/Language.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.callerpattern.service;
+package io.temporal.samples.nexusmessaging.callerpattern.service;
 
 public enum Language {
   ARABIC,
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/service/NexusGreetingService.java b/core/src/main/java/io/temporal/samples/nexusmessaging/callerpattern/service/NexusGreetingService.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.callerpattern.service;
+package io.temporal.samples.nexusmessaging.callerpattern.service;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/README.md b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/README.md
@@ -41,19 +41,19 @@ variables or by editing the TOML file (see the `envconfig` sample for details).
 In one terminal, start the handler worker:
 
 ```bash
-./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexus_messaging.ondemandpattern.handler.HandlerWorker
+./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexusmessaging.ondemandpattern.handler.HandlerWorker
 ```
 
 In a second terminal, start the caller worker:
 
 ```bash
-./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexus_messaging.ondemandpattern.caller.CallerRemoteWorker
+./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexusmessaging.ondemandpattern.caller.CallerRemoteWorker
 ```
 
 In a third terminal, start the caller workflow:
 
 ```bash
-./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexus_messaging.ondemandpattern.caller.CallerRemoteStarter
+./gradlew -q :core:execute -PmainClass=io.temporal.samples.nexusmessaging.ondemandpattern.caller.CallerRemoteStarter
 ```
 
 Expected output:
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/caller/CallerRemoteStarter.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/caller/CallerRemoteStarter.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.caller;
+package io.temporal.samples.nexusmessaging.ondemandpattern.caller;
 
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowOptions;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/caller/CallerRemoteWorker.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/caller/CallerRemoteWorker.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.caller;
+package io.temporal.samples.nexusmessaging.ondemandpattern.caller;
 
 import io.temporal.client.WorkflowClient;
 import io.temporal.envconfig.ClientConfigProfile;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/caller/CallerRemoteWorkflow.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/caller/CallerRemoteWorkflow.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.caller;
+package io.temporal.samples.nexusmessaging.ondemandpattern.caller;
 
 import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/caller/CallerRemoteWorkflowImpl.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/caller/CallerRemoteWorkflowImpl.java
@@ -1,7 +1,7 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.caller;
+package io.temporal.samples.nexusmessaging.ondemandpattern.caller;
 
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.Language;
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.NexusRemoteGreetingService;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.Language;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.NexusRemoteGreetingService;
 import io.temporal.workflow.NexusOperationHandle;
 import io.temporal.workflow.NexusOperationOptions;
 import io.temporal.workflow.NexusServiceOptions;
@@ -18,7 +18,6 @@ public class CallerRemoteWorkflowImpl implements CallerRemoteWorkflow {
   // This is going to create two workflows and send messages to them.
   // We need to have an ID to differentiate so that Nexus knows how to name
   // a workflow and then how to know the correct destination workflow.
-  // So here we are just going to define two workflow IDs with different user IDs.
   private static final String REMOTE_WORKFLOW_ONE = "UserId One";
   private static final String REMOTE_WORKFLOW_TWO = "UserId Two";
 
@@ -69,7 +68,7 @@ public List<String> run() {
 
     NexusOperationHandle<String> handleTwo =
         Workflow.startNexusOperation(
-            greetingRemoteServiceOne::runFromRemote,
+            greetingRemoteServiceTwo::runFromRemote,
             new NexusRemoteGreetingService.RunFromRemoteInput(REMOTE_WORKFLOW_TWO));
     // Wait for the operation to be started (workflow is now running on the handler).
     handleTwo.getExecution().get();
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/GreetingActivity.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/GreetingActivity.java
@@ -1,8 +1,8 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.handler;
+package io.temporal.samples.nexusmessaging.ondemandpattern.handler;
 
 import io.temporal.activity.ActivityInterface;
 import io.temporal.activity.ActivityMethod;
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.Language;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.Language;
 
 @ActivityInterface
 public interface GreetingActivity {
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/GreetingActivityImpl.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/GreetingActivityImpl.java
@@ -1,6 +1,6 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.handler;
+package io.temporal.samples.nexusmessaging.ondemandpattern.handler;
 
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.Language;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.Language;
 import java.util.EnumMap;
 import java.util.Map;
 
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/GreetingWorkflow.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/GreetingWorkflow.java
@@ -1,9 +1,9 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.handler;
+package io.temporal.samples.nexusmessaging.ondemandpattern.handler;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.Language;
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.NexusRemoteGreetingService;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.Language;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.NexusRemoteGreetingService;
 import io.temporal.workflow.QueryMethod;
 import io.temporal.workflow.SignalMethod;
 import io.temporal.workflow.UpdateMethod;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/GreetingWorkflowImpl.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/GreetingWorkflowImpl.java
@@ -1,9 +1,9 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.handler;
+package io.temporal.samples.nexusmessaging.ondemandpattern.handler;
 
 import io.temporal.activity.ActivityOptions;
 import io.temporal.failure.ApplicationFailure;
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.Language;
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.NexusRemoteGreetingService;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.Language;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.NexusRemoteGreetingService;
 import io.temporal.workflow.Workflow;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -16,13 +16,11 @@
 
 public class GreetingWorkflowImpl implements GreetingWorkflow {
 
-  private static final Logger logger1 = Workflow.getLogger(GreetingWorkflowImpl.class);
+  private static final Logger logger = Workflow.getLogger(GreetingWorkflowImpl.class);
   private boolean approvedForRelease = false;
   private final Map<Language, String> greetings = new EnumMap<>(Language.class);
   private Language language = Language.ENGLISH;
 
-  private static final Logger logger = logger1;
-
   private final GreetingActivity greetingActivity =
       Workflow.newActivityStub(
           GreetingActivity.class,
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/HandlerWorker.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/HandlerWorker.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.handler;
+package io.temporal.samples.nexusmessaging.ondemandpattern.handler;
 
 import io.temporal.client.WorkflowClient;
 import io.temporal.envconfig.ClientConfigProfile;
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/NexusRemoteGreetingServiceImpl.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/handler/NexusRemoteGreetingServiceImpl.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.handler;
+package io.temporal.samples.nexusmessaging.ondemandpattern.handler;
 
 import io.nexusrpc.handler.OperationHandler;
 import io.nexusrpc.handler.OperationImpl;
@@ -7,8 +7,8 @@
 import io.temporal.nexus.Nexus;
 import io.temporal.nexus.WorkflowHandle;
 import io.temporal.nexus.WorkflowRunOperation;
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.Language;
-import io.temporal.samples.nexus_messaging.ondemandpattern.service.NexusRemoteGreetingService;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.Language;
+import io.temporal.samples.nexusmessaging.ondemandpattern.service.NexusRemoteGreetingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,7 +27,7 @@ public class NexusRemoteGreetingServiceImpl {
   // This example assumes you might have multiple workflows, one for each user.
   // If you had a single workflow for all users, then you could remove the
   // getWorkflowId method, remove the user ID from each input, and just
-  // use the single worflow ID in the getWorkflowStub method below.
+  // use the single workflow ID in the getWorkflowStub method below.
   public static String getWorkflowId(String userId) {
     return WORKFLOW_ID_PREFIX + userId;
   }
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/service/Language.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/service/Language.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.service;
+package io.temporal.samples.nexusmessaging.ondemandpattern.service;
 
 public enum Language {
   ARABIC,
diff --git a/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/service/NexusRemoteGreetingService.java b/core/src/main/java/io/temporal/samples/nexusmessaging/ondemandpattern/service/NexusRemoteGreetingService.java
@@ -1,4 +1,4 @@
-package io.temporal.samples.nexus_messaging.ondemandpattern.service;
+package io.temporal.samples.nexusmessaging.ondemandpattern.service;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.temporal.samples.nexus_messaging.callerpattern.caller;`
	`1`	`+package io.temporal.samples.nexusmessaging.callerpattern.caller;`
`2`	`2`
`3`	`3`	`import io.temporal.client.WorkflowClient;`
`4`	`4`	`import io.temporal.client.WorkflowOptions;`