Merge branch 'master' of https://github.com/siri-varma/java-sdk into users/svegiraju/conversation-ai

Author: siri-varma

.github/scripts/update_sdk_version.sh

@@ -25,7 +25,7 @@ mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-workflows/pom.
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f testcontainers-dapr/pom.xml
 
 # dapr-spring
-mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f dapr-spring/pom.xml
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -DprocessDependencies=true -f dapr-spring/pom.xml
 
 # spring-boot-examples
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f spring-boot-examples/pom.xml

README.md

@@ -50,19 +50,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.14.2</version>
+      <version>1.15.0</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.14.2</version>
+      <version>1.15.0</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.14.2</version>
+      <version>1.15.0</version>
     </dependency>
     ...
   </dependencies>
@@ -76,11 +76,11 @@ For a Gradle project, add the following to your `build.gradle` file:
 dependencies {
 ...
     // Dapr's core SDK with all features, except Actors.
-    compile('io.dapr:dapr-sdk:1.14.2')
+    compile('io.dapr:dapr-sdk:1.15.0')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.14.2')
+    compile('io.dapr:dapr-sdk-actors:1.15.0')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.14.2')
+    compile('io.dapr:dapr-sdk-springboot:1.15.0')
 }
 ```
 

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

@@ -83,7 +83,26 @@ public void shouldMapDaprClientProperties() {
       });
 
     });
+  }
 
+  @Test
+  @DisplayName("Should map DaprClient properties correctly (camelCase)")
+  public void shouldMapDaprClientPropertiesCamelCase() {
+    runner.withSystemProperties(
+            "dapr.client.httpEndpoint=http://localhost",
+            "dapr.client.httpPort=3500",
+            "dapr.client.grpcEndpoint=localhost",
+            "dapr.client.grpcPort=50001"
+    ).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.getHttpPort()).isEqualTo(3500);
+        softly.assertThat(properties.getGrpcPort()).isEqualTo(50001);
+      });
+
+    });
   }
 
   @EnableConfigurationProperties(DaprClientProperties.class)

daprdocs/content/en/java-sdk-docs/_index.md

@@ -46,19 +46,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.14.2</version>
+      <version>1.15.0</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.14.2</version>
+      <version>1.15.0</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.14.2</version>
+      <version>1.15.0</version>
     </dependency>
     ...
   </dependencies>
@@ -76,11 +76,11 @@ For a Gradle project, add the following to your `build.gradle` file:
 dependencies {
 ...
     // Dapr's core SDK with all features, except Actors.
-    compile('io.dapr:dapr-sdk:1.14.2')
+    compile('io.dapr:dapr-sdk:1.15.0')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.14.2')
+    compile('io.dapr:dapr-sdk-actors:1.15.0')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.14.2')
+    compile('io.dapr:dapr-sdk-springboot:1.15.0')
 }
 ```
 
@@ -96,7 +96,7 @@ You can fix this by specifying a compatible `OkHttp` version in your project to
 <dependency>
   <groupId>com.squareup.okhttp3</groupId>
   <artifactId>okhttp</artifactId>
-  <version>1.14.2</version>
+  <version>1.15.0</version>
 </dependency>
 ```
 

daprdocs/content/en/java-sdk-docs/spring-boot/_index.md

@@ -26,12 +26,12 @@ If you already have a Spring Boot application, you can directly add the followin
 	<dependency>
         <groupId>io.dapr.spring</groupId>
 		<artifactId>dapr-spring-boot-starter</artifactId>
-		<version>0.14.2</version>
+		<version>0.15.0</version>
 	</dependency>
 	<dependency>
 		<groupId>io.dapr.spring</groupId>
 		<artifactId>dapr-spring-boot-starter-test</artifactId>
-		<version>0.14.2</version>
+		<version>0.15.0</version>
 		<scope>test</scope>
 	</dependency>
 ```
@@ -56,13 +56,13 @@ This will connect to the default Dapr gRPC endpoint `localhost:50001`, requiring
 {{% alert title="Note" color="primary" %}}
 By default, the following properties are preconfigured for `DaprClient` and `DaprWorkflowClient`:
 ```properties
-dapr.client.http-endpoint=http://localhost
-dapr.client.http-port=3500
-dapr.client.grpc-endpoint=localhost
-dapr.client.grpc-port=50001
-dapr.client.api-token=<Your Remote App API Token>
+dapr.client.httpEndpoint=http://localhost
+dapr.client.httpPort=3500
+dapr.client.grpcEndpoint=localhost
+dapr.client.grpcPort=50001
+dapr.client.apiToken=<your remote api token>
 ```
-These values are used by default, but you can override them in your `application.properties` file to suit your environment.
+These values are used by default, but you can override them in your `application.properties` file to suit your environment. Please note that both kebab case and camel case are supported.
 {{% /alert %}}
 
 You can use the `DaprClient` to interact with the Dapr APIs anywhere in your application, for example from inside a REST endpoint: