Skip to content

Commit 726c1b0

Browse files
javier-aliagacicoylemcruzdevartur-ciocanusalaboy
authored
Master to 1.16 (#1541)
* process deps too for dapr-spring (#1503) Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Signed-off-by: Javier Aliaga <javier@diagrid.io> * Use camelCase on properties (#1470) * Use camelCase on properties Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com> * Add test for cameCalse properties Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com> * Update daprdocs/content/en/java-sdk-docs/spring-boot/_index.md Co-authored-by: Cassie Coyle <cassie.i.coyle@gmail.com> Signed-off-by: Matheus Cruz <56329339+mcruzdev@users.noreply.github.com> --------- Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com> Signed-off-by: Matheus Cruz <56329339+mcruzdev@users.noreply.github.com> Co-authored-by: artur-ciocanu <artur.ciocanu@gmail.com> Co-authored-by: Cassie Coyle <cassie.i.coyle@gmail.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * fix script (#1506) Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Signed-off-by: Javier Aliaga <javier@diagrid.io> * add support for custom status (#1505) Signed-off-by: salaboy <Salaboy@gmail.com> Co-authored-by: Siri Varma Vegiraju <siri.varma@outlook.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * try 1.5.7 (#1487) Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Co-authored-by: Siri Varma Vegiraju <siri.varma@outlook.com> Co-authored-by: artur-ciocanu <artur.ciocanu@gmail.com> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * rm protoc cmd from pom.xml (#1498) * rm protoc cmd bc it uses a local protoc which might be the wrong version and results in a bad error Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * update protoc Signed-off-by: Cassandra Coyle <cassie@diagrid.io> --------- Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Co-authored-by: artur-ciocanu <artur.ciocanu@gmail.com> Co-authored-by: salaboy <Salaboy@gmail.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * feat: Support registering activities with custom name (#1431) * feat: Support register of activities with custom name Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: Apply suggestions Signed-off-by: Javier Aliaga <javier@diagrid.io> --------- Signed-off-by: Javier Aliaga <javier@diagrid.io> Co-authored-by: Cassie Coyle <cassie.i.coyle@gmail.com> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * Bump codecov/codecov-action from 5.4.3 to 5.5.0 (#1513) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.4.3 to 5.5.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v5.4.3...v5.5.0) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 5.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Cassie Coyle <cassie.i.coyle@gmail.com> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * commit: Fix validate job (#1524) Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: New task execution task id test (#1352) (#1526) * chore: New task execution task id test test how taskExecutionTaskId can be used for idempotency * chore: Clean up not used files * docs: Task execution keys * test: Modify unit tests * Remove new lines --------- Signed-off-by: Javier Aliaga <javier@diagrid.io> Signed-off-by: artur-ciocanu <artur.ciocanu@gmail.com> Co-authored-by: Cassie Coyle <cassie.i.coyle@gmail.com> Co-authored-by: artur-ciocanu <artur.ciocanu@gmail.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * Bump actions/checkout from 4 to 5 (#1504) Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Siri Varma Vegiraju <siri.varma@outlook.com> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> Co-authored-by: Cassie Coyle <cassie.i.coyle@gmail.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * Improve CI runs (#1527) * chore: Wait for dapr script When running mechanical markdown examples wait for dapr to be running Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: Fix build ci Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: Fix build ci Signed-off-by: Javier Aliaga <javier@diagrid.io> --------- Signed-off-by: Javier Aliaga <javier@diagrid.io> Co-authored-by: salaboy <Salaboy@gmail.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * Fix CVEs (#1529) * chore: Read test certs from resources folder This will avoid importing bouncy castle library just for tests Signed-off-by: Javier Aliaga <javier@diagrid.io> * ci: Split unit test and integration tests Signed-off-by: Javier Aliaga <javier@diagrid.io> --------- Signed-off-by: Javier Aliaga <javier@diagrid.io> * fix: Use correct snapshot url (#1530) Signed-off-by: Javier Aliaga <javier@diagrid.io> * Bump actions/setup-java from 4 to 5 (#1512) Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: Bump dapr version (#1539) * chore: Bump dapr version Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: Fix conversation tests Only one response expected Signed-off-by: Javier Aliaga <javier@diagrid.io> --------- Signed-off-by: Javier Aliaga <javier@diagrid.io> * Adding logger to WorkflowActivityContext (#1534) * Adding logger to WorkflowActivityContext Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> * Fixing a styling issue Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> * Add unit tests for workflow activity context Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> * Add more unit tests to make Codecov happy Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> * Add more unit tests Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> * Improve code coverage Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> * Improve test names Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> --------- Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> Co-authored-by: Artur Ciocanu <ciocanu@adobe.com> Co-authored-by: salaboy <Salaboy@gmail.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * Use notimestamp in Javadoc Plugin to disable timestamps in Javadocs (#1538) Signed-off-by: Javier Aliaga <javier@diagrid.io> * Feat Cross App CallActivity (#1468) * cross app ex Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * update protoc cmd Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * feedback Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * builder pattern Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * fix protoc Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * debug log levels for test containers Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * update readme and add debugging info Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * add IT test for cross app call activity Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * cleanup test Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * sysout -> ctx.logger Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * reset pom Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * rm debug lines from readme Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * fix header + rm customports Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * use consts Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * rm waitfor call Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * rm pubsub Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * rm timeout Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * reset empty lines added Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * reset appname for daprcontainer Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * reset empty line diff Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * rm constructor info from readme Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * debug -> info Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * rm super.start Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * reset dapr container diff Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * add test for codecov Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * up timeout time to unblock PR Signed-off-by: Cassandra Coyle <cassie@diagrid.io> * deps: Update durabletask-client to 1.5.10 Signed-off-by: Javier Aliaga <javier@diagrid.io> * ci: Revert build timeout Signed-off-by: Javier Aliaga <javier@diagrid.io> * review: Use ctx.getLogger Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: Fix review comments Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: more review comments fixes Signed-off-by: Javier Aliaga <javier@diagrid.io> * test: Use testcontainers in CrossApp IT test Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: Load classpath for IT with all dependencies Signed-off-by: Javier Aliaga <javier@diagrid.io> --------- Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Signed-off-by: Javier Aliaga <javier@diagrid.io> Co-authored-by: Javier Aliaga <javier@diagrid.io> Signed-off-by: Javier Aliaga <javier@diagrid.io> * Release 1.16.0-rc-1 Signed-off-by: Dapr Bot <daprweb@microsoft.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * process deps too for dapr-spring (#1502) Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Signed-off-by: Javier Aliaga <javier@diagrid.io> * chore: Alpha components to stable Signed-off-by: Javier Aliaga <javier@diagrid.io> --------- Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Signed-off-by: Javier Aliaga <javier@diagrid.io> Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com> Signed-off-by: Matheus Cruz <56329339+mcruzdev@users.noreply.github.com> Signed-off-by: salaboy <Salaboy@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: artur-ciocanu <artur.ciocanu@gmail.com> Signed-off-by: Artur Ciocanu <ciocanu@adobe.com> Signed-off-by: Dapr Bot <daprweb@microsoft.com> Co-authored-by: Cassie Coyle <cassie.i.coyle@gmail.com> Co-authored-by: Matheus Cruz <56329339+mcruzdev@users.noreply.github.com> Co-authored-by: artur-ciocanu <artur.ciocanu@gmail.com> Co-authored-by: salaboy <Salaboy@gmail.com> Co-authored-by: Siri Varma Vegiraju <siri.varma@outlook.com> Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Artur Ciocanu <ciocanu@adobe.com> Co-authored-by: Dapr Bot <daprweb@microsoft.com>
1 parent 6e8e37d commit 726c1b0

File tree

82 files changed

+2116
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+2116
-481
lines changed

‎.github/scripts/update_sdk_version.sh‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,12 @@ DAPR_JAVA_SDK_VERSION=$1
99
DAPR_JAVA_SDK_ALPHA_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'`
1010

1111
mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION
12-
mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION
12+
1313
mvn versions:set-property -Dproperty=dapr.sdk.version -DnewVersion=$DAPR_JAVA_SDK_VERSION
14-
mvn versions:set-property -Dproperty=dapr.sdk.version -DnewVersion=$DAPR_JAVA_SDK_VERSION -f sdk-tests/pom.xml
15-
mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-tests/pom.xml
14+
mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION
1615

1716
###################
1817
# Alpha artifacts #
1918
###################
2019

21-
# sdk-workflows
22-
mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-workflows/pom.xml
23-
24-
# testcontainers-dapr
25-
mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f testcontainers-dapr/pom.xml
26-
27-
# dapr-spring
28-
mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -DprocessDependencies=true -f dapr-spring/pom.xml
29-
30-
# spring-boot-examples
31-
mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f spring-boot-examples/pom.xml
32-
3320
git clean -f

‎.github/workflows/automerge-bot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Checkout repo
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626
- name: Install dependencies
2727
run: pip install PyGithub
2828
- name: Automerge and update

‎.github/workflows/build.yml‎

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,35 @@ on:
1515
- release-*
1616

1717
jobs:
18+
test:
19+
name: "Unit tests"
20+
runs-on: ubuntu-latest
21+
timeout-minutes: 30
22+
continue-on-error: false
23+
env:
24+
JDK_VER: 17
25+
steps:
26+
- uses: actions/checkout@v5
27+
- name: Set up OpenJDK ${{ env.JDK_VER }}
28+
uses: actions/setup-java@v4
29+
with:
30+
distribution: 'temurin'
31+
java-version: ${{ env.JDK_VER }}
32+
- name: Run tests
33+
run: ./mvnw clean install -B -q
34+
- name: Codecov
35+
uses: codecov/codecov-action@v5.5.0
36+
- name: Upload test report for sdk
37+
uses: actions/upload-artifact@v4
38+
with:
39+
name: test-dapr-java-sdk-jdk${{ env.JDK_VER }}
40+
path: sdk/target/jacoco-report/
41+
- name: Upload test report for sdk-actors
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: report-dapr-java-sdk-actors-jdk${{ env.JDK_VER }}
45+
path: sdk-actors/target/jacoco-report/
46+
1847
build:
1948
name: "Build jdk:${{ matrix.java }} sb:${{ matrix.spring-boot-display-version }} exp:${{ matrix.experimental }}"
2049
runs-on: ubuntu-latest
@@ -39,7 +68,7 @@ jobs:
3968
GOPROXY: https://proxy.golang.org
4069
JDK_VER: ${{ matrix.java }}
4170
DAPR_CLI_VER: 1.15.0
42-
DAPR_RUNTIME_VER: 1.16.0-rc.3
71+
DAPR_RUNTIME_VER: 1.16.0-rc.5
4372
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
4473
DAPR_CLI_REF:
4574
DAPR_REF:
@@ -50,9 +79,9 @@ jobs:
5079
uses: docker/setup-docker-action@v4
5180
- name: Check Docker version
5281
run: docker version
53-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@v5
5483
- name: Set up OpenJDK ${{ env.JDK_VER }}
55-
uses: actions/setup-java@v4
84+
uses: actions/setup-java@v5
5685
with:
5786
distribution: 'temurin'
5887
java-version: ${{ env.JDK_VER }}
@@ -64,14 +93,14 @@ jobs:
6493
with:
6594
go-version: ${{ env.GOVER }}
6695
- name: Checkout Dapr CLI repo to override dapr command.
67-
uses: actions/checkout@v4
96+
uses: actions/checkout@v5
6897
if: env.DAPR_CLI_REF != ''
6998
with:
7099
repository: dapr/cli
71100
ref: ${{ env.DAPR_CLI_REF }}
72101
path: cli
73102
- name: Checkout Dapr repo to override daprd.
74-
uses: actions/checkout@v4
103+
uses: actions/checkout@v5
75104
if: env.DAPR_REF != ''
76105
with:
77106
repository: dapr/dapr
@@ -112,33 +141,13 @@ jobs:
112141
wget -q ${{ env.TOXIPROXY_URL }} -O /home/runner/.local/bin/toxiproxy-server
113142
chmod +x /home/runner/.local/bin/toxiproxy-server
114143
/home/runner/.local/bin/toxiproxy-server --version
115-
- name: Clean up files
116-
run: ./mvnw clean -B
117-
- name: Build sdk
118-
run: ./mvnw compile -B -q
119-
- name: Unit tests
120-
run: ./mvnw test # making it temporarily verbose.
121-
env:
122-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
123-
- name: Codecov
124-
uses: codecov/codecov-action@v5.4.3
125-
- name: Install jars
126-
run: ./mvnw install -q -B -DskipTests
144+
- name: Clean up and install sdk
145+
run: ./mvnw clean install -B -q -DskipTests
127146
- name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
128147
id: integration_tests
129-
run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests verify
148+
run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests dependency:copy-dependencies verify
130149
env:
131150
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
132-
- name: Upload test report for sdk
133-
uses: actions/upload-artifact@v4
134-
with:
135-
name: report-dapr-java-sdk-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
136-
path: sdk/target/jacoco-report/
137-
- name: Upload test report for sdk-actors
138-
uses: actions/upload-artifact@v4
139-
with:
140-
name: report-dapr-java-sdk-actors-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
141-
path: sdk-actors/target/jacoco-report/
142151
- name: Upload failsafe test report for sdk-tests on failure
143152
if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }}
144153
uses: actions/upload-artifact@v4
@@ -154,7 +163,7 @@ jobs:
154163

155164
publish:
156165
runs-on: ubuntu-latest
157-
needs: build
166+
needs: [ build, test ]
158167
timeout-minutes: 30
159168
env:
160169
JDK_VER: 17
@@ -163,9 +172,9 @@ jobs:
163172
GPG_KEY: ${{ secrets.GPG_KEY }}
164173
GPG_PWD: ${{ secrets.GPG_PWD }}
165174
steps:
166-
- uses: actions/checkout@v4
175+
- uses: actions/checkout@v5
167176
- name: Set up OpenJDK ${{ env.JDK_VER }}
168-
uses: actions/setup-java@v4
177+
uses: actions/setup-java@v5
169178
with:
170179
distribution: 'temurin'
171180
java-version: ${{ env.JDK_VER }}

‎.github/workflows/create-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
JDK_VER: '17'
3030
steps:
3131
- name: Check out code
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
with:
3434
fetch-depth: 0
3535
token: ${{ secrets.DAPR_BOT_TOKEN }}
3636
persist-credentials: false
3737
- name: Set up OpenJDK ${{ env.JDK_VER }}
38-
uses: actions/setup-java@v4
38+
uses: actions/setup-java@v5
3939
with:
4040
distribution: 'temurin'
4141
java-version: ${{ env.JDK_VER }}

‎.github/workflows/fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed.
3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636

3737
- name: "Run FOSSA Scan"
3838
uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred

‎.github/workflows/validate-docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
env:
2323
JDK_VER: 17
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- name: Set up OpenJDK ${{ env.JDK_VER }}
27-
uses: actions/setup-java@v4
27+
uses: actions/setup-java@v5
2828
with:
2929
distribution: 'temurin'
3030
java-version: ${{ env.JDK_VER }}

‎.github/workflows/validate.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ jobs:
3838
GOPROXY: https://proxy.golang.org
3939
JDK_VER: ${{ matrix.java }}
4040
DAPR_CLI_VER: 1.15.0
41-
DAPR_RUNTIME_VER: 1.16.0-rc.3
41+
DAPR_RUNTIME_VER: 1.16.0-rc.5
4242
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
4343
DAPR_CLI_REF:
4444
DAPR_REF:
4545
steps:
46-
- uses: actions/checkout@v4
46+
- uses: actions/checkout@v5
4747
- name: Set up OpenJDK ${{ env.JDK_VER }}
48-
uses: actions/setup-java@v4
48+
uses: actions/setup-java@v5
4949
with:
5050
distribution: 'temurin'
5151
java-version: ${{ env.JDK_VER }}
@@ -62,14 +62,14 @@ jobs:
6262
with:
6363
go-version: ${{ env.GOVER }}
6464
- name: Checkout Dapr CLI repo to override dapr command.
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v5
6666
if: env.DAPR_CLI_REF != ''
6767
with:
6868
repository: dapr/cli
6969
ref: ${{ env.DAPR_CLI_REF }}
7070
path: cli
7171
- name: Checkout Dapr repo to override daprd.
72-
uses: actions/checkout@v4
72+
uses: actions/checkout@v5
7373
if: env.DAPR_REF != ''
7474
with:
7575
repository: dapr/dapr

‎dapr-spring/dapr-spring-boot-autoconfigure/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.16.0-rc-1</version>
9+
<version>1.16.0-rc-1</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-boot-autoconfigure</artifactId>

‎dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientAutoConfigurationTest.java‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import org.springframework.boot.autoconfigure.AutoConfigurations;
2626
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2727

28-
import java.util.Map;
29-
3028
import static org.assertj.core.api.Assertions.assertThat;
3129
import static org.mockito.Mockito.verify;
3230
import static org.mockito.Mockito.when;
@@ -111,6 +109,18 @@ void shouldOverrideGrpcPortIfExists() {
111109
verify(builder).withPropertyOverride(Properties.GRPC_PORT, String.valueOf(grpcPort));
112110
}
113111

112+
@Test
113+
@DisplayName("Should override API token if it exists")
114+
void shouldOverrideApiTokenIfExists() {
115+
String apiToken = "token";
116+
117+
when(connectionDetails.getApiToken()).thenReturn(apiToken);
118+
119+
configuration.daprClientBuilder(connectionDetails);
120+
121+
verify(builder).withPropertyOverride(Properties.API_TOKEN, apiToken);
122+
}
123+
114124
@Test
115125
@DisplayName("Should override HTTP endpoint in properties if it exists")
116126
void shouldOverrideHttpEndpointInPropertiesIfExists() {
@@ -159,6 +169,18 @@ void shouldOverrideGrpcPortPropertiesIfExists() {
159169
assertThat(result.getValue(Properties.GRPC_PORT)).isEqualTo(grpcPort);
160170
}
161171

172+
@Test
173+
@DisplayName("Should override API token in properties if it exists")
174+
void shouldOverrideApiTokenPropertiesIfExists() {
175+
String apiToken = "token";
176+
177+
when(connectionDetails.getApiToken()).thenReturn(apiToken);
178+
179+
Properties result = configuration.createPropertiesFromConnectionDetails(connectionDetails);
180+
181+
assertThat(result.getValue(Properties.API_TOKEN)).isEqualTo(apiToken);
182+
}
183+
162184
private static class TestDaprClientAutoConfiguration extends DaprClientAutoConfiguration {
163185

164186
private final DaprClientBuilder daprClientBuilder;

‎dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,26 @@ public void shouldMapDaprClientProperties() {
8383
});
8484

8585
});
86+
}
8687

88+
@Test
89+
@DisplayName("Should map DaprClient properties correctly (camelCase)")
90+
public void shouldMapDaprClientPropertiesCamelCase() {
91+
runner.withSystemProperties(
92+
"dapr.client.httpEndpoint=http://localhost",
93+
"dapr.client.httpPort=3500",
94+
"dapr.client.grpcEndpoint=localhost",
95+
"dapr.client.grpcPort=50001"
96+
).run(context -> {
97+
DaprClientProperties properties = context.getBean(DaprClientProperties.class);
98+
SoftAssertions.assertSoftly(softly -> {
99+
softly.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost");
100+
softly.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost");
101+
softly.assertThat(properties.getHttpPort()).isEqualTo(3500);
102+
softly.assertThat(properties.getGrpcPort()).isEqualTo(50001);
103+
});
104+
105+
});
87106
}
88107

89108
@EnableConfigurationProperties(DaprClientProperties.class)

0 commit comments

Comments
 (0)