Merge branch 'master' into dependabot/github_actions/actions/checkout-3

dapr · Dec 5, 2022 · 66d04e0 · 66d04e0
2 parents 8a13d47 + 7593b0e
commit 66d04e0
Show file tree

Hide file tree

Showing 674 changed files with 2,192 additions and 2,018 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,9 +25,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.9.0-rc.2
-      DAPR_RUNTIME_VER: 1.9.0-rc.3
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.0-rc.2/install/install.sh
+      DAPR_CLI_VER: 1.9.1
+      DAPR_RUNTIME_VER: 1.9.3
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.1/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
     steps:

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -36,9 +36,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.9.0-rc.2
-      DAPR_RUNTIME_VER: 1.9.0-rc.3
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.0-rc.2/install/install.sh
+      DAPR_CLI_VER: 1.9.1
+      DAPR_RUNTIME_VER: 1.9.3
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.1/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
     steps:

diff --git a/README.md b/README.md
@@ -52,19 +52,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     ...
   </dependencies>
@@ -78,11 +78,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.7.0')
+    compile('io.dapr:dapr-sdk:1.7.1')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.7.0')
+    compile('io.dapr:dapr-sdk-actors:1.7.1')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.7.0')
+    compile('io.dapr:dapr-sdk-springboot:1.7.1')
 }
 ```
 
@@ -191,17 +191,20 @@ Most exceptions thrown from the SDK are instances of `DaprException`. `DaprExcep
 
 ## Development
 
-### Update proto files
+### Update URL to fetch proto files
 
-Change the properties below in [pom.xml](./pom.xml) to point to the desired reference URL in Git. Avoid pointing to `master` branch since it can change over time and create unpredictable behavior in the build.
+Change the `dapr.proto.baseurl` property below in [pom.xml](./pom.xml) to point to the URL for the desired commit hash in Git if you need to target a proto file that is not been merged into master yet. 
+Note: You may need to run `mvn clean` after changing this setting to remove any auto-generated files so that the new proto files get downloaded and compiled.
 
 ```xml
 <project>
   ...
   <properties>
     ...
-    <dapr.proto.url>https://raw.githubusercontent.com/dapr/dapr/v1.0.0/pkg/proto/dapr/dapr.proto</dapr.proto.url>
-    <dapr.client.proto.url>https://raw.githubusercontent.com/dapr/dapr/v1.0.0/pkg/proto/daprclient/daprclient.proto</dapr.client.proto.url>
+    <!-- change this .... -->
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/(current ref in pom.xml)/dapr/proto</dapr.proto.baseurl>
+    <!-- to something like this: -->
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/1ac5d0e8590a7d6772c9957c236351ed992ccb19/dapr/proto</dapr.proto.baseurl>
     ...
   </properties>
   ...

diff --git a/daprdocs/content/en/java-sdk-docs/_index.md b/daprdocs/content/en/java-sdk-docs/_index.md
@@ -31,19 +31,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     ...
   </dependencies>
@@ -57,11 +57,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.7.0')
+    compile('io.dapr:dapr-sdk:1.7.1')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.7.0')
+    compile('io.dapr:dapr-sdk-actors:1.7.1')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.7.0')
+    compile('io.dapr:dapr-sdk-springboot:1.7.1')
 }
 ```
 
@@ -292,13 +292,16 @@ try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient())
   // Get configuration for a single key
   Mono<ConfigurationItem> item = client.getConfiguration(CONFIG_STORE_NAME, CONFIG_KEY).block();
 
-// Get Configurations for multiple keys
-  Mono<List<ConfigurationItem>> items =
+  // Get configurations for multiple keys
+  Mono<Map<String, ConfigurationItem>> items =
           client.getConfiguration(CONFIG_STORE_NAME, CONFIG_KEY_1, CONFIG_KEY_2);
 
-  // Susbcribe to Confifuration changes
-  Flux<List<ConfigurationItem>> outFlux = client.subscribeToConfiguration(CONFIG_STORE_NAME, CONFIG_KEY_1, CONFIG_KEY_2);
+  // Subscribe to configuration changes
+  Flux<SubscribeConfigurationResponse> outFlux = client.subscribeConfiguration(CONFIG_STORE_NAME, CONFIG_KEY_1, CONFIG_KEY_2);
   outFlux.subscribe(configItems -> configItems.forEach(...));
+
+  // Unsubscribe from configuration changes
+  Mono<UnsubscribeConfigurationResponse> unsubscribe = client.unsubscribeConfiguration(SUBSCRIPTION_ID, CONFIG_STORE_NAME)
 }
 ```
 

diff --git a/daprdocs/content/en/java-sdk-docs/_index.mdbak b/daprdocs/content/en/java-sdk-docs/_index.mdbak
@@ -31,19 +31,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.7.0</version>
+      <version>1.7.1</version>
     </dependency>
     ...
   </dependencies>
@@ -57,11 +57,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.6.0')
+    compile('io.dapr:dapr-sdk:1.7.0')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.6.0')
+    compile('io.dapr:dapr-sdk-actors:1.7.0')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.6.0')
+    compile('io.dapr:dapr-sdk-springboot:1.7.0')
 }
 ```
 
@@ -72,7 +72,7 @@ You can fix this by specifying a compatible OkHttp version in your project to ma
 <dependency>
   <groupId>com.squareup.okhttp3</groupId>
   <artifactId>okhttp</artifactId>
-  <version>1.7.0</version>
+  <version>1.7.1</version>
 </dependency>
 ```
 

diff --git a/docs/allclasses-index.html b/docs/allclasses-index.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>All Classes (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>All Classes (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="class index">
 <meta name="generator" content="javadoc/AllClassesIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

diff --git a/docs/allpackages-index.html b/docs/allpackages-index.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>All Packages (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>All Packages (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="package index">
 <meta name="generator" content="javadoc/AllPackagesIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

diff --git a/docs/constant-values.html b/docs/constant-values.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>Constant Field Values (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>Constant Field Values (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="summary of constants">
 <meta name="generator" content="javadoc/ConstantsSummaryWriterImpl">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>Deprecated List (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>Deprecated List (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="deprecated elements">
 <meta name="generator" content="javadoc/DeprecatedListWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

diff --git a/docs/help-doc.html b/docs/help-doc.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>API Help (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>API Help (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="help">
 <meta name="generator" content="javadoc/HelpWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

diff --git a/docs/index-all.html b/docs/index-all.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>Index (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>Index (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="index">
 <meta name="generator" content="javadoc/IndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

diff --git a/docs/index.html b/docs/index.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>Overview (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>Overview (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="package index">
 <meta name="generator" content="javadoc/PackageIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
@@ -53,7 +53,7 @@
 <div class="flex-content">
 <main role="main">
 <div class="header">
-<h1 class="title">dapr-sdk-parent 1.7.0 API</h1>
+<h1 class="title">dapr-sdk-parent 1.7.1 API</h1>
 </div>
 <div id="all-packages-table">
 <div class="caption"><span>Packages</span></div>

diff --git a/docs/io/dapr/Rule.html b/docs/io/dapr/Rule.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>Rule (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>Rule (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="declaration: package: io.dapr, annotation type: Rule">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/io/dapr/Topic.html b/docs/io/dapr/Topic.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>Topic (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>Topic (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="declaration: package: io.dapr, annotation type: Topic">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/io/dapr/actors/ActorId.html b/docs/io/dapr/actors/ActorId.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>ActorId (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>ActorId (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="declaration: package: io.dapr.actors, class: ActorId">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">

diff --git a/docs/io/dapr/actors/ActorMethod.html b/docs/io/dapr/actors/ActorMethod.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>ActorMethod (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>ActorMethod (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="declaration: package: io.dapr.actors, annotation type: ActorMethod">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">

diff --git a/docs/io/dapr/actors/ActorTrace.html b/docs/io/dapr/actors/ActorTrace.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>ActorTrace (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>ActorTrace (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="declaration: package: io.dapr.actors, class: ActorTrace">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">

diff --git a/docs/io/dapr/actors/ActorType.html b/docs/io/dapr/actors/ActorType.html
@@ -2,11 +2,11 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
-<title>ActorType (dapr-sdk-parent 1.7.0 API)</title>
+<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
+<title>ActorType (dapr-sdk-parent 1.7.1 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="dc.created" content="2022-10-13">
+<meta name="dc.created" content="2022-11-14">
 <meta name="description" content="declaration: package: io.dapr.actors, annotation type: ActorType">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">