refactor

Author: Quinn-With-Two-Ns

README.md

@@ -105,6 +105,8 @@ See the README.md file in each main sample directory for cut/paste Gradle comman
 
 - [**Safe Message Passing**](/core/src/main/java/io/temporal/samples/safemessagepassing): Safely handling concurrent updates and signals messages.
 
+- [**Custom Annotation**](/core/src/main/java/io/temporal/samples/customannotation): Demonstrates how to create a custom annotation using an interceptor.
+
 #### API demonstrations
 
 - [**Async Untyped Child Workflow**](/core/src/main/java/io/temporal/samples/asyncuntypedchild): Demonstrates how to invoke an untyped child workflow async, that can complete after parent workflow is already completed.

build.gradle

@@ -26,7 +26,7 @@ subprojects {
     ext {
         otelVersion = '1.30.1'
         otelVersionAlpha = "${otelVersion}-alpha"
-        javaSDKVersion = '1.30.0'
+        javaSDKVersion = '1.30.1'
         camelVersion = '3.22.1'
         jarVersion = '1.0.0'
     }

core/src/main/java/io/temporal/samples/customannotation/BenignExceptionTypes.java

@@ -4,7 +4,7 @@
 
 /**
  * BenignExceptionTypes is an annotation that can be used to specify an exception type is benign and
- * not a issue worth logging.
+ * not an issue worth logging.
  *
  * <p>For this annotation to work, {@link BenignExceptionTypesAnnotationInterceptor} must be passed
  * as a worker interceptor to the worker factory.

core/src/main/java/io/temporal/samples/customannotation/BenignExceptionTypesAnnotationInterceptor.java

@@ -59,7 +59,6 @@ public void init(ActivityExecutionContext context) {
       List<POJOActivityMethodMetadata> activityMethods =
           POJOActivityImplMetadata.newInstance(context.getInstance().getClass())
               .getActivityMethods();
-      // TODO: handle dynamic activity types
       POJOActivityMethodMetadata currentActivityMethod =
           activityMethods.stream()
               .filter(x -> x.getActivityTypeName().equals(context.getInfo().getActivityType()))

core/src/main/java/io/temporal/samples/customannotation/CustomAnnotation.java

@@ -24,7 +24,6 @@
 import io.temporal.activity.ActivityOptions;
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowOptions;
-import io.temporal.common.RetryOptions;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.worker.Worker;
 import io.temporal.worker.WorkerFactory;
@@ -88,29 +87,11 @@ public static class GreetingWorkflowImpl implements GreetingWorkflow {
      * are executed outside of the workflow thread on the activity worker, that can be on a
      * different host. Temporal is going to dispatch the activity results back to the workflow and
      * unblock the stub as soon as activity is completed on the activity worker.
-     *
-     * <p>In the {@link ActivityOptions} definition the "setStartToCloseTimeout" option sets the
-     * maximum time of a single Activity execution attempt. For this example it is set to 10
-     * seconds.
-     *
-     * <p>In the {@link ActivityOptions} definition the "setInitialInterval" option sets the
-     * interval of the first retry. It is set to 1 second. The "setDoNotRetry" option is a list of
-     * application failures for which retries should not be performed.
-     *
-     * <p>By default the maximum number of retry attempts is set to "unlimited" however you can
-     * change it by adding the "setMaximumAttempts" option to the retry options.
      */
     private final GreetingActivities activities =
         Workflow.newActivityStub(
             GreetingActivities.class,
-            ActivityOptions.newBuilder()
-                .setStartToCloseTimeout(Duration.ofSeconds(10))
-                .setRetryOptions(
-                    RetryOptions.newBuilder()
-                        .setInitialInterval(Duration.ofSeconds(1))
-                        .setDoNotRetry(IllegalArgumentException.class.getName())
-                        .build())
-                .build());
+            ActivityOptions.newBuilder().setStartToCloseTimeout(Duration.ofSeconds(10)).build());
 
     @Override
     public String getGreeting(String name) {
@@ -125,7 +106,6 @@ public String getGreeting(String name) {
    */
   static class GreetingActivitiesImpl implements GreetingActivities {
     private int callCount;
-    private long lastInvocationTime;
 
     /**
      * Our activity implementation simulates a failure 3 times. Given our previously set
@@ -134,18 +114,8 @@ static class GreetingActivitiesImpl implements GreetingActivities {
     @Override
     @BenignExceptionTypes({IllegalStateException.class})
     public synchronized String composeGreeting(String greeting, String name) {
-      if (lastInvocationTime != 0) {
-        long timeSinceLastInvocation = System.currentTimeMillis() - lastInvocationTime;
-        System.out.print(timeSinceLastInvocation + " milliseconds since last invocation. ");
-      }
-      lastInvocationTime = System.currentTimeMillis();
       if (++callCount < 4) {
         System.out.println("composeGreeting activity is going to fail");
-
-        /*
-         * We throw IllegalStateException here. It is not in the list of "do not retry" exceptions
-         * set in our RetryOptions, so a workflow retry is going to be issued
-         */
         throw new IllegalStateException("not yet");
       }
 

core/src/main/java/io/temporal/samples/customannotation/README.md

@@ -1,6 +1,8 @@
 # Custom annotation
 
-The sample demonstrates how to create a custom annotation using an interceptor. In this case the annotation allows specifying a fixed next retry delay for a certain failure type.
+The sample demonstrates how to create a custom annotation using an interceptor. In this case the annotation allows specifying an exception of a certain type is benign.
+
+This samples shows a custom annotation on an activity method, but the same approach can be used for workflow methods or Nexus operations.
 
 ```bash
 ./gradlew -q execute -PmainClass=io.temporal.samples.customannotation.CustomAnnotation