Skip to content

Commit 1a49614

Browse files
paulyukpaulyuk
authored
Merge pull request #947 from paulyuk/release-1.12
Java SDK update
2 parents 91f83e6 + 409143c commit 1a49614

File tree

9 files changed

+48
-39
lines changed

9 files changed

+48
-39
lines changed

‎bindings/java/sdk/batch/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<dependency>
2929
<groupId>io.dapr</groupId>
3030
<artifactId>dapr-sdk-springboot</artifactId>
31-
<version>1.9.0</version>
31+
<version>1.10.0-rc-1</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>io.dapr</groupId>
3535
<artifactId>dapr-sdk</artifactId>
36-
<version>1.9.0</version>
36+
<version>1.10.0-rc-1</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.projectlombok</groupId>

‎configuration/java/sdk/order-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>io.dapr</groupId>
1919
<artifactId>dapr-sdk</artifactId>
20-
<version>1.9.0</version>
20+
<version>1.10.0-rc-1</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>io.projectreactor</groupId>

‎pub_sub/java/sdk/checkout/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>io.dapr</groupId>
1919
<artifactId>dapr-sdk</artifactId>
20-
<version>1.9.0</version>
20+
<version>1.10.0-rc-1</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>com.squareup.okhttp3</groupId>

‎pub_sub/java/sdk/order-processor/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
<dependency>
2525
<groupId>io.dapr</groupId>
2626
<artifactId>dapr-sdk-springboot</artifactId>
27-
<version>1.9.0</version>
27+
<version>1.10.0-rc-1</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>io.dapr</groupId>
3131
<artifactId>dapr-sdk</artifactId>
32-
<version>1.9.0</version>
32+
<version>1.10.0-rc-1</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.projectlombok</groupId>

‎secrets_management/java/sdk/order-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>io.dapr</groupId>
2222
<artifactId>dapr-sdk</artifactId>
23-
<version>1.9.0</version>
23+
<version>1.10.0-rc-1</version>
2424
</dependency>
2525
</dependencies>
2626
<build>

‎state_management/java/sdk/order-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>io.dapr</groupId>
1919
<artifactId>dapr-sdk</artifactId>
20-
<version>1.9.0</version>
20+
<version>1.10.0-rc-1</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>org.projectlombok</groupId>

‎workflows/java/sdk/README.md‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The quickstart contains 1 workflow to simulate purchasing items from a store, an
1414
- ProcessPaymentActivity: This activity is responsible for processing and authorizing the payment.
1515
- UpdateInventoryActivity: This activity updates the state store with the new remaining inventory value.
1616

17-
### Run the order processor workflow
17+
### Run the order processor workflow with multi-app-run
1818

1919
1. Open a new terminal window and navigate to `order-processor` directory:
2020

@@ -25,6 +25,7 @@ name: Install Java dependencies
2525
```bash
2626
cd ./order-processor
2727
mvn clean install
28+
cd ..
2829
```
2930

3031
<!-- END_STEP -->
@@ -33,17 +34,17 @@ mvn clean install
3334
<!-- STEP
3435
name: Run order-processor service
3536
expected_stdout_lines:
36-
- '== APP == there are now 90 cars left in stock'
37-
- '== APP == workflow instance completed, out is: {"processed":true}'
37+
- '== APP - WorkflowConsoleApp == there are now 90 cars left in stock'
38+
- '== APP - WorkflowConsoleApp == workflow instance completed, out is: {"processed":true}'
3839
expected_stderr_lines:
3940
output_match_mode: substring
4041
background: true
4142
sleep: 15
43+
timeout_seconds: 120
4244
-->
4345

4446
```bash
45-
cd ./order-processor
46-
dapr run --app-id WorkflowConsoleApp --resources-path ../../../components/ --dapr-grpc-port 50001 -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar io.dapr.quickstarts.workflows.WorkflowConsoleApp
47+
dapr run -f .
4748
```
4849

4950
<!-- END_STEP -->
@@ -52,31 +53,32 @@ dapr run --app-id WorkflowConsoleApp --resources-path ../../../components/ --dap
5253

5354

5455
```
55-
== APP == *** Welcome to the Dapr Workflow console app sample!
56-
== APP == *** Using this app, you can place orders that start workflows.
57-
== APP == Start workflow runtime
58-
== APP == Sep 20, 2023 8:38:30 AM com.microsoft.durabletask.DurableTaskGrpcWorker startAndBlock
59-
== APP == INFO: Durable Task worker is connecting to sidecar at 127.0.0.1:50001.
60-
== APP == ==========Begin the purchase of item:==========
61-
== APP == Starting order workflow, purchasing 10 of cars
62-
== APP == scheduled new workflow instance of OrderProcessingWorkflow with instance ID: 95d33f7c-3af8-4960-ba11-4ecea83b0509
63-
== APP == [Thread-0] INFO io.dapr.workflows.WorkflowContext - Starting Workflow: io.dapr.quickstarts.workflows.OrderProcessingWorkflow
64-
== APP == [Thread-0] INFO io.dapr.workflows.WorkflowContext - Instance ID(order ID): 95d33f7c-3af8-4960-ba11-4ecea83b0509
65-
== APP == [Thread-0] INFO io.dapr.workflows.WorkflowContext - Current Orchestration Time: 2023-09-20T08:38:33.248Z
66-
== APP == [Thread-0] INFO io.dapr.workflows.WorkflowContext - Received Order: OrderPayload [itemName=cars, totalCost=150000, quantity=10]
67-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.NotifyActivity - Received Order: OrderPayload [itemName=cars, totalCost=150000, quantity=10]
68-
== APP == workflow instance 95d33f7c-3af8-4960-ba11-4ecea83b0509 started
69-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ReserveInventoryActivity - Reserving inventory for order '95d33f7c-3af8-4960-ba11-4ecea83b0509' of 10 cars
70-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ReserveInventoryActivity - There are 100 cars available for purchase
71-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ReserveInventoryActivity - Reserved inventory for order '95d33f7c-3af8-4960-ba11-4ecea83b0509' of 10 cars
72-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.RequestApprovalActivity - Requesting approval for order: OrderPayload [itemName=cars, totalCost=150000, quantity=10]
73-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.RequestApprovalActivity - Approved requesting approval for order: OrderPayload [itemName=cars, totalCost=150000, quantity=10]
74-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ProcessPaymentActivity - Processing payment: 95d33f7c-3af8-4960-ba11-4ecea83b0509 for 10 cars at $150000
75-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ProcessPaymentActivity - Payment for request ID '95d33f7c-3af8-4960-ba11-4ecea83b0509' processed successfully
76-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.UpdateInventoryActivity - Updating inventory for order '95d33f7c-3af8-4960-ba11-4ecea83b0509' of 10 cars
77-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.UpdateInventoryActivity - Updated inventory for order '95d33f7c-3af8-4960-ba11-4ecea83b0509': there are now 90 cars left in stock
78-
== APP == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.NotifyActivity - Order completed! : 95d33f7c-3af8-4960-ba11-4ecea83b0509
79-
== APP == workflow instance 95d33f7c-3af8-4960-ba11-4ecea83b0509 completed, out is: {"processed":true}
56+
== APP - WorkflowConsoleApp == *** Welcome to the Dapr Workflow console app sample!
57+
== APP - WorkflowConsoleApp == *** Using this app, you can place orders that start workflows.
58+
== APP - WorkflowConsoleApp == Start workflow runtime
59+
== APP - WorkflowConsoleApp == Oct 06, 2023 3:10:01 PM com.microsoft.durabletask.DurableTaskGrpcWorker startAndBlock
60+
== APP - WorkflowConsoleApp == INFO: Durable Task worker is connecting to sidecar at 127.0.0.1:50001.
61+
== APP - WorkflowConsoleApp == ==========Begin the purchase of item:==========
62+
== APP - WorkflowConsoleApp == Starting order workflow, purchasing 10 of cars
63+
== APP - WorkflowConsoleApp == scheduled new workflow instance of OrderProcessingWorkflow with instance ID: 397faa44-1374-4f9d-a7fe-c74160604064
64+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.workflows.WorkflowContext - Starting Workflow: io.dapr.quickstarts.workflows.OrderProcessingWorkflow
65+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.workflows.WorkflowContext - Instance ID(order ID): 397faa44-1374-4f9d-a7fe-c74160604064
66+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.workflows.WorkflowContext - Current Orchestration Time: 2023-10-06T22:10:04.769Z
67+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.workflows.WorkflowContext - Received Order: OrderPayload [itemName=cars, totalCost=150000, quantity=10]
68+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.NotifyActivity - Received Order: OrderPayload [itemName=cars, totalCost=150000, quantity=10]
69+
== APP - WorkflowConsoleApp == workflow instance 397faa44-1374-4f9d-a7fe-c74160604064 started
70+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ReserveInventoryActivity - Reserving inventory for order '397faa44-1374-4f9d-a7fe-c74160604064' of 10 cars
71+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ReserveInventoryActivity - There are 100 cars available for purchase
72+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ReserveInventoryActivity - Reserved inventory for order '397faa44-1374-4f9d-a7fe-c74160604064' of 10 cars
73+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.RequestApprovalActivity - Requesting approval for order: OrderPayload [itemName=cars, totalCost=150000, quantity=10]
74+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.RequestApprovalActivity - Approved requesting approval for order: OrderPayload [itemName=cars, totalCost=150000, quantity=10]
75+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ProcessPaymentActivity - Processing payment: 397faa44-1374-4f9d-a7fe-c74160604064 for 10 cars at $150000
76+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.ProcessPaymentActivity - Payment for request ID '397faa44-1374-4f9d-a7fe-c74160604064' processed successfully
77+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.UpdateInventoryActivity - Updating inventory for order '397faa44-1374-4f9d-a7fe-c74160604064' of 10 cars
78+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.UpdateInventoryActivity - Updated inventory for order '397faa44-1374-4f9d-a7fe-c74160604064': there are now 90 cars left in stock
79+
== APP - WorkflowConsoleApp == there are now 90 cars left in stock
80+
== APP - WorkflowConsoleApp == [Thread-0] INFO io.dapr.quickstarts.workflows.activities.NotifyActivity - Order completed! : 397faa44-1374-4f9d-a7fe-c74160604064
81+
== APP - WorkflowConsoleApp == workflow instance completed, out is: {"processed":true}
8082
```
8183

8284
### View workflow output with Zipkin

‎workflows/java/sdk/dapr.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 1
2+
common:
3+
resourcesPath: ../../components
4+
apps:
5+
- appID: WorkflowConsoleApp
6+
appDirPath: ./order-processor/target
7+
command: ["java", "-jar", "OrderProcessingService-0.0.1-SNAPSHOT.jar", "io.dapr.quickstarts.workflows.WorkflowConsoleApp"]

‎workflows/java/sdk/order-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>io.dapr</groupId>
1919
<artifactId>dapr-sdk-workflows</artifactId>
20-
<version>0.10.0-SNAPSHOT</version>
20+
<version>0.10.0-rc-1</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>org.slf4j</groupId>

0 commit comments

Comments
 (0)