From fd621f28901154519ad3054f44cf32e923968cff Mon Sep 17 00:00:00 2001 From: salaboy Date: Tue, 30 Sep 2025 14:59:02 +0200 Subject: [PATCH 1/5] setting default props for dapr client Signed-off-by: salaboy --- .../client/DaprClientProperties.java | 8 ++++---- .../client/DaprClientPropertiesTest.java | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java b/dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java index ac3971579e..6759057aa0 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java +++ b/dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java @@ -17,10 +17,10 @@ @ConfigurationProperties(prefix = "dapr.client") public class DaprClientProperties { - private String httpEndpoint; - private String grpcEndpoint; - private Integer httpPort; - private Integer grpcPort; + private String httpEndpoint = "http://localhost"; + private String grpcEndpoint = "localhost"; + private Integer httpPort = 3500; + private Integer grpcPort = 50001; private String apiToken; /** diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java index 33ea73989f..9a401e7850 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java +++ b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java @@ -64,6 +64,21 @@ public void shouldSetDaprClientPropertiesCorrectly() { }); } + @Test + @DisplayName("Should create DaprClientProperties default values correctly") + public void shouldSetDaprClientDefaultPropertiesCorrectly() { + + DaprClientProperties properties = new DaprClientProperties(); + + SoftAssertions.assertSoftly(softAssertions -> { + softAssertions.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost"); + softAssertions.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost"); + softAssertions.assertThat(properties.getHttpPort()).isEqualTo(3500); + softAssertions.assertThat(properties.getGrpcPort()).isEqualTo(50001); + softAssertions.assertThat(properties.getApiToken()).isNull(); + }); + } + @Test @DisplayName("Should map DaprClient properties correctly") public void shouldMapDaprClientProperties() { @@ -105,6 +120,8 @@ public void shouldMapDaprClientPropertiesCamelCase() { }); } + + @EnableConfigurationProperties(DaprClientProperties.class) static class EnableDaprClientProperties { From ce437c2801a15ef58ec6fe7734f058bdbdb13167 Mon Sep 17 00:00:00 2001 From: artur-ciocanu Date: Sun, 2 Nov 2025 06:23:50 +0200 Subject: [PATCH 2/5] Use ports in endpoints to fix the tests Signed-off-by: artur-ciocanu --- .../boot/autoconfigure/client/DaprClientProperties.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java b/dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java index 6759057aa0..974be8d609 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java +++ b/dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java @@ -17,8 +17,8 @@ @ConfigurationProperties(prefix = "dapr.client") public class DaprClientProperties { - private String httpEndpoint = "http://localhost"; - private String grpcEndpoint = "localhost"; + private String httpEndpoint = "http://localhost:3500"; + private String grpcEndpoint = "localhost:50001"; private Integer httpPort = 3500; private Integer grpcPort = 50001; private String apiToken; From 15c60f5736b693cc08f16a7d563f0d08a4b62532 Mon Sep 17 00:00:00 2001 From: artur-ciocanu Date: Sun, 2 Nov 2025 06:29:58 +0200 Subject: [PATCH 3/5] Fix unit test after endpoint changes Signed-off-by: artur-ciocanu --- .../boot/autoconfigure/client/DaprClientPropertiesTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java index 9a401e7850..4c368bd624 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java +++ b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java @@ -111,8 +111,8 @@ public void shouldMapDaprClientPropertiesCamelCase() { ).run(context -> { DaprClientProperties properties = context.getBean(DaprClientProperties.class); SoftAssertions.assertSoftly(softly -> { - softly.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost"); - softly.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost"); + softly.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost:50001"); + softly.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost:3500"); softly.assertThat(properties.getHttpPort()).isEqualTo(3500); softly.assertThat(properties.getGrpcPort()).isEqualTo(50001); }); From 213587de9df8bf5431e06b397715df52c734391a Mon Sep 17 00:00:00 2001 From: artur-ciocanu Date: Sun, 2 Nov 2025 06:49:18 +0200 Subject: [PATCH 4/5] Fix unit tests take 2 Signed-off-by: artur-ciocanu --- .../autoconfigure/client/DaprClientPropertiesTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java index 4c368bd624..08a037bfab 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java +++ b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java @@ -71,8 +71,8 @@ public void shouldSetDaprClientDefaultPropertiesCorrectly() { DaprClientProperties properties = new DaprClientProperties(); SoftAssertions.assertSoftly(softAssertions -> { - softAssertions.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost"); - softAssertions.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost"); + softAssertions.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost:50001"); + softAssertions.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost:3500"); softAssertions.assertThat(properties.getHttpPort()).isEqualTo(3500); softAssertions.assertThat(properties.getGrpcPort()).isEqualTo(50001); softAssertions.assertThat(properties.getApiToken()).isNull(); @@ -111,8 +111,8 @@ public void shouldMapDaprClientPropertiesCamelCase() { ).run(context -> { DaprClientProperties properties = context.getBean(DaprClientProperties.class); SoftAssertions.assertSoftly(softly -> { - softly.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost:50001"); - softly.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost:3500"); + softly.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost"); + softly.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost"); softly.assertThat(properties.getHttpPort()).isEqualTo(3500); softly.assertThat(properties.getGrpcPort()).isEqualTo(50001); }); From 7fe44f51bd3762c6c28b36df81b060ce7f445ccd Mon Sep 17 00:00:00 2001 From: artur-ciocanu Date: Sun, 2 Nov 2025 06:50:19 +0200 Subject: [PATCH 5/5] Minor styling Signed-off-by: artur-ciocanu --- .../boot/autoconfigure/client/DaprClientPropertiesTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java index 08a037bfab..d454e97c88 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java +++ b/dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java @@ -22,7 +22,6 @@ public class DaprClientPropertiesTest { - private final ApplicationContextRunner runner = new ApplicationContextRunner() .withUserConfiguration(EnableDaprClientProperties.class); @@ -120,8 +119,6 @@ public void shouldMapDaprClientPropertiesCamelCase() { }); } - - @EnableConfigurationProperties(DaprClientProperties.class) static class EnableDaprClientProperties {