dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Artur Ciocanu <ciocanu@adobe.com>
Co-authored-by: Artur Ciocanu <ciocanu@adobe.com>
This commit is contained in:
artur-ciocanu 2024-06-25 13:22:26 -07:00 committed by GitHub
parent 7e09841b4a
commit 48364b1f65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java
View File

@ -26,7 +26,7 @@ import java.util.List;
* mvn clean install * mvn clean install
* 2. cd to [repo-root]/examples * 2. cd to [repo-root]/examples
* 3. Run the client: * 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 * target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorClient
*/ */
public class DemoActorClient { public class DemoActorClient {

2
examples/src/main/java/io/dapr/examples/actors/DemoActorService.java
View File

@ -28,7 +28,7 @@ import java.time.Duration;
* mvn clean install * mvn clean install
* 2. cd to [repo-root]/examples * 2. cd to [repo-root]/examples
* 3. Run the server: * 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 * -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorService -p 3000
*/ */
public class DemoActorService { public class DemoActorService {

4
examples/src/main/java/io/dapr/examples/actors/README.md
View File

@ -171,7 +171,7 @@ timeout_seconds: 90
Now, execute the following script in order to run DemoActorService: Now, execute the following script in order to run DemoActorService:
```sh ```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 --> <!-- END_STEP -->
### Running the Actor client ### Running the Actor client
@ -252,7 +252,7 @@ timeout_seconds: 45
```sh ```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 --> <!-- END_STEP -->

2
examples/src/main/java/io/dapr/examples/bindings/http/InputBindingExample.java
View File

@ -25,7 +25,7 @@ import org.apache.commons.cli.Options;
* mvn clean install * mvn clean install
* 2. cd to [repo-root]/examples * 2. cd to [repo-root]/examples
* 3. Run : * 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 * -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.InputBindingExample -p 3000
*/ */
public class InputBindingExample { public class InputBindingExample {

2
examples/src/main/java/io/dapr/examples/bindings/http/OutputBindingExample.java
View File

@ -22,7 +22,7 @@ import io.dapr.client.DaprClientBuilder;
* mvn clean install * mvn clean install
* 2. cd to [repo-root]/examples * 2. cd to [repo-root]/examples
* 3. Run the program: * 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 * -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.bindings.http.OutputBindingExample
*/ */
public class OutputBindingExample { public class OutputBindingExample {

4
examples/src/main/java/io/dapr/examples/bindings/http/README.md
View File

@ -125,7 +125,7 @@ sleep: 10
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -195,7 +195,7 @@ sleep: 30
--> -->
```bash ```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 --> <!-- END_STEP -->

2
examples/src/main/java/io/dapr/examples/configuration/README.md
View File

@ -158,7 +158,7 @@ sleep: 10
--> -->
```bash ```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 --> <!-- END_STEP -->

2
examples/src/main/java/io/dapr/examples/lock/README.md
View File

@ -58,7 +58,7 @@ sleep: 5
--> -->
```bash ```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 --> <!-- END_STEP -->

2
examples/src/main/java/io/dapr/examples/pubsub/BulkPublisher.java
View File

@ -36,7 +36,7 @@ import static io.dapr.examples.OpenTelemetryConfig.getReactorContext;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. Run the program: * 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 * java -Ddapr.grpc.port="50010" -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.BulkPublisher
*/ */
public class BulkPublisher { public class BulkPublisher {

2
examples/src/main/java/io/dapr/examples/pubsub/CloudEventBulkPublisher.java
View File

@ -33,7 +33,7 @@ import java.util.UUID;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. Run the program: * 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" \ * java -Ddapr.grpc.port="50010" \
* -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.CloudEventBulkPublisher * -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.CloudEventBulkPublisher
*/ */

2
examples/src/main/java/io/dapr/examples/pubsub/CloudEventPublisher.java
View File

@ -29,7 +29,7 @@ import static java.util.Collections.singletonMap;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. Run the program: * 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 * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.CloudEventPublisher
*/ */
public class CloudEventPublisher { public class CloudEventPublisher {

2
examples/src/main/java/io/dapr/examples/pubsub/Publisher.java
View File

@ -25,7 +25,7 @@ import static java.util.Collections.singletonMap;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. Run the program: * 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 * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.Publisher
*/ */
public class Publisher { public class Publisher {

2
examples/src/main/java/io/dapr/examples/pubsub/PublisherWithTracing.java
View File

@ -30,7 +30,7 @@ import static io.dapr.examples.OpenTelemetryConfig.getReactorContext;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. Run the program: * 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 * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.PublisherWithTracing
*/ */
public class PublisherWithTracing { public class PublisherWithTracing {

20
examples/src/main/java/io/dapr/examples/pubsub/README.md
View File

@ -120,7 +120,7 @@ sleep: 15
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -322,7 +322,7 @@ background: true
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -391,7 +391,7 @@ background: true
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -520,7 +520,7 @@ sleep: 15
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -638,7 +638,7 @@ dapr stop --app-id subscriber
// start a grpc 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 --> <!-- END_STEP -->
@ -654,7 +654,7 @@ sleep: 15
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -685,7 +685,7 @@ background: true
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -754,7 +754,7 @@ sleep: 15
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -783,12 +783,12 @@ mvn install
Run the publisher app: Run the publisher app:
```sh ```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: Wait until all 10 messages are published like before, then wait for a few more seconds and run the subscriber app:
```sh ```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: No message is consumed by the subscriber app and warnings messages are emitted from Dapr sidecar:

2
examples/src/main/java/io/dapr/examples/pubsub/grpc/Subscriber.java
View File

@ -27,7 +27,7 @@ import org.apache.commons.cli.Options;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. Run the server: * 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 * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.grpc.Subscriber -p 3000
*/ */
public class Subscriber { public class Subscriber {

2
examples/src/main/java/io/dapr/examples/pubsub/http/Subscriber.java
View File

@ -25,7 +25,7 @@ import org.apache.commons.cli.Options;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. Run the server: * 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 * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.pubsub.http.Subscriber -p 3000
*/ */
public class Subscriber { public class Subscriber {

2
examples/src/main/java/io/dapr/examples/querystate/QuerySavedState.java
View File

@ -34,7 +34,7 @@ import java.util.Map;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. send a message to be saved as state: * 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 \ * java -Ddapr.api.protocol=HTTP -jar target/dapr-java-sdk-examples-exec.jar \
* io.dapr.examples.querystate.QuerySavedState 'my message' * io.dapr.examples.querystate.QuerySavedState 'my message'
*/ */

2
examples/src/main/java/io/dapr/examples/querystate/README.md
View File

@ -260,7 +260,7 @@ sleep: 10
Run this example with the following command: Run this example with the following command:
```bash ```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 --> <!-- END_STEP -->

4
examples/src/main/java/io/dapr/examples/secrets/README.md
View File

@ -123,7 +123,7 @@ sleep: 5
--> -->
```bash ```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 --> <!-- END_STEP -->
@ -176,7 +176,7 @@ sleep: 5
--> -->
```sh ```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 --> <!-- END_STEP -->

2
examples/src/main/java/io/dapr/examples/secrets/SecretClient.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
* 2. cd to [repo-root]/examples * 2. cd to [repo-root]/examples
* 3. Creating a JSON secret file that contains two keys: redisPassword and randomKey locally: * 3. Creating a JSON secret file that contains two keys: redisPassword and randomKey locally:
* 4. Read secret from example: * 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 \ * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.secrets.SecretClient \
* localSecretStore redisPassword randomKey * localSecretStore redisPassword randomKey
*/ */

2
examples/src/main/java/io/dapr/examples/state/README.md
View File

@ -179,7 +179,7 @@ sleep: 5
Run this example with the following command: Run this example with the following command:
```bash ```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 --> <!-- END_STEP -->

2
examples/src/main/java/io/dapr/examples/state/StateClient.java
View File

@ -30,7 +30,7 @@ import java.util.List;
* mvn clean install * mvn clean install
* 2. cd [repo root]/examples * 2. cd [repo root]/examples
* 3. send a message to be saved as state: * 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' * java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.state.StateClient 'my message'
*/ */
public class StateClient { public class StateClient {

2
sdk-tests/src/test/java/io/dapr/it/state/HelloWorldGrpcStateService.java
View File

@ -27,7 +27,7 @@ import io.grpc.ManagedChannelBuilder;
* Simple example. * Simple example.
* To run manually, from repo root: * To run manually, from repo root:
* 1. mvn clean install * 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 { public class HelloWorldGrpcStateService {