Merge upstream

Author: psevestre

saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/flakyhello/FlakyHelloWorkflowImpl.java

@@ -4,7 +4,7 @@
 import com.baeldung.temporal.workflows.hello.activities.SayHelloActivityImpl;
 import io.temporal.worker.Worker;
 
-public class SayHelloWorker implements TemporalWorker {
+public class HelloWorker implements TemporalWorker {
 
     private Worker worker;
 

saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/flakyhello/FlakySayHelloWorker.java

@@ -0,0 +1,18 @@
+package com.baeldung.temporal.workflows.hellov2;
+
+import com.baeldung.temporal.worker.TemporalWorker;
+import com.baeldung.temporal.workflows.hellov2.activities.HelloV2ActivitiesImpl;
+import io.temporal.worker.Worker;
+
+public class HelloV2Worker implements TemporalWorker {
+
+    private Worker worker;
+
+    @Override
+    public void init(Worker worker) {
+        this.worker = worker;
+        worker.registerWorkflowImplementationTypes(HelloWorkflowV2Impl.class);
+        worker.registerActivitiesImplementations(new HelloV2ActivitiesImpl());
+    }
+
+}

saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/flakyhello/activities/FlakySayHelloActivityImpl.java

@@ -1,12 +1,10 @@
-package com.baeldung.temporal.workflows.flakyhello;
+package com.baeldung.temporal.workflows.hellov2;
 
 import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
 
 @WorkflowInterface
-public interface FlakyHelloWorkflow {
-
+public interface HelloWorkflowV2 {
     @WorkflowMethod
     String hello(String person);
-
 }

…oral/workflows/hello/SayHelloWorker.java …emporal/workflows/hello/HelloWorker.javasaas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/hello/SayHelloWorker.java renamed to saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/hello/HelloWorker.java saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/hello/SayHelloWorker.java renamed to saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/hello/HelloWorker.java

@@ -0,0 +1,45 @@
+package com.baeldung.temporal.workflows.hellov2;
+
+import com.baeldung.temporal.workflows.hellov2.activities.HelloV2Activities;
+import io.temporal.activity.ActivityOptions;
+import io.temporal.common.RetryOptions;
+import io.temporal.workflow.Workflow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.Duration;
+
+public class HelloWorkflowV2Impl implements HelloWorkflowV2 {
+
+    private static final Logger log = LoggerFactory.getLogger(HelloWorkflowV2Impl.class);
+
+
+    private final HelloV2Activities activity = Workflow.newActivityStub(
+      HelloV2Activities.class,
+      ActivityOptions.newBuilder()
+        .setStartToCloseTimeout(Duration.ofSeconds(10))
+        .setRetryOptions(RetryOptions.newBuilder()
+          .setMaximumAttempts(3)
+          .setInitialInterval(Duration.ofSeconds(1))
+          .build())
+        .build()
+    );
+
+
+    @Override
+    public String hello(String person) {
+
+        var info = Workflow.getInfo();
+
+        log.info("Running workflow for person {}: id={}, attempt={}",
+          person,
+          info.getWorkflowId(),
+          info.getAttempt());
+
+        var step1result = activity.sayHello(person);
+        var step2result = activity.sayGoodbye(person);
+
+        return "Workflow OK";
+    }
+
+}

saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/hellov2/HelloV2Worker.java

@@ -1,10 +1,11 @@
-package com.baeldung.temporal.workflows.flakyhello.activities;
+package com.baeldung.temporal.workflows.hellov2.activities;
 
 import io.temporal.activity.ActivityInterface;
 import io.temporal.activity.ActivityMethod;
 
 @ActivityInterface
-public interface FlakySayHelloActivity {
+public interface HelloV2Activities {
     @ActivityMethod
     String sayHello(String person);
+    String sayGoodbye(String person);
 }

…flows/flakyhello/FlakyHelloWorkflow.java …l/workflows/hellov2/HelloWorkflowV2.javasaas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/flakyhello/FlakyHelloWorkflow.java renamed to saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/hellov2/HelloWorkflowV2.java saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/flakyhello/FlakyHelloWorkflow.java renamed to saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/hellov2/HelloWorkflowV2.java

@@ -0,0 +1,38 @@
+package com.baeldung.temporal.workflows.hellov2.activities;
+
+import io.temporal.activity.Activity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+public class HelloV2ActivitiesImpl implements HelloV2Activities {
+    private static final Logger log = LoggerFactory.getLogger(HelloV2ActivitiesImpl.class);
+
+    @Override
+    public String sayHello(String person) {
+        var info = Activity.getExecutionContext().getInfo();
+
+        log.info("Saying hello to {}, workflowId={}, attempt={}", person,
+          info.getWorkflowId(),
+          info.getAttempt());
+        return "Step1 - OK";
+    }
+
+    @Override
+    public String sayGoodbye(String person) {
+
+        var info = Activity.getExecutionContext().getInfo();
+
+        log.info("Saying goodbye to {}, workflowId={}, attempt={}", person,
+          info.getWorkflowId(),
+          info.getAttempt());
+
+        if ( info.getAttempt() == 1 ) {
+            throw new IllegalStateException("Simulating task failure");
+        }
+        else {
+            return "Step2 - OK";
+        }
+    }
+}

saas-modules/temporal/src/main/java/com/baeldung/temporal/workflows/hellov2/HelloWorkflowV2Impl.java

@@ -1,14 +1,16 @@
 package com.baeldung.temporal;
 
-import com.baeldung.temporal.worker.TemporalWorker;
 import com.baeldung.temporal.workflows.hello.HelloWorkflow;
-import com.baeldung.temporal.workflows.hello.SayHelloWorker;
+import com.baeldung.temporal.workflows.hello.HelloWorker;
+import com.baeldung.temporal.workflows.hellov2.HelloV2Worker;
+import com.baeldung.temporal.workflows.hellov2.HelloWorkflowV2;
 import io.temporal.client.WorkflowClient;
 import io.temporal.client.WorkflowOptions;
+import io.temporal.common.VersioningBehavior;
+import io.temporal.common.WorkerDeploymentVersion;
 import io.temporal.serviceclient.WorkflowServiceStubs;
-import io.temporal.worker.Worker;
-import io.temporal.worker.WorkerFactory;
-import io.temporal.worker.WorkerFactoryOptions;
+import io.temporal.worker.*;
+import io.temporal.workflow.Workflow;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -19,34 +21,31 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-class SayHelloWorkerIntegrationTest {
-    private final Logger log = LoggerFactory.getLogger(SayHelloWorkerIntegrationTest.class);
+class Hello2WorkerIntegrationTest {
+    private static final String QUEUE_NAME = "say-hello-queue";
+    private static final Logger log = LoggerFactory.getLogger(Hello2WorkerIntegrationTest.class);
 
     private WorkerFactory factory;
 
-    private static final String QUEUE_NAME = "say-hello-queue";
-
     @BeforeEach
     public void startWorker() {
 
         log.info("Creating worker...");
         WorkflowServiceStubs service = WorkflowServiceStubs.newLocalServiceStubs();
         WorkflowClient client = WorkflowClient.newInstance(service);
-        this.factory = WorkerFactory.newInstance(client,
-          WorkerFactoryOptions.newBuilder()
-            .setUsingVirtualWorkflowThreads(true)
-            .build());
+        this.factory = WorkerFactory.newInstance(client);
 
-        Worker worker = factory.newWorker(QUEUE_NAME);
+        var workerOptions = WorkerOptions.newBuilder()
+          .setUsingVirtualThreads(true)
+          .build();
+        Worker worker = factory.newWorker(QUEUE_NAME,workerOptions);
 
-        var sayHelloWorker = new SayHelloWorker();
-        sayHelloWorker.init(worker);
+        var helloV2Worker = new HelloV2Worker();
+        helloV2Worker.init(worker);
 
         log.info("Starting worker...");
         factory.start();
-
         log.info("Worker started.");
-
     }
 
     @AfterEach
@@ -56,8 +55,6 @@ public void stopWorker() {
         log.info("Worker stopped.");
     }
 
-
-
     @Test
     void givenPerson_whenSayHello_thenSuccess() {
 
@@ -67,15 +64,25 @@ void givenPerson_whenSayHello_thenSuccess() {
         var wfid = UUID.randomUUID().toString();
 
         var workflow = client.newWorkflowStub(
-          HelloWorkflow.class,
+          HelloWorkflowV2.class,
           WorkflowOptions.newBuilder()
             .setTaskQueue(QUEUE_NAME)
             .setWorkflowId(wfid)
             .build()
         );
 
-        String result = workflow.hello("Baeldung");
-        assertEquals("Hello, Baeldung", result);
+
+        // Invoke workflow asynchronously.
+        var execution = WorkflowClient.start(workflow::hello,"Baeldung");
+        log.info("Workflow started: id={}, runId={}",
+          execution.getWorkflowId(),
+          execution.getRunId());
+
+        // Create a blocking workflow using the execution's workflow id
+        var syncWorkflow = client.newWorkflowStub(HelloWorkflowV2.class,execution.getWorkflowId());
+
+        // The sync workflow stub will block until it completes. Notice that the call argument here is ignored!
+        assertEquals("Workflow OK", syncWorkflow.hello("ignored"));
 
     }