Try to fix one more time after conflicts (#1053)

artur-ciocanu · Artur Ciocanu · web-flow · commit 48364b1f6552 · 2024-06-25T13:22:26.000-07:00
Signed-off-by: Artur Ciocanu &lt;ciocanu@adobe.com&gt;
Co-authored-by: Artur Ciocanu &lt;ciocanu@adobe.com&gt;
diff --git a/examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java b/examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java
@@ -26,7 +26,7 @@
  * mvn clean install
  * 2. cd to [repo-root]/examples
  * 3. Run the client:
- * dapr run --components-path ./components/actors --app-id demoactorclient -- java -jar \
+ * dapr run --resources-path ./components/actors --app-id demoactorclient -- java -jar \
  * target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorClient
  */
 public class DemoActorClient {
diff --git a/examples/src/main/java/io/dapr/examples/actors/DemoActorService.java b/examples/src/main/java/io/dapr/examples/actors/DemoActorService.java
@@ -28,7 +28,7 @@
  * mvn clean install
  * 2. cd to [repo-root]/examples
  * 3. Run the server:
- * dapr run --components-path ./components/actors --app-id demoactorservice --app-port 3000 \
+ * dapr run --resources-path ./components/actors --app-id demoactorservice --app-port 3000 \
  *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorService -p 3000
  */
 public class DemoActorService {
diff --git a/examples/src/main/java/io/dapr/examples/actors/README.md b/examples/src/main/java/io/dapr/examples/actors/README.md
@@ -171,7 +171,7 @@ timeout_seconds: 90
 
 Now, execute the following script in order to run DemoActorService:
 ```sh
-dapr run --components-path ./components/actors --app-id demoactorservice --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorService -p 3000
+dapr run --resources-path ./components/actors --app-id demoactorservice --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorService -p 3000
 ```
 <!-- END_STEP -->
 ### Running the Actor client
@@ -252,7 +252,7 @@ timeout_seconds: 45
 
 
 ```sh
-dapr run --components-path ./components/actors --app-id demoactorclient -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorClient
+dapr run --resources-path ./components/actors --app-id demoactorclient -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorClient
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/bindings/http/InputBindingExample.java b/examples/src/main/java/io/dapr/examples/bindings/http/InputBindingExample.java
@@ -25,7 +25,7 @@
  * mvn clean install
  * 2. cd to [repo-root]/examples
  * 3. Run :
- * dapr run --components-path ./components/bindings --app-id inputbinding --app-port 3000 \
+ * dapr run --resources-path ./components/bindings --app-id inputbinding --app-port 3000 \
  *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.InputBindingExample -p 3000
  */
 public class InputBindingExample {
diff --git a/examples/src/main/java/io/dapr/examples/bindings/http/OutputBindingExample.java b/examples/src/main/java/io/dapr/examples/bindings/http/OutputBindingExample.java
@@ -22,7 +22,7 @@
  * mvn clean install
  * 2. cd to [repo-root]/examples
  * 3. Run the program:
- * dapr run --components-path ./components/bindings --app-id outputbinding \
+ * dapr run --resources-path ./components/bindings --app-id outputbinding \
  *   -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.OutputBindingExample
  */
 public class OutputBindingExample {
diff --git a/examples/src/main/java/io/dapr/examples/bindings/http/README.md b/examples/src/main/java/io/dapr/examples/bindings/http/README.md
@@ -125,7 +125,7 @@ sleep: 10
 -->
 
 ```bash
-dapr run --components-path ./components/bindings --app-id inputbinding --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.InputBindingExample -p 3000
+dapr run --resources-path ./components/bindings --app-id inputbinding --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.InputBindingExample -p 3000
 ```
 
 <!-- END_STEP -->
@@ -195,7 +195,7 @@ sleep: 30
 -->
 
 ```bash
-dapr run --components-path ./components/bindings --app-id outputbinding -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.OutputBindingExample
+dapr run --resources-path ./components/bindings --app-id outputbinding -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.OutputBindingExample
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/configuration/README.md b/examples/src/main/java/io/dapr/examples/configuration/README.md
@@ -158,7 +158,7 @@ sleep: 10
 -->
 
 ```bash
-dapr run --components-path ./components/configuration --app-id configgrpc --log-level debug -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.configuration.ConfigurationClient
+dapr run --resources-path ./components/configuration --app-id configgrpc --log-level debug -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.configuration.ConfigurationClient
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/lock/README.md b/examples/src/main/java/io/dapr/examples/lock/README.md
@@ -58,7 +58,7 @@ sleep: 5
 -->
 
 ```bash
-dapr run --components-path ./components/lock --app-id lockgrpc --log-level debug -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.lock.DistributedLockGrpcClient
+dapr run --resources-path ./components/lock --app-id lockgrpc --log-level debug -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.lock.DistributedLockGrpcClient
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/BulkPublisher.java b/examples/src/main/java/io/dapr/examples/pubsub/BulkPublisher.java
@@ -36,7 +36,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. Run the program:
- * dapr run --components-path ./components/pubsub --app-id bulk-publisher -- \
+ * dapr run --resources-path ./components/pubsub --app-id bulk-publisher -- \
  * java -Ddapr.grpc.port="50010" -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.BulkPublisher
  */
 public class BulkPublisher {
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/CloudEventBulkPublisher.java b/examples/src/main/java/io/dapr/examples/pubsub/CloudEventBulkPublisher.java
@@ -33,7 +33,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. Run the program:
- * dapr run --components-path ./components/pubsub --app-id publisher -- \
+ * dapr run --resources-path ./components/pubsub --app-id publisher -- \
  * java -Ddapr.grpc.port="50010" \
  * -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.CloudEventBulkPublisher
  */
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/CloudEventPublisher.java b/examples/src/main/java/io/dapr/examples/pubsub/CloudEventPublisher.java
@@ -29,7 +29,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. Run the program:
- * dapr run --components-path ./components/pubsub --app-id publisher -- \
+ * dapr run --resources-path ./components/pubsub --app-id publisher -- \
  *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.CloudEventPublisher
  */
 public class CloudEventPublisher {
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/Publisher.java b/examples/src/main/java/io/dapr/examples/pubsub/Publisher.java
@@ -25,7 +25,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. Run the program:
- * dapr run --components-path ./components/pubsub --app-id publisher -- \
+ * dapr run --resources-path ./components/pubsub --app-id publisher -- \
  *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher
  */
 public class Publisher {
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/PublisherWithTracing.java b/examples/src/main/java/io/dapr/examples/pubsub/PublisherWithTracing.java
@@ -30,7 +30,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. Run the program:
- * dapr run --components-path ./components/pubsub --app-id publisher-tracing -- \
+ * dapr run --resources-path ./components/pubsub --app-id publisher-tracing -- \
  * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.PublisherWithTracing
  */
 public class PublisherWithTracing {
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/README.md b/examples/src/main/java/io/dapr/examples/pubsub/README.md
@@ -120,7 +120,7 @@ sleep: 15
 -->
 
 ```bash
-dapr run --components-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher
+dapr run --resources-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher
 ```
 
 <!-- END_STEP -->
@@ -322,7 +322,7 @@ background: true
 -->
 
 ```bash
-dapr run --components-path ./components/pubsub --app-id bulk-publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.BulkPublisher
+dapr run --resources-path ./components/pubsub --app-id bulk-publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.BulkPublisher
 ```
 <!-- END_STEP -->
 
@@ -391,7 +391,7 @@ background: true
 -->
 
 ```bash
-dapr run --components-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher testingtopicbulk
+dapr run --resources-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher testingtopicbulk
 ```
 
 <!-- END_STEP -->
@@ -520,7 +520,7 @@ sleep: 15
 -->
 
 ```bash
-dapr run --components-path ./components/pubsub --app-id subscriber --app-port 3000 --app-protocol http -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Subscriber -p 3000
+dapr run --resources-path ./components/pubsub --app-id subscriber --app-port 3000 --app-protocol http -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Subscriber -p 3000
 ```
 
 <!-- END_STEP -->
@@ -638,7 +638,7 @@ dapr stop --app-id subscriber
 
 
 // start a grpc subscriber
-dapr run --components-path ./components/pubsub --app-id subscriber --app-port 3000 --app-protocol grpc -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.grpc.Subscriber -p 3000
+dapr run --resources-path ./components/pubsub --app-id subscriber --app-port 3000 --app-protocol grpc -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.grpc.Subscriber -p 3000
 ```
 <!-- END_STEP -->
 
@@ -654,7 +654,7 @@ sleep: 15
 -->
 
 ```bash
-dapr run --components-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher
+dapr run --resources-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher
 ```
 
 <!-- END_STEP -->
@@ -685,7 +685,7 @@ background: true
 -->
 
 ```bash
-dapr run --components-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher testingtopicbulk
+dapr run --resources-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher testingtopicbulk
 ```
 
 <!-- END_STEP -->
@@ -754,7 +754,7 @@ sleep: 15
 -->
 
 ```bash
-dapr run --components-path ./components/pubsub --app-id publisher-tracing -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.PublisherWithTracing
+dapr run --resources-path ./components/pubsub --app-id publisher-tracing -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.PublisherWithTracing
 ```
 
 <!-- END_STEP -->
@@ -783,12 +783,12 @@ mvn install
 
 Run the publisher app:
 ```sh
-dapr run --components-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher
+dapr run --resources-path ./components/pubsub --app-id publisher -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher
 ```
 
 Wait until all 10 messages are published like before, then wait for a few more seconds and run the subscriber app:
 ```sh
-dapr run --components-path ./components/pubsub --app-id subscriber --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Subscriber -p 3000
+dapr run --resources-path ./components/pubsub --app-id subscriber --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Subscriber -p 3000
 ```
 
 No message is consumed by the subscriber app and warnings messages are emitted from Dapr sidecar:
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/grpc/Subscriber.java b/examples/src/main/java/io/dapr/examples/pubsub/grpc/Subscriber.java
@@ -27,7 +27,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. Run the server:
- * dapr run --components-path ./components/pubsub --app-id subscriber --app-port 3000 -- \
+ * dapr run --resources-path ./components/pubsub --app-id subscriber --app-port 3000 -- \
  *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.grpc.Subscriber -p 3000
  */
 public class Subscriber {
diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/Subscriber.java b/examples/src/main/java/io/dapr/examples/pubsub/http/Subscriber.java
@@ -25,7 +25,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. Run the server:
- * dapr run --components-path ./components/pubsub --app-id subscriber --app-port 3000 -- \
+ * dapr run --resources-path ./components/pubsub --app-id subscriber --app-port 3000 -- \
  *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Subscriber -p 3000
  */
 public class Subscriber {
diff --git a/examples/src/main/java/io/dapr/examples/querystate/QuerySavedState.java b/examples/src/main/java/io/dapr/examples/querystate/QuerySavedState.java
@@ -34,7 +34,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. send a message to be saved as state:
- * dapr run --components-path ./components/state -- \
+ * dapr run --resources-path ./components/state -- \
  *   java -Ddapr.api.protocol=HTTP -jar target/dapr-java-sdk-examples-exec.jar \
  *   io.dapr.examples.querystate.QuerySavedState 'my message'
  */
diff --git a/examples/src/main/java/io/dapr/examples/querystate/README.md b/examples/src/main/java/io/dapr/examples/querystate/README.md
@@ -260,7 +260,7 @@ sleep: 10
 
 Run this example with the following command:
 ```bash
-dapr run --components-path ./components/state --app-id query-state-example -H 3600 -- java -Ddapr.api.protocol=HTTP -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.querystate.QuerySavedState
+dapr run --resources-path ./components/state --app-id query-state-example -H 3600 -- java -Ddapr.api.protocol=HTTP -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.querystate.QuerySavedState
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/secrets/README.md b/examples/src/main/java/io/dapr/examples/secrets/README.md
@@ -123,7 +123,7 @@ sleep: 5
 -->
 
 ```bash
-dapr run --components-path ./components/secrets --app-id secrets1 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient localSecretStore redisPassword randomKey
+dapr run --resources-path ./components/secrets --app-id secrets1 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient localSecretStore redisPassword randomKey
 ```
 
 <!-- END_STEP -->
@@ -176,7 +176,7 @@ sleep: 5
 -->
 
 ```sh
-dapr run --components-path ./components/secrets --config ./src/main/java/io/dapr/examples/secrets/config.yaml --app-id secrets2 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient localSecretStore redisPassword randomKey
+dapr run --resources-path ./components/secrets --config ./src/main/java/io/dapr/examples/secrets/config.yaml --app-id secrets2 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient localSecretStore redisPassword randomKey
 ```
 
 <!-- END_STEP --> 
diff --git a/examples/src/main/java/io/dapr/examples/secrets/SecretClient.java b/examples/src/main/java/io/dapr/examples/secrets/SecretClient.java
@@ -25,7 +25,7 @@
  * 2. cd to [repo-root]/examples
  * 3. Creating a JSON secret file that contains two keys: redisPassword and randomKey locally:
  * 4. Read secret from example:
- * dapr run --components-path ./components/secrets -- \
+ * dapr run --resources-path ./components/secrets -- \
  * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient \
  * localSecretStore redisPassword randomKey
  */
diff --git a/examples/src/main/java/io/dapr/examples/state/README.md b/examples/src/main/java/io/dapr/examples/state/README.md
@@ -179,7 +179,7 @@ sleep: 5
 
 Run this example with the following command:
 ```bash
-dapr run --components-path ./components/state --app-id state-example -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
+dapr run --resources-path ./components/state --app-id state-example -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
 ```
 
 <!-- END_STEP -->
diff --git a/examples/src/main/java/io/dapr/examples/state/StateClient.java b/examples/src/main/java/io/dapr/examples/state/StateClient.java
@@ -30,7 +30,7 @@
  * mvn clean install
  * 2. cd [repo root]/examples
  * 3. send a message to be saved as state:
- * dapr run --components-path ./components/state -- \
+ * dapr run --resources-path ./components/state -- \
  *   java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
  */
 public class StateClient {
diff --git a/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldGrpcStateService.java b/sdk-tests/src/test/java/io/dapr/it/state/HelloWorldGrpcStateService.java
@@ -27,7 +27,7 @@
  * Simple example.
  * To run manually, from repo root:
  * 1. mvn clean install
- * 2. dapr run --components-path ./components --dapr-grpc-port 50001 -- mvn exec:java -Dexec.mainClass=io.dapr.it.state.HelloWorldGrpcStateService -Dexec.classpathScope="test"  -pl=sdk
+ * 2. dapr run --resources-path ./components --dapr-grpc-port 50001 -- mvn exec:java -Dexec.mainClass=io.dapr.it.state.HelloWorldGrpcStateService -Dexec.classpathScope="test"  -pl=sdk
  */
 public class HelloWorldGrpcStateService {
 
