fix Cassie's suggestions

Signed-off-by: salaboy <[email protected]>

Author: salaboy

spring-boot-examples/workflows/multi-app/README.md

@@ -1,15 +1,15 @@
 # Multi App workflow Example
 
-This example demonstrate how you can create distributed workflows where the orchestrator doesn't host the workflow activities.
+This example demonstrates how you can create distributed workflows where the orchestrator doesn't host the workflow activities.
 
 For more documentation about how Multi App Workflows work [check the official documentation here](https://v1-16.docs.dapr.io/developing-applications/building-blocks/workflow/workflow-multi-app/).
 
 This example is composed by three Spring Boot applications: 
 - `orchestrator`: The `orchestrator` app contains the Dapr Workflow definition and expose REST endpoints to create and raise events against workflow instances.
-- `worker-one`: The `worker-one` app contains the `RegisterCustomerActivity` definition, which will be orchstrated by the `orchestrator` app.
-- `worker-two`: The `worker-two` app contains the `CustomerFollowupActivity` definition, which will be orchstrated by the `orchestrator` app.
+- `worker-one`: The `worker-one` app contains the `RegisterCustomerActivity` definition, which will be called by the `orchestrator` app.
+- `worker-two`: The `worker-two` app contains the `CustomerFollowupActivity` definition, which will be called by the `orchestrator` app.
 
-To start the applications you need to run the following commands on separate terminals, starting from the `remote-activities` directory. 
+To start the applications you need to run the following commands on separate terminals, starting from the `multi-app` directory. 
 To start the `orchestrator` app run: 
 ```bash
 cd orchestrator/
@@ -89,11 +89,3 @@ This test interact with the application REST endpoints to validate their correct
 But the magic behind the test can be located in the [`DaprTestContainersConfig.class`](orchestrator/src/test/java/io/dapr/springboot/examples/orchestrator/DaprTestContainersConfig.java) which defines the configuration for 
 all the Dapr containers and the `worker-one` and `worker-two` applications. Check this class to gain a deeper understand how to configure 
 multiple Dapr-enabled applications. 
-
-
-
-
-
-
-
-  

spring-boot-examples/workflows/multi-app/orchestrator/src/main/java/io/dapr/springboot/examples/orchestrator/CustomersRestController.java

@@ -106,7 +106,5 @@ public Customer getCustomerOutput(@RequestBody Customer customer) {
     return instanceState.readOutputAs(Customer.class);
   }
 
-
-
 }
 

spring-boot-examples/workflows/multi-app/orchestrator/src/test/java/io/dapr/springboot/examples/orchestrator/DaprTestContainersConfig.java

@@ -116,20 +116,21 @@ public DaprContainer workerOneDapr(Network daprNetwork, RedisContainer redisCont
             .dependsOn(daprSchedulerContainer)
             .dependsOn(redisContainer);
   }
+
   @Bean
   @ConditionalOnProperty(prefix = "tests", name = "workers.enabled", havingValue = "true")
   public GenericContainer<?> workerOneContainer(Network daprNetwork,
                                                 @Qualifier("workerOneDapr") DaprContainer workerOneDapr,
                                                 DaprPlacementContainer daprPlacementContainer,
                                                 DaprSchedulerContainer daprSchedulerContainer){
     return new GenericContainer<>("openjdk:17-jdk-slim")
-            .withCopyFileToContainer(MountableFile.forHostPath("../worker-one/target"), "/app")
+            .withCopyFileToContainer(MountableFile.forHostPath("../worker-one/target/*.jar"), "/app/worker-one.jar")
             .withWorkingDirectory("/app")
             .withCommand("java",
                     "-Ddapr.grpc.endpoint=worker-one:50001",
                     "-Ddapr.http.endpoint=worker-one:3500",
                     "-jar",
-                    "worker-one-1.17.0-SNAPSHOT.jar")
+                    "worker-one.jar")
             .withNetwork(daprNetwork)
             .dependsOn(workerOneDapr)
             .dependsOn(daprPlacementContainer)
@@ -171,7 +172,7 @@ public GenericContainer<?> workerTwoContainer(Network daprNetwork,
                     "-Ddapr.grpc.endpoint=worker-two:50001",
                     "-Ddapr.http.endpoint=worker-two:3500",
                     "-jar",
-                    "worker-two-1.17.0-SNAPSHOT.jar")
+                    "worker-two.jar")
             .withNetwork(daprNetwork)
             .dependsOn(workerTwoDapr)
             .dependsOn(daprPlacementContainer)
@@ -180,7 +181,6 @@ public GenericContainer<?> workerTwoContainer(Network daprNetwork,
             .withLogConsumer(outputFrame -> System.out.println("WorkerTwoApplication: " + outputFrame.getUtf8String()));
   }
 
-
   @Bean
   public RedisContainer redisContainer(Network daprNetwork, Environment env){
     boolean reuse = env.getProperty("reuse", Boolean.class, false);
@@ -211,6 +211,4 @@ public DaprContainer daprContainer(Network daprNetwork, RedisContainer redisCont
             .dependsOn(redisContainer);
   }
 
-
-
 }

spring-boot-examples/workflows/multi-app/worker-one/pom.xml

@@ -53,6 +53,9 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <finalName>worker-one</finalName>
+        </configuration>
         <executions>
           <execution>
             <goals>

spring-boot-examples/workflows/multi-app/worker-one/src/test/java/io/dapr/springboot/examples/workerone/DaprTestContainersConfig.java

@@ -35,7 +35,6 @@
 @TestConfiguration(proxyBeanMethods = false)
 public class DaprTestContainersConfig {
 
-
   @Bean
   public Network getDaprNetwork(Environment env) {
     boolean reuse = env.getProperty("reuse", Boolean.class, false);
@@ -70,7 +69,6 @@ public Statement apply(Statement base, Description description) {
     }
   }
 
-
   @Bean
   public RedisContainer redisContainer(Network daprNetwork, Environment env){
     boolean reuse = env.getProperty("reuse", Boolean.class, false);
@@ -101,8 +99,4 @@ public DaprContainer daprContainer(Network daprNetwork, RedisContainer redisCont
             .dependsOn(redisContainer);
   }
 
-
-
-
-
 }

spring-boot-examples/workflows/multi-app/worker-two/pom.xml

@@ -53,6 +53,9 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <finalName>worker-two</finalName>
+        </configuration>
         <executions>
           <execution>
             <goals>

spring-boot-examples/workflows/multi-app/worker-two/src/test/java/io/dapr/springboot/examples/workertwo/DaprTestContainersConfig.java

@@ -87,7 +87,6 @@ public DaprContainer daprContainer(Network daprNetwork, RedisContainer redisCont
     redisProps.put("redisPassword", "");
     redisProps.put("actorStateStore", String.valueOf(true));
 
-
     return new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
             .withAppName("worker-two")
             .withNetwork(daprNetwork)