fixing small issues and updating to 1.15.0

salaboy · salaboy · commit 0d4112d97611 · 2025-08-18T10:56:58.000+01:00
diff --git a/bindings/java/sdk/batch/pom.xml b/bindings/java/sdk/batch/pom.xml
@@ -28,12 +28,12 @@
 		<dependency>
 			<groupId>io.dapr</groupId>
 			<artifactId>dapr-sdk-springboot</artifactId>
-			<version>1.14.1</version>
+			<version>1.15.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.dapr</groupId>
 			<artifactId>dapr-sdk</artifactId>
-			<version>1.14.1</version>
+			<version>1.15.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/configuration/java/sdk/order-processor/pom.xml b/configuration/java/sdk/order-processor/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>io.dapr</groupId>
             <artifactId>dapr-sdk</artifactId>
-            <version>1.14.1</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
diff --git a/pub_sub/java/sdk/checkout/pom.xml b/pub_sub/java/sdk/checkout/pom.xml
@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>io.dapr</groupId>
 			<artifactId>dapr-sdk</artifactId>
-			<version>1.14.1</version>
+			<version>1.15.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
diff --git a/pub_sub/java/sdk/order-processor/pom.xml b/pub_sub/java/sdk/order-processor/pom.xml
@@ -24,12 +24,12 @@
 		<dependency>
 			<groupId>io.dapr</groupId>
 			<artifactId>dapr-sdk-springboot</artifactId>
-			<version>1.14.1</version>
+			<version>1.15.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.dapr</groupId>
 			<artifactId>dapr-sdk</artifactId>
-			<version>1.14.1</version>
+			<version>1.15.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/secrets_management/java/sdk/order-processor/pom.xml b/secrets_management/java/sdk/order-processor/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.dapr</groupId>
             <artifactId>dapr-sdk</artifactId>
-            <version>1.14.1</version>
+            <version>1.15.0</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/state_management/java/sdk/order-processor/pom.xml b/state_management/java/sdk/order-processor/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>io.dapr</groupId>
             <artifactId>dapr-sdk</artifactId>
-            <version>1.14.1</version>
+            <version>1.15.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
diff --git a/tutorials/workflow/java/combined-patterns/order-workflow.http b/tutorials/workflow/java/combined-patterns/order-workflow.http
diff --git a/tutorials/workflow/java/combined-patterns/shipping-app/src/test/java/io/dapr/springboot/examples/DaprTestContainersConfig.java b/tutorials/workflow/java/combined-patterns/shipping-app/src/test/java/io/dapr/springboot/examples/DaprTestContainersConfig.java
@@ -105,7 +105,4 @@ public Statement apply(Statement base, Description description) {
     }
   }
 
-
- 
-
 }
diff --git a/tutorials/workflow/java/combined-patterns/workflow-app/src/main/java/io/dapr/springboot/workflowapp/WorkflowAppRestController.java b/tutorials/workflow/java/combined-patterns/workflow-app/src/main/java/io/dapr/springboot/workflowapp/WorkflowAppRestController.java
@@ -50,6 +50,7 @@ public class WorkflowAppRestController {
   public static final String DAPR_PUBSUB_COMPONENT = "shippingpubsub";
   public static final String DAPR_PUBSUB_REGISTRATION_TOPIC = "shipment-registration-events";
   public static final String SHIPMENT_REGISTERED_EVENT = "shipment-registered-event";
+  public static final String DAPR_PUBSUB_REGISTRATION_CONFIRMED_TOPIC = "shipment-registration-confirmed-events";
 
   @Autowired
   private DaprWorkflowClient daprWorkflowClient;
@@ -84,7 +85,7 @@ public String basic(@RequestBody Order order) throws TimeoutException {
    * @param status ShipmentRegistrationStatus
    */
   @PostMapping("shipmentRegistered")
-  @Topic(pubsubName = DAPR_PUBSUB_COMPONENT, name = "shipment-registration-confirmed-events")
+  @Topic(pubsubName = DAPR_PUBSUB_COMPONENT, name = DAPR_PUBSUB_REGISTRATION_CONFIRMED_TOPIC)
   public void shipmentRegistered(@RequestBody CloudEvent<ShipmentRegistrationStatus> status){
     logger.info("Shipment registered for order {}", status.getData());
     daprWorkflowClient.raiseEvent(status.getData().orderId(), SHIPMENT_REGISTERED_EVENT, status.getData());
@@ -126,10 +127,5 @@ public OrderStatus getOutput(@RequestParam("instanceId") String instanceId){
     return instanceState.readOutputAs(OrderStatus.class);
   }
 
-
-
-
-
-
 }
 
diff --git a/tutorials/workflow/java/fan-out-fan-in/README.md b/tutorials/workflow/java/fan-out-fan-in/README.md
@@ -74,7 +74,7 @@ graph LR
     curl --request GET --url http://localhost:8080/output
     ```
 
-5. The expected serialized output of the workflow is an array with two strings:
+5. The expected serialized output of the workflow is one string (the shortest) from the array.
 
     ```txt
     "["is"]"
diff --git a/tutorials/workflow/java/resiliency-and-compensation/src/main/java/io/dapr/springboot/examples/resiliency/DivisionActivity.java b/tutorials/workflow/java/resiliency-and-compensation/src/main/java/io/dapr/springboot/examples/resiliency/DivisionActivity.java
@@ -19,15 +19,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-/*
- */
 @Component
 public class DivisionActivity implements WorkflowActivity {
 
-  /*
-
-   */
-
   @Override
   public Object run(WorkflowActivityContext ctx) {
     Logger logger = LoggerFactory.getLogger(DivisionActivity.class);
diff --git a/tutorials/workflow/java/resiliency-and-compensation/src/main/java/io/dapr/springboot/examples/resiliency/MinusOneActivity.java b/tutorials/workflow/java/resiliency-and-compensation/src/main/java/io/dapr/springboot/examples/resiliency/MinusOneActivity.java
@@ -19,15 +19,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-/*
- */
 @Component
 public class MinusOneActivity implements WorkflowActivity {
 
-  /*
-
-   */
-
   @Override
   public Object run(WorkflowActivityContext ctx) {
     Logger logger = LoggerFactory.getLogger(MinusOneActivity.class);
diff --git a/tutorials/workflow/java/resiliency-and-compensation/src/main/java/io/dapr/springboot/examples/resiliency/PlusOneActivity.java b/tutorials/workflow/java/resiliency-and-compensation/src/main/java/io/dapr/springboot/examples/resiliency/PlusOneActivity.java
@@ -19,15 +19,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-/*
- */
 @Component
 public class PlusOneActivity implements WorkflowActivity {
 
-  /*
-
-   */
-
   @Override
   public Object run(WorkflowActivityContext ctx) {
     Logger logger = LoggerFactory.getLogger(PlusOneActivity.class);
diff --git a/tutorials/workflow/java/workflow-management/workflowmanagement.http b/tutorials/workflow/java/workflow-management/workflowmanagement.http
@@ -6,16 +6,21 @@
 POST {{ apphost }}/start/{{counter}}
 
 ### Get the workflow status via the application
+@instanceId={{startWorkflowRequest.response.body.instanceId}}
 GET {{ apphost }}/status/{{ instanceId }}
 
 ### Suspend the workflow
+@instanceId={{startWorkflowRequest.response.body.instanceId}}
 POST {{ apphost }}/suspend/{{ instanceId }}
 
 ### Resume the workflow
+@instanceId={{startWorkflowRequest.response.body.instanceId}}
 POST {{ apphost }}/resume/{{ instanceId }}
 
 ### Terminate the workflow
+@instanceId={{startWorkflowRequest.response.body.instanceId}}
 POST {{ apphost }}/terminate/{{ instanceId }}
 
 ### Purge the workflow
+@instanceId={{startWorkflowRequest.response.body.instanceId}}
 DELETE {{ apphost }}/purge/{{ instanceId }}

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,4 @@ public Statement apply(Statement base, Description description) {`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`-`
`109`		`-`
`110`		`-`
`111`	`108`	`}`