Merge branch 'master' of https://github.com/siri-varma/java-sdk

Author: siri-varma

.github/workflows/build.yml

@@ -39,7 +39,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.15.4
+      DAPR_RUNTIME_VER: 1.15.7
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
@@ -191,3 +191,4 @@ jobs:
           export GPG_TTY=$(tty)
           gpg --batch --import private-key.gpg
           ./mvnw -V -B -Dgpg.skip=false -s settings.xml deploy
+          curl -X POST https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/io.dapr

.github/workflows/validate.yml

@@ -38,7 +38,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.15.4
+      DAPR_RUNTIME_VER: 1.15.7
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:

dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/ClientPropertiesDaprConnectionDetails.java

@@ -40,4 +40,10 @@ public Integer getHttpPort() {
   public Integer getGrpcPort() {
     return this.daprClientProperties.getGrpcPort();
   }
+
+  @Override
+  public String getApiToken() {
+    return this.daprClientProperties.getApiToken();
+  }
+
 }

dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientAutoConfiguration.java

@@ -68,6 +68,11 @@ DaprClientBuilder daprClientBuilder(DaprConnectionDetails daprConnectionDetails)
       builder.withPropertyOverride(Properties.GRPC_PORT, String.valueOf(grpcPort));
     }
 
+    String apiToken = daprConnectionDetails.getApiToken();
+    if (apiToken != null) {
+      builder.withPropertyOverride(Properties.API_TOKEN, apiToken);
+    }
+
     return builder;
   }
 
@@ -145,6 +150,11 @@ protected Properties createPropertiesFromConnectionDetails(DaprConnectionDetails
       propertyOverrides.put(Properties.GRPC_PORT.getName(), String.valueOf(grpcPort));
     }
 
+    String apiToken = daprConnectionDetails.getApiToken();
+    if (apiToken != null) {
+      propertyOverrides.put(Properties.API_TOKEN.getName(), apiToken);
+    }
+
     return new Properties(propertyOverrides);
   }
 

dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientProperties.java

@@ -13,7 +13,6 @@
 
 package io.dapr.spring.boot.autoconfigure.client;
 
-import io.dapr.spring.data.DaprKeyValueAdapterResolver;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "dapr.client")
@@ -22,6 +21,7 @@ public class DaprClientProperties {
   private String grpcEndpoint;
   private Integer httpPort;
   private Integer grpcPort;
+  private String apiToken;
 
   /**
    * Constructs a {@link DaprClientProperties}.
@@ -35,12 +35,15 @@ public DaprClientProperties() {
    * @param grpcEndpoint grpc endpoint to interact with the Dapr Sidecar
    * @param httpPort http port to interact with the Dapr Sidecar
    * @param grpcPort grpc port to interact with the Dapr Sidecar
+   * @param apiToken dapr API token to interact with the Dapr Sidecar
    */
-  public DaprClientProperties(String httpEndpoint, String grpcEndpoint, Integer httpPort, Integer grpcPort) {
+  public DaprClientProperties(String httpEndpoint, String grpcEndpoint, Integer httpPort, Integer grpcPort,
+                              String apiToken) {
     this.httpEndpoint = httpEndpoint;
     this.grpcEndpoint = grpcEndpoint;
     this.httpPort = httpPort;
     this.grpcPort = grpcPort;
+    this.apiToken = apiToken;
   }
 
   public String getHttpEndpoint() {
@@ -74,4 +77,12 @@ public void setHttpPort(Integer httpPort) {
   public void setGrpcPort(Integer grpcPort) {
     this.grpcPort = grpcPort;
   }
+
+  public String getApiToken() {
+    return apiToken;
+  }
+
+  public void setApiToken(String apiToken) {
+    this.apiToken = apiToken;
+  }
 }

dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprConnectionDetails.java

@@ -25,4 +25,6 @@ public interface DaprConnectionDetails extends ConnectionDetails {
 
   Integer getGrpcPort();
 
+  String getApiToken();
+
 }

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

@@ -31,14 +31,15 @@ public class DaprClientPropertiesTest {
   public void shouldCreateDaprClientPropertiesCorrectly() {
 
     DaprClientProperties properties = new DaprClientProperties(
-        "http://localhost", "localhost", 3500, 50001
+        "http://localhost", "localhost", 3500, 50001, "ABC"
     );
 
     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);
+      softly.assertThat(properties.getApiToken()).isEqualTo("ABC");
     });
   }
 
@@ -52,12 +53,14 @@ public void shouldSetDaprClientPropertiesCorrectly() {
     properties.setGrpcPort(50001);
     properties.setHttpEndpoint("http://localhost");
     properties.setHttpPort(3500);
+    properties.setApiToken("ABC");
 
     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()).isEqualTo("ABC");
     });
   }
 

dapr-spring/dapr-spring-boot-tests/src/main/java/io/dapr/spring/boot/testcontainers/service/connection/DaprContainerConnectionDetailsFactory.java

@@ -54,5 +54,13 @@ public Integer getHttpPort() {
     public Integer getGrpcPort() {
       return getContainer().getGrpcPort();
     }
+
+    /*
+     * No API Token for local container
+     */
+    @Override
+    public String getApiToken() {
+      return "";
+    }
   }
 }

daprdocs/content/en/java-sdk-contributing/java-contributing.md

@@ -12,14 +12,14 @@ When contributing to the [Java SDK](https://github.com/dapr/java-sdk) the follow
 
 The `examples` directory contains code samples for users to run to try out specific functionality of the various Java SDK packages and extensions. When writing new and updated samples keep in mind:
 
-- All examples should be runnable on Windows, Linux, and MacOS. While Java code is consistent among operating systems, any pre/post example commands should provide options through [codetabs]({{< ref "contributing-docs.md#tabbed-content" >}})
+- All examples should be runnable on Windows, Linux, and MacOS. While Java code is consistent among operating systems, any pre/post example commands should provide options through [tabpane]({{% ref "contributing-docs.md#tabbed-content" %}})
 - Contain steps to download/install any required pre-requisites. Someone coming in with a fresh OS install should be able to start on the example and complete it without an error. Links to external download pages are fine.
 
 ## Docs
 
 The `daprdocs` directory contains the markdown files that are rendered into the [Dapr Docs](https://docs.dapr.io) website. When the documentation website is built, this repo is cloned and configured so that its contents are rendered with the docs content. When writing docs, keep in mind:
 
-   - All rules in the [docs guide]({{< ref contributing-docs.md >}}) should be followed in addition to these.
+   - All rules in the [docs guide]({{% ref contributing-docs.md %}}) should be followed in addition to these.
    - All files and directories should be prefixed with `java-` to ensure all file/directory names are globally unique across all Dapr documentation.
 
 ## Github Dapr Bot Commands

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

@@ -15,8 +15,8 @@ Dapr offers a variety of packages to help with the development of Java applicati
 
 ## Prerequisites
 
-- [Dapr CLI]({{< ref install-dapr-cli.md >}}) installed
-- Initialized [Dapr environment]({{< ref install-dapr-selfhost.md >}})
+- [Dapr CLI]({{% ref install-dapr-cli.md %}}) installed
+- Initialized [Dapr environment]({{% ref install-dapr-selfhost.md %}})
 - JDK 11 or above - the published jars are compatible with Java 8:
     - [AdoptOpenJDK 11 - LTS](https://adoptopenjdk.net/)
     - [Oracle's JDK 15](https://www.oracle.com/java/technologies/javase-downloads.html)
@@ -30,9 +30,9 @@ Dapr offers a variety of packages to help with the development of Java applicati
 
 Next, import the Java SDK packages to get started. Select your preferred build tool to learn how to import.
 
-{{< tabs Maven Gradle >}}
+{{< tabpane text=true >}}
 
-{{% codetab %}}
+{{% tab header="Maven" %}}
 <!--Maven-->
 
 For a Maven project, add the following to your `pom.xml` file: 
@@ -65,9 +65,9 @@ For a Maven project, add the following to your `pom.xml` file:
   ...
 </project>
 ```
-{{% /codetab %}}
+{{% /tab %}}
 
-{{% codetab %}}
+{{% tab header="Gradle" %}}
 <!--Gradle-->
 
 For a Gradle project, add the following to your `build.gradle` file:
@@ -84,9 +84,9 @@ dependencies {
 }
 ```
 
-{{% /codetab %}}
+{{% /tab %}}
 
-{{< /tabs >}}
+{{< /tabpane >}}
 
 If you are also using Spring Boot, you may run into a common issue where the `OkHttp` version that the Dapr SDK uses conflicts with the one specified in the Spring Boot _Bill of Materials_.
 
@@ -106,7 +106,7 @@ Put the Dapr Java SDK to the test. Walk through the Java quickstarts and tutoria
 
 | SDK samples | Description |
 | ----------- | ----------- |
-| [Quickstarts]({{< ref quickstarts >}}) | Experience Dapr's API building blocks in just a few minutes using the Java SDK. |
+| [Quickstarts]({{% ref quickstarts %}}) | Experience Dapr's API building blocks in just a few minutes using the Java SDK. |
 | [SDK samples](https://github.com/dapr/java-sdk/tree/master/examples) | Clone the SDK repo to try out some examples and get started. |
 
 ```java
@@ -122,7 +122,7 @@ try (DaprClient client = (new DaprClientBuilder()).build()) {
 }
 ```
 
-- For a full guide on output bindings visit [How-To: Output bindings]({{< ref howto-bindings.md >}}).
+- For a full guide on output bindings visit [How-To: Output bindings]({{% ref howto-bindings.md %}}).
 - Visit [Java SDK examples](https://github.com/dapr/java-sdk/tree/master/examples/src/main/java/io/dapr/examples/bindings/http) for code samples and instructions to try out output bindings.
 
 ## Available packages
@@ -132,14 +132,14 @@ try (DaprClient client = (new DaprClientBuilder()).build()) {
     <div class="card-body">
       <h5 class="card-title"><b>Client</b></h5>
       <p class="card-text">Create Java clients that interact with a Dapr sidecar and other Dapr applications.</p>
-      <a href="{{< ref java-client >}}" class="stretched-link"></a>
+      <a href="{{% ref java-client %}}" class="stretched-link"></a>
     </div>
   </div>
   <div class="card">
     <div class="card-body">
       <h5 class="card-title"><b>Workflow</b></h5>
       <p class="card-text">Create and manage workflows that work with other Dapr APIs in Java.</p>
-      <a href="{{< ref workflow >}}" class="stretched-link"></a>
+      <a href="{{% ref workflow %}}" class="stretched-link"></a>
     </div>
   </div>
 </div>