From bb56b8d8a815699b1750d1fc116ab6b68dbe1ac6 Mon Sep 17 00:00:00 2001 From: Siri Varma Vegiraju Date: Tue, 29 Apr 2025 06:27:02 -0700 Subject: [PATCH 01/19] Update CONTRIBUTING.md Signed-off-by: Siri Varma Vegiraju --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4009213b11..c094f92fa1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,6 +51,11 @@ Before you file an issue, make sure you've checked the following: This section describes the guidelines for contributing code / docs to Dapr. +### Things to consider when adding new API to SDK + +1. All the new API's go under [dapr-sdk maven package](https://github.com/dapr/java-sdk/tree/master/sdk) +2. Make sure there is an example talking about how to use the API along with a README. [Example](https://github.com/dapr/java-sdk/pull/1235/files#diff-69ed756c4c01fd5fa884aac030dccb8f3f4d4fefa0dc330862d55a6f87b34a14) + ### Pull Requests All contributions come through pull requests. To submit a proposed change, we recommend following this workflow: @@ -64,6 +69,7 @@ All contributions come through pull requests. To submit a proposed change, we re 6. Commit and open a PR 7. Wait for the CI process to finish and make sure all checks are green 8. A maintainer of the project will be assigned, and you can expect a review within a few days +9. All the files have the Copyright header. ### Configure the code style with checkstyle From a2fdc777b44aab89d43254b40c06d1141205d969 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 10:31:35 -0700 Subject: [PATCH 02/19] Fix spring Signed-off-by: siri-varma --- .../dapr-spring-boot-autoconfigure/pom.xml | 3 --- .../dapr-spring-boot-starter-test/pom.xml | 2 -- .../dapr-spring-boot-starter/pom.xml | 5 ----- dapr-spring/dapr-spring-boot-tests/pom.xml | 2 -- dapr-spring/dapr-spring-workflows/pom.xml | 1 - dapr-spring/pom.xml | 15 +++++++++++++++ pom.xml | 5 +++++ 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 3eca526528..2dbf64e9ea 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -18,19 +18,16 @@ io.dapr.spring dapr-spring-data - ${project.parent.version} true io.dapr.spring dapr-spring-messaging - ${project.parent.version} true io.dapr.spring dapr-spring-workflows - ${project.parent.version} true diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml index 623e1c1cd1..b311826d70 100644 --- a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml +++ b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml @@ -23,12 +23,10 @@ io.dapr.spring dapr-spring-boot-tests - ${project.parent.version} io.dapr testcontainers-dapr - ${project.parent.version} org.springframework.boot diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml index 623040b378..4c03cd5987 100644 --- a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml +++ b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml @@ -23,27 +23,22 @@ io.dapr dapr-sdk-springboot - ${dapr.sdk.version} io.dapr.spring dapr-spring-boot-autoconfigure - ${project.parent.version} io.dapr.spring dapr-spring-data - ${project.parent.version} io.dapr.spring dapr-spring-messaging - ${project.parent.version} io.dapr.spring dapr-spring-workflows - ${project.parent.version} diff --git a/dapr-spring/dapr-spring-boot-tests/pom.xml b/dapr-spring/dapr-spring-boot-tests/pom.xml index 86286c08f8..ffab78d680 100644 --- a/dapr-spring/dapr-spring-boot-tests/pom.xml +++ b/dapr-spring/dapr-spring-boot-tests/pom.xml @@ -22,7 +22,6 @@ io.dapr.spring dapr-spring-boot-autoconfigure - ${project.parent.version} org.testcontainers @@ -38,7 +37,6 @@ io.dapr testcontainers-dapr - ${dapr.sdk.alpha.version} diff --git a/dapr-spring/dapr-spring-workflows/pom.xml b/dapr-spring/dapr-spring-workflows/pom.xml index 55708f5002..1a53871f5e 100644 --- a/dapr-spring/dapr-spring-workflows/pom.xml +++ b/dapr-spring/dapr-spring-workflows/pom.xml @@ -18,7 +18,6 @@ io.dapr dapr-sdk-workflows - ${project.version} diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 593f493d80..3451ca920c 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -70,6 +70,11 @@ junit-jupiter ${testcontainers.version} + + io.dapr + testcontainers-dapr + ${dapr.sdk.alpha.version} + @@ -85,6 +90,16 @@ dapr-sdk-actors ${dapr.sdk.version} + + io.dapr + dapr-sdk-workflows + ${dapr.sdk.version} + + + io.dapr + dapr-sdk-springboot + ${dapr.sdk.version} + diff --git a/pom.xml b/pom.xml index 51f5070027..dded898e32 100644 --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,11 @@ spring-boot-testcontainers ${springboot.version} + + io.dapr + testcontainers-dapr + ${dapr.sdk.alpha.version} + From 6b00030981e27d660803dae1c57b3e1a0bb83a3b Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 12:05:27 -0700 Subject: [PATCH 03/19] Add context Signed-off-by: siri-varma --- dapr-spring/dapr-spring-data/pom.xml | 4 + dapr-spring/dapr-spring-messaging/pom.xml | 11 ++ dapr-spring/pom.xml | 126 +++++++++++++--------- 3 files changed, 90 insertions(+), 51 deletions(-) diff --git a/dapr-spring/dapr-spring-data/pom.xml b/dapr-spring/dapr-spring-data/pom.xml index 1de4b563dc..b15ad26681 100644 --- a/dapr-spring/dapr-spring-data/pom.xml +++ b/dapr-spring/dapr-spring-data/pom.xml @@ -19,6 +19,10 @@ org.springframework.data spring-data-keyvalue + + io.dapr + dapr-sdk + diff --git a/dapr-spring/dapr-spring-messaging/pom.xml b/dapr-spring/dapr-spring-messaging/pom.xml index 7b74a85a84..93172b3ad9 100644 --- a/dapr-spring/dapr-spring-messaging/pom.xml +++ b/dapr-spring/dapr-spring-messaging/pom.xml @@ -14,6 +14,17 @@ Dapr Spring Messaging jar + + + org.springframework + spring-context + + + io.dapr + dapr-sdk + + + diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 3451ca920c..e1e4a73295 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -34,6 +34,7 @@ 11 1.19.8 5.10.2 + 0.15.0-SNAPSHOT @@ -43,7 +44,6 @@ spring-boot-dependencies ${springboot.version} pom - import org.junit.jupiter @@ -75,58 +75,82 @@ testcontainers-dapr ${dapr.sdk.alpha.version} - - - - - - - io.dapr - dapr-sdk - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-actors - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-workflows - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-springboot - ${dapr.sdk.version} - + + io.dapr + dapr-sdk + ${dapr.sdk.version} + + + io.dapr + dapr-sdk-actors + ${dapr.sdk.version} + + + io.dapr + dapr-sdk-workflows + ${dapr.sdk.version} + + + io.dapr.spring + dapr-spring-data + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-messaging + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-workflows + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-boot-autoconfigure + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-boot-tests + ${dapr.spring.version} + + + io.dapr + dapr-sdk-springboot + ${dapr.sdk.version} + - - - org.springframework - spring-web - true - - - org.springframework - spring-context - true - - - org.springframework.boot - spring-boot-configuration-processor - ${springboot.version} - true - + + + org.springframework + spring-web + ${springboot.version} + + + org.springframework.boot + spring-boot-configuration-processor + ${springboot.version} + + + org.springframework.boot + spring-boot-starter + ${springboot.version} + + + org.springframework.boot + spring-boot-autoconfigure-processor + ${springboot.version} + - - - org.springframework.boot - spring-boot-starter-test - ${springboot.version} - test - - + + + org.springframework.boot + spring-boot-starter-test + ${springboot.version} + + + From e11d421c0e9277290320fdae34fb3b65261328f7 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 12:46:58 -0700 Subject: [PATCH 04/19] Phase 1 Signed-off-by: siri-varma --- .../dapr-spring-boot-autoconfigure/pom.xml | 17 ++++++++++++++++- dapr-spring/dapr-spring-workflows/pom.xml | 8 ++++++++ dapr-spring/pom.xml | 13 ++++++++++++- sdk-workflows/pom.xml | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 2dbf64e9ea..6ade085890 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -20,6 +20,10 @@ dapr-spring-data true + + io.dapr + dapr-sdk-actors + io.dapr.spring dapr-spring-messaging @@ -68,9 +72,20 @@ io.dapr testcontainers-dapr - ${dapr.sdk.alpha.version} test + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework.boot + spring-boot-starter-test + diff --git a/dapr-spring/dapr-spring-workflows/pom.xml b/dapr-spring/dapr-spring-workflows/pom.xml index 1a53871f5e..e9d312c57f 100644 --- a/dapr-spring/dapr-spring-workflows/pom.xml +++ b/dapr-spring/dapr-spring-workflows/pom.xml @@ -15,6 +15,14 @@ jar + + org.springframework + spring-beans + + + org.springframework + spring-context + io.dapr dapr-sdk-workflows diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index e1e4a73295..80fad6af48 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -35,6 +35,7 @@ 1.19.8 5.10.2 0.15.0-SNAPSHOT + 6.1.8 @@ -120,12 +121,22 @@ dapr-sdk-springboot ${dapr.sdk.version} + + org.springframework + spring-context + ${springframework.version} + + + org.springframework + spring-beans + ${springframework.version} + org.springframework spring-web - ${springboot.version} + ${springframework.version} org.springframework.boot diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml index a5c4ae9495..a60c5fb941 100644 --- a/sdk-workflows/pom.xml +++ b/sdk-workflows/pom.xml @@ -12,7 +12,7 @@ dapr-sdk-workflows jar - 0.15.0-SNAPSHOT + 1.15.0-SNAPSHOT dapr-sdk-workflows SDK for Workflows on Dapr From 2bf6e2a6d53952df812f2098fef8b31b62bb6298 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 14:06:03 -0700 Subject: [PATCH 05/19] Fix things Signed-off-by: siri-varma --- dapr-spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 80fad6af48..18496aabe7 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -33,7 +33,7 @@ 11 11 1.19.8 - 5.10.2 + 5.11.2 0.15.0-SNAPSHOT 6.1.8 From 380342684fde7fe97e7f204d0a7f6eb5c90b4be3 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 14:13:10 -0700 Subject: [PATCH 06/19] Fix things Signed-off-by: siri-varma --- dapr-spring/pom.xml | 2 +- sdk-workflows/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 18496aabe7..a5787b63bf 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -89,7 +89,7 @@ io.dapr dapr-sdk-workflows - ${dapr.sdk.version} + 0.15.0-SNAPSHOT io.dapr.spring diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml index a60c5fb941..a5c4ae9495 100644 --- a/sdk-workflows/pom.xml +++ b/sdk-workflows/pom.xml @@ -12,7 +12,7 @@ dapr-sdk-workflows jar - 1.15.0-SNAPSHOT + 0.15.0-SNAPSHOT dapr-sdk-workflows SDK for Workflows on Dapr From 52d27f732768d1561035d28ffad3fe44410a6a26 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 10:31:35 -0700 Subject: [PATCH 07/19] Fix spring Signed-off-by: siri-varma --- .../dapr-spring-boot-autoconfigure/pom.xml | 3 --- .../dapr-spring-boot-starter-test/pom.xml | 2 -- .../dapr-spring-boot-starter/pom.xml | 5 ----- dapr-spring/dapr-spring-boot-tests/pom.xml | 2 -- dapr-spring/dapr-spring-workflows/pom.xml | 1 - dapr-spring/pom.xml | 15 +++++++++++++++ pom.xml | 5 +++++ 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index f5fffffed8..f99f7ca4c7 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -18,19 +18,16 @@ io.dapr.spring dapr-spring-data - ${project.parent.version} true io.dapr.spring dapr-spring-messaging - ${project.parent.version} true io.dapr.spring dapr-spring-workflows - ${project.parent.version} true diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml index 141c28cedb..2bca355e88 100644 --- a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml +++ b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml @@ -23,12 +23,10 @@ io.dapr.spring dapr-spring-boot-tests - ${project.parent.version} io.dapr testcontainers-dapr - ${project.parent.version} org.springframework.boot diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml index a57f708daa..ff916ac25e 100644 --- a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml +++ b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml @@ -23,27 +23,22 @@ io.dapr dapr-sdk-springboot - ${dapr.sdk.version} io.dapr.spring dapr-spring-boot-autoconfigure - ${project.parent.version} io.dapr.spring dapr-spring-data - ${project.parent.version} io.dapr.spring dapr-spring-messaging - ${project.parent.version} io.dapr.spring dapr-spring-workflows - ${project.parent.version} diff --git a/dapr-spring/dapr-spring-boot-tests/pom.xml b/dapr-spring/dapr-spring-boot-tests/pom.xml index b9210d0584..e0e3425f68 100644 --- a/dapr-spring/dapr-spring-boot-tests/pom.xml +++ b/dapr-spring/dapr-spring-boot-tests/pom.xml @@ -22,7 +22,6 @@ io.dapr.spring dapr-spring-boot-autoconfigure - ${project.parent.version} org.testcontainers @@ -38,7 +37,6 @@ io.dapr testcontainers-dapr - ${dapr.sdk.alpha.version} diff --git a/dapr-spring/dapr-spring-workflows/pom.xml b/dapr-spring/dapr-spring-workflows/pom.xml index 2182b60908..14ad7985a0 100644 --- a/dapr-spring/dapr-spring-workflows/pom.xml +++ b/dapr-spring/dapr-spring-workflows/pom.xml @@ -18,7 +18,6 @@ io.dapr dapr-sdk-workflows - ${project.version} diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index d434f8c032..0a9efce49d 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -70,6 +70,11 @@ junit-jupiter ${testcontainers.version} + + io.dapr + testcontainers-dapr + ${dapr.sdk.alpha.version} + @@ -85,6 +90,16 @@ dapr-sdk-actors ${dapr.sdk.version} + + io.dapr + dapr-sdk-workflows + ${dapr.sdk.version} + + + io.dapr + dapr-sdk-springboot + ${dapr.sdk.version} + diff --git a/pom.xml b/pom.xml index d240cfb635..a80316f2d7 100644 --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,11 @@ spring-boot-testcontainers ${springboot.version} + + io.dapr + testcontainers-dapr + ${dapr.sdk.alpha.version} + From dce7118c200331c2876b3a47f515f6eb88c5884c Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 12:05:27 -0700 Subject: [PATCH 08/19] Add context Signed-off-by: siri-varma --- dapr-spring/dapr-spring-data/pom.xml | 4 + dapr-spring/dapr-spring-messaging/pom.xml | 11 ++ dapr-spring/pom.xml | 126 +++++++++++++--------- 3 files changed, 90 insertions(+), 51 deletions(-) diff --git a/dapr-spring/dapr-spring-data/pom.xml b/dapr-spring/dapr-spring-data/pom.xml index bd6efe151b..bf7b8b3be1 100644 --- a/dapr-spring/dapr-spring-data/pom.xml +++ b/dapr-spring/dapr-spring-data/pom.xml @@ -19,6 +19,10 @@ org.springframework.data spring-data-keyvalue + + io.dapr + dapr-sdk + diff --git a/dapr-spring/dapr-spring-messaging/pom.xml b/dapr-spring/dapr-spring-messaging/pom.xml index d5d50ef4ed..6ab4ce2301 100644 --- a/dapr-spring/dapr-spring-messaging/pom.xml +++ b/dapr-spring/dapr-spring-messaging/pom.xml @@ -14,6 +14,17 @@ Dapr Spring Messaging jar + + + org.springframework + spring-context + + + io.dapr + dapr-sdk + + + diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 0a9efce49d..5cb275e393 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -34,6 +34,7 @@ 11 1.19.8 5.10.2 + 0.15.0-SNAPSHOT @@ -43,7 +44,6 @@ spring-boot-dependencies ${springboot.version} pom - import org.junit.jupiter @@ -75,58 +75,82 @@ testcontainers-dapr ${dapr.sdk.alpha.version} - - - - - - - io.dapr - dapr-sdk - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-actors - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-workflows - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-springboot - ${dapr.sdk.version} - + + io.dapr + dapr-sdk + ${dapr.sdk.version} + + + io.dapr + dapr-sdk-actors + ${dapr.sdk.version} + + + io.dapr + dapr-sdk-workflows + ${dapr.sdk.version} + + + io.dapr.spring + dapr-spring-data + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-messaging + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-workflows + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-boot-autoconfigure + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-boot-tests + ${dapr.spring.version} + + + io.dapr + dapr-sdk-springboot + ${dapr.sdk.version} + - - - org.springframework - spring-web - true - - - org.springframework - spring-context - true - - - org.springframework.boot - spring-boot-configuration-processor - ${springboot.version} - true - + + + org.springframework + spring-web + ${springboot.version} + + + org.springframework.boot + spring-boot-configuration-processor + ${springboot.version} + + + org.springframework.boot + spring-boot-starter + ${springboot.version} + + + org.springframework.boot + spring-boot-autoconfigure-processor + ${springboot.version} + - - - org.springframework.boot - spring-boot-starter-test - ${springboot.version} - test - - + + + org.springframework.boot + spring-boot-starter-test + ${springboot.version} + + + From 25ccb5b075a034036e68f024d3f861d7cecaa718 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 12:46:58 -0700 Subject: [PATCH 09/19] Phase 1 Signed-off-by: siri-varma --- .../dapr-spring-boot-autoconfigure/pom.xml | 17 ++++++++++++++++- dapr-spring/dapr-spring-workflows/pom.xml | 8 ++++++++ dapr-spring/pom.xml | 13 ++++++++++++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index f99f7ca4c7..240ab9fe07 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -20,6 +20,10 @@ dapr-spring-data true + + io.dapr + dapr-sdk-actors + io.dapr.spring dapr-spring-messaging @@ -68,9 +72,20 @@ io.dapr testcontainers-dapr - ${dapr.sdk.alpha.version} test + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework.boot + spring-boot-starter-test + diff --git a/dapr-spring/dapr-spring-workflows/pom.xml b/dapr-spring/dapr-spring-workflows/pom.xml index 14ad7985a0..bac4ab7d2c 100644 --- a/dapr-spring/dapr-spring-workflows/pom.xml +++ b/dapr-spring/dapr-spring-workflows/pom.xml @@ -15,6 +15,14 @@ jar + + org.springframework + spring-beans + + + org.springframework + spring-context + io.dapr dapr-sdk-workflows diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 5cb275e393..8d14091080 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -35,6 +35,7 @@ 1.19.8 5.10.2 0.15.0-SNAPSHOT + 6.1.8 @@ -120,12 +121,22 @@ dapr-sdk-springboot ${dapr.sdk.version} + + org.springframework + spring-context + ${springframework.version} + + + org.springframework + spring-beans + ${springframework.version} + org.springframework spring-web - ${springboot.version} + ${springframework.version} org.springframework.boot From d30d1ba93ff2e2bdabe8a1e7baab61070e6605e3 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 14:06:03 -0700 Subject: [PATCH 10/19] Fix things Signed-off-by: siri-varma --- dapr-spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 8d14091080..0307dd01ad 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -33,7 +33,7 @@ 11 11 1.19.8 - 5.10.2 + 5.11.2 0.15.0-SNAPSHOT 6.1.8 From 7bfe71a06e52b47b41b2dce0a0634fb9f4bdae41 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 5 May 2025 14:13:10 -0700 Subject: [PATCH 11/19] Fix things Signed-off-by: siri-varma --- dapr-spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 0307dd01ad..486da30798 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -89,7 +89,7 @@ io.dapr dapr-sdk-workflows - ${dapr.sdk.version} + 0.15.0-SNAPSHOT io.dapr.spring From 508148c854c70b577671c2489739f82ec33d9f90 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Tue, 6 May 2025 07:11:12 -0700 Subject: [PATCH 12/19] move version Signed-off-by: sirivarma --- dapr-spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 486da30798..fdb415de7e 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -28,13 +28,13 @@ - 3.2.6 11 11 11 1.19.8 5.11.2 0.15.0-SNAPSHOT + 3.2.6 6.1.8 From 35b75a8696c24fe47e08825b341ea6bf505cd941 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Fri, 9 May 2025 18:00:09 -0700 Subject: [PATCH 13/19] Fix pom Signed-off-by: sirivarma --- dapr-spring/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index fdb415de7e..caf3831140 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -33,7 +33,7 @@ 11 1.19.8 5.11.2 - 0.15.0-SNAPSHOT + 0.16.0-SNAPSHOT 3.2.6 6.1.8 @@ -89,7 +89,7 @@ io.dapr dapr-sdk-workflows - 0.15.0-SNAPSHOT + ${dapr.sdk.version} io.dapr.spring From b658f8830e47cee77d8e82f87977dc46118f4add Mon Sep 17 00:00:00 2001 From: sirivarma Date: Sat, 10 May 2025 00:32:53 -0700 Subject: [PATCH 14/19] change version Signed-off-by: sirivarma --- dapr-spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index caf3831140..44be9b8c5e 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -89,7 +89,7 @@ io.dapr dapr-sdk-workflows - ${dapr.sdk.version} + 0.16.0-SNAPSHOT io.dapr.spring From 68afefc375d754b8c45cb96b7b111ccfc36da974 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 19 May 2025 12:06:48 -0700 Subject: [PATCH 15/19] remove unused Signed-off-by: siri-varma --- dapr-spring/dapr-spring-boot-autoconfigure/pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 6ade085890..8ad7fdf72b 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -20,10 +20,6 @@ dapr-spring-data true - - io.dapr - dapr-sdk-actors - io.dapr.spring dapr-spring-messaging @@ -74,17 +70,10 @@ testcontainers-dapr test - - org.springframework - spring-beans - - - org.springframework - spring-context - org.springframework.boot spring-boot-starter-test + test From 6024a44949238c155aed77d368cb66b9fab9ae07 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 19 May 2025 12:26:32 -0700 Subject: [PATCH 16/19] Address comments Signed-off-by: siri-varma --- dapr-spring/dapr-spring-boot-autoconfigure/pom.xml | 4 ++++ dapr-spring/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 8ad7fdf72b..d05e3ec7b2 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -20,6 +20,10 @@ dapr-spring-data true + + io.dapr + dapr-sdk-actors + io.dapr.spring dapr-spring-messaging diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index a5787b63bf..b7c806d13f 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -89,7 +89,7 @@ io.dapr dapr-sdk-workflows - 0.15.0-SNAPSHOT + ${dapr.sdk.alpha.version} io.dapr.spring From e7adc565069a308e12c95dca5bc8cd183b60819e Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 19 May 2025 14:50:16 -0700 Subject: [PATCH 17/19] Fix test Signed-off-by: siri-varma --- dapr-spring/pom.xml | 78 +++++++++++---------- pom.xml | 163 ++++++++++++++++++++++++-------------------- 2 files changed, 133 insertions(+), 108 deletions(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 9b978fe2a0..684688d53e 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -46,36 +46,6 @@ ${springboot.version} pom - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - - - org.junit.jupiter - junit-jupiter-params - ${junit.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - - - org.junit.jupiter - junit-jupiter - ${junit.version} - - - org.testcontainers - junit-jupiter - ${testcontainers.version} - - - io.dapr - testcontainers-dapr - ${dapr.sdk.alpha.version} - io.dapr dapr-sdk @@ -111,11 +81,6 @@ dapr-spring-boot-autoconfigure ${dapr.spring.version} - - io.dapr.spring - dapr-spring-boot-tests - ${dapr.spring.version} - io.dapr dapr-sdk-springboot @@ -159,6 +124,49 @@ org.springframework.boot spring-boot-starter-test ${springboot.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter + ${junit.version} + test + + + org.testcontainers + junit-jupiter + ${testcontainers.version} + test + + + io.dapr + testcontainers-dapr + ${dapr.sdk.alpha.version} + test + + + io.dapr.spring + dapr-spring-boot-tests + ${dapr.spring.version} + test diff --git a/pom.xml b/pom.xml index a80316f2d7..d2bce36503 100644 --- a/pom.xml +++ b/pom.xml @@ -88,24 +88,6 @@ grpc-api ${grpc.version} - - org.junit - junit-bom - ${junit-bom.version} - import - pom - - - org.mockito - mockito-core - 3.11.2 - - - io.projectreactor - reactor-test - 3.5.12 - test - io.grpc grpc-testing @@ -128,63 +110,18 @@ snakeyaml ${snakeyaml.version} - - org.testcontainers - testcontainers - ${testcontainers.version} - io.dapr dapr-sdk ${dapr.sdk.version} compile - - org.junit.jupiter - junit-jupiter - ${junit-bom.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit-bom.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit-bom.version} - - - org.junit.jupiter - junit-jupiter-params - ${junit-bom.version} - - - org.testcontainers - junit-jupiter - ${testcontainers.version} - - - org.testcontainers - kafka - ${testcontainers.version} - org.springframework.boot spring-boot-dependencies ${springboot.version} pom - - org.testcontainers - postgresql - ${testcontainers.version} - - - org.testcontainers - rabbitmq - ${testcontainers.version} - io.rest-assured rest-assured @@ -195,11 +132,6 @@ dapr-spring-boot-starter ${dapr.sdk.alpha.version} - - io.dapr.spring - dapr-spring-boot-starter-test - ${dapr.sdk.alpha.version} - org.springframework.boot spring-boot-starter-web @@ -210,11 +142,6 @@ spring-boot-starter-actuator ${springboot.version} - - org.springframework.boot - spring-boot-starter-test - ${springboot.version} - org.springframework.data spring-data-keyvalue @@ -225,15 +152,105 @@ spring-data-commons ${springboot.version} + + + org.springframework.boot spring-boot-testcontainers ${springboot.version} + test io.dapr testcontainers-dapr ${dapr.sdk.alpha.version} + test + + + org.springframework.boot + spring-boot-starter-test + ${springboot.version} + test + + + io.dapr.spring + dapr-spring-boot-starter-test + ${dapr.sdk.alpha.version} + test + + + org.testcontainers + postgresql + ${testcontainers.version} + test + + + org.testcontainers + rabbitmq + ${testcontainers.version} + test + + + org.junit.jupiter + junit-jupiter + ${junit-bom.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit-bom.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit-bom.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit-bom.version} + test + + + org.testcontainers + junit-jupiter + ${testcontainers.version} + test + + + org.testcontainers + kafka + ${testcontainers.version} + test + + + org.testcontainers + testcontainers + ${testcontainers.version} + test + + + org.junit + junit-bom + ${junit-bom.version} + import + pom + + + org.mockito + mockito-core + 3.11.2 + test + + + io.projectreactor + reactor-test + 3.5.12 + test From 94de244874c87017cdffef5a6635a6cecab94270 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 19 May 2025 14:54:35 -0700 Subject: [PATCH 18/19] Fix test Signed-off-by: siri-varma --- .github/workflows/build.yml | 2 +- .github/workflows/fossa.yml | 4 +- .../dapr-spring-boot-autoconfigure/pom.xml | 1 - dapr-spring/pom.xml | 29 ++- pom.xml | 179 ++++++++---------- spring-boot-examples/consumer-app/pom.xml | 9 + .../io/dapr/testcontainers/DaprContainer.java | 8 +- .../testcontainers/DaprComponentTest.java | 14 +- 8 files changed, 111 insertions(+), 135 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ee95452e1..75b87cdc92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: env: DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Codecov - uses: codecov/codecov-action@v5.4.2 + uses: codecov/codecov-action@v5.4.3 - name: Install jars run: ./mvnw install -q -B -DskipTests - name: Integration tests using spring boot version ${{ matrix.spring-boot-version }} diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 5e5581db7b..25e15cbaad 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -35,12 +35,12 @@ jobs: uses: actions/checkout@v4 - name: "Run FOSSA Scan" - uses: fossas/fossa-action@v1.6.0 # Use a specific version if locking is preferred + uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred with: api-key: ${{ env.FOSSA_API_KEY }} - name: "Run FOSSA Test" - uses: fossas/fossa-action@v1.6.0 # Use a specific version if locking is preferred + uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred with: api-key: ${{ env.FOSSA_API_KEY }} run-tests: true diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index c99ed728e5..5169894d90 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -77,7 +77,6 @@ org.springframework.boot spring-boot-starter-test - test org.springframework diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 684688d53e..a0a79d18eb 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -118,20 +118,25 @@ spring-boot-autoconfigure-processor ${springboot.version} - - - org.springframework.boot - spring-boot-starter-test - ${springboot.version} - test + io.dapr.spring + dapr-spring-boot-tests + ${dapr.spring.version} + + org.junit.jupiter junit-jupiter-api ${junit.version} test + + org.springframework.boot + spring-boot-starter-test + ${springboot.version} + test + org.junit.jupiter junit-jupiter-params @@ -156,18 +161,6 @@ ${testcontainers.version} test - - io.dapr - testcontainers-dapr - ${dapr.sdk.alpha.version} - test - - - io.dapr.spring - dapr-spring-boot-tests - ${dapr.spring.version} - test - diff --git a/pom.xml b/pom.xml index d2bce36503..a49bb157e5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 io.dapr @@ -88,6 +88,24 @@ grpc-api ${grpc.version} + + org.junit + junit-bom + ${junit-bom.version} + import + pom + + + org.mockito + mockito-core + 3.11.2 + + + io.projectreactor + reactor-test + 3.5.12 + test + io.grpc grpc-testing @@ -100,16 +118,21 @@ ${grpc.version} test - - org.jetbrains.kotlin - kotlin-stdlib - 2.1.0 - + + org.jetbrains.kotlin + kotlin-stdlib + 2.1.0 + org.yaml snakeyaml ${snakeyaml.version} + + org.testcontainers + testcontainers + ${testcontainers.version} + io.dapr dapr-sdk @@ -117,140 +140,100 @@ compile - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - - - io.rest-assured - rest-assured - 5.5.1 - - - io.dapr.spring - dapr-spring-boot-starter - ${dapr.sdk.alpha.version} - - - org.springframework.boot - spring-boot-starter-web - ${springboot.version} + org.junit.jupiter + junit-jupiter + ${junit-bom.version} - org.springframework.boot - spring-boot-starter-actuator - ${springboot.version} + org.junit.jupiter + junit-jupiter-api + ${junit-bom.version} - org.springframework.data - spring-data-keyvalue - ${springboot.version} + org.junit.jupiter + junit-jupiter-engine + ${junit-bom.version} - org.springframework.data - spring-data-commons - ${springboot.version} + org.junit.jupiter + junit-jupiter-params + ${junit-bom.version} - - - - org.springframework.boot - spring-boot-testcontainers - ${springboot.version} - test + org.testcontainers + junit-jupiter + ${testcontainers.version} - io.dapr - testcontainers-dapr - ${dapr.sdk.alpha.version} - test + org.testcontainers + kafka + ${testcontainers.version} org.springframework.boot - spring-boot-starter-test + spring-boot-dependencies ${springboot.version} - test - - - io.dapr.spring - dapr-spring-boot-starter-test - ${dapr.sdk.alpha.version} - test + pom org.testcontainers postgresql ${testcontainers.version} - test org.testcontainers rabbitmq ${testcontainers.version} - test - org.junit.jupiter - junit-jupiter - ${junit-bom.version} - test + io.rest-assured + rest-assured + 5.5.1 - org.junit.jupiter - junit-jupiter-api - ${junit-bom.version} - test + io.dapr.spring + dapr-spring-boot-starter + ${dapr.sdk.alpha.version} - org.junit.jupiter - junit-jupiter-engine - ${junit-bom.version} - test + io.dapr.spring + dapr-spring-boot-starter-test + ${dapr.sdk.alpha.version} - org.junit.jupiter - junit-jupiter-params - ${junit-bom.version} - test + org.springframework.boot + spring-boot-starter-web + ${springboot.version} - org.testcontainers - junit-jupiter - ${testcontainers.version} - test + org.springframework.boot + spring-boot-starter-actuator + ${springboot.version} - org.testcontainers - kafka - ${testcontainers.version} - test + org.springframework.boot + spring-boot-starter-test + ${springboot.version} - org.testcontainers - testcontainers - ${testcontainers.version} - test + org.springframework.data + spring-data-keyvalue + ${springboot.version} - org.junit - junit-bom - ${junit-bom.version} - import - pom + org.springframework.data + spring-data-commons + ${springboot.version} - org.mockito - mockito-core - 3.11.2 - test + org.springframework.boot + spring-boot-testcontainers + ${springboot.version} - io.projectreactor - reactor-test - 3.5.12 - test + io.dapr + testcontainers-dapr + ${dapr.sdk.alpha.version} diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml index ad64eb49ab..8bb5e715d7 100644 --- a/spring-boot-examples/consumer-app/pom.xml +++ b/spring-boot-examples/consumer-app/pom.xml @@ -55,6 +55,15 @@ rest-assured test + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.boot + spring-boot-starter-test + diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java index dd008ed33f..2a1d905fd0 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java @@ -210,21 +210,19 @@ public DaprContainer withComponent(Path path) { try { Map component = YAML_MAPPER.loadAs(Files.newInputStream(path), Map.class); - String type = (String) component.get("type"); Map metadata = (Map) component.get("metadata"); String name = (String) metadata.get("name"); Map spec = (Map) component.get("spec"); + String type = (String) spec.get("type"); String version = (String) spec.get("version"); List> specMetadata = - (List>) spec.getOrDefault("metadata", Collections.emptyMap()); + (List>) spec.getOrDefault("metadata", Collections.emptyList()); ArrayList metadataEntries = new ArrayList<>(); for (Map specMetadataItem : specMetadata) { - for (Map.Entry metadataItem : specMetadataItem.entrySet()) { - metadataEntries.add(new MetadataEntry(metadataItem.getKey(), metadataItem.getValue())); - } + metadataEntries.add(new MetadataEntry(specMetadataItem.get("name"), specMetadataItem.get("value"))); } return withComponent(new Component(name, type, version, metadataEntries)); diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java index d02a6c1cd7..3de5ccdf19 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java @@ -69,20 +69,14 @@ public void withComponentFromPath() { + "metadata:\n" + " name: statestore\n" + "spec:\n" - + " type: null\n" + + " type: state.redis\n" + " version: v1\n" + " metadata:\n" - + " - name: name\n" - + " value: keyPrefix\n" - + " - name: value\n" + + " - name: keyPrefix\n" + " value: name\n" - + " - name: name\n" - + " value: redisHost\n" - + " - name: value\n" + + " - name: redisHost\n" + " value: redis:6379\n" - + " - name: name\n" - + " value: redisPassword\n" - + " - name: value\n" + + " - name: redisPassword\n" + " value: ''\n"; assertEquals(expectedComponentYaml, componentYaml); From 0c45f4b934686247c626a768bf5bba18d78da654 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Mon, 19 May 2025 23:25:07 -0700 Subject: [PATCH 19/19] Fix things Signed-off-by: sirivarma --- dapr-spring/dapr-spring-boot-autoconfigure/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 5169894d90..240ab9fe07 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -74,10 +74,6 @@ testcontainers-dapr test - - org.springframework.boot - spring-boot-starter-test - org.springframework spring-beans