From 3f51e29dde7bc59d20dae83c40f084695edfb3ab Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Fri, 11 Dec 2020 13:54:23 -0800 Subject: [PATCH] Fix actor sample + remove HTTP reference in docs and code. (#407) * Fix actor sample + remove HTTP reference in docs and code. * Fix logging for IT. --- README.md | 2 +- .../java/io/dapr/examples/actors/{http => }/DemoActor.java | 2 +- .../dapr/examples/actors/{http => }/DemoActorClient.java | 6 +++--- .../io/dapr/examples/actors/{http => }/DemoActorImpl.java | 2 +- .../dapr/examples/actors/{http => }/DemoActorService.java | 7 +++---- .../main/java/io/dapr/examples/actors/{http => }/README.md | 4 ++-- .../java/io/dapr/it/actors/ActorReminderRecoveryIT.java | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) rename examples/src/main/java/io/dapr/examples/actors/{http => }/DemoActor.java (88%) rename examples/src/main/java/io/dapr/examples/actors/{http => }/DemoActorClient.java (93%) rename examples/src/main/java/io/dapr/examples/actors/{http => }/DemoActorImpl.java (96%) rename examples/src/main/java/io/dapr/examples/actors/{http => }/DemoActorService.java (88%) rename examples/src/main/java/io/dapr/examples/actors/{http => }/README.md (97%) diff --git a/README.md b/README.md index 9a8175ddd..604a17d29 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ Try the following examples to learn more about Dapr's Java SDK: * [State management](./examples/src/main/java/io/dapr/examples/state) * [PubSub with subscriber over Http](./examples/src/main/java/io/dapr/examples/pubsub/http) * [Binding with input over Http](./examples/src/main/java/io/dapr/examples/bindings/http) -* [Actors over Http](./examples/src/main/java/io/dapr/examples/actors/http) +* [Actors](./examples/src/main/java/io/dapr/examples/actors/) * [Secrets management](./examples/src/main/java/io/dapr/examples/secrets) * [Distributed tracing with OpenTelemetry SDK](./examples/src/main/java/io/dapr/examples/tracing) * [Exception handling](./examples/src/main/java/io/dapr/examples/exception) diff --git a/examples/src/main/java/io/dapr/examples/actors/http/DemoActor.java b/examples/src/main/java/io/dapr/examples/actors/DemoActor.java similarity index 88% rename from examples/src/main/java/io/dapr/examples/actors/http/DemoActor.java rename to examples/src/main/java/io/dapr/examples/actors/DemoActor.java index ad8d5d2f8..4396598b4 100644 --- a/examples/src/main/java/io/dapr/examples/actors/http/DemoActor.java +++ b/examples/src/main/java/io/dapr/examples/actors/DemoActor.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -package io.dapr.examples.actors.http; +package io.dapr.examples.actors; import io.dapr.actors.ActorMethod; import io.dapr.actors.ActorType; diff --git a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorClient.java b/examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java similarity index 93% rename from examples/src/main/java/io/dapr/examples/actors/http/DemoActorClient.java rename to examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java index 08bf9b343..e789d0cbf 100644 --- a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorClient.java +++ b/examples/src/main/java/io/dapr/examples/actors/DemoActorClient.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -package io.dapr.examples.actors.http; +package io.dapr.examples.actors; import io.dapr.actors.ActorId; import io.dapr.actors.client.ActorProxyBuilder; @@ -16,8 +16,8 @@ import java.util.List; * 1. Build and install jars: * mvn clean install * 2. Run the client: - * dapr run --components-path ./components --app-id demoactorclient --dapr-http-port 3006 -- java -jar \ - * target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.http.DemoActorClient + * dapr run --components-path ./components --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/http/DemoActorImpl.java b/examples/src/main/java/io/dapr/examples/actors/DemoActorImpl.java similarity index 96% rename from examples/src/main/java/io/dapr/examples/actors/http/DemoActorImpl.java rename to examples/src/main/java/io/dapr/examples/actors/DemoActorImpl.java index d99f5f589..f81d914d4 100644 --- a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorImpl.java +++ b/examples/src/main/java/io/dapr/examples/actors/DemoActorImpl.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -package io.dapr.examples.actors.http; +package io.dapr.examples.actors; import io.dapr.actors.ActorId; import io.dapr.actors.runtime.AbstractActor; diff --git a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorService.java b/examples/src/main/java/io/dapr/examples/actors/DemoActorService.java similarity index 88% rename from examples/src/main/java/io/dapr/examples/actors/http/DemoActorService.java rename to examples/src/main/java/io/dapr/examples/actors/DemoActorService.java index 7de0d20ef..fb89e2c5a 100644 --- a/examples/src/main/java/io/dapr/examples/actors/http/DemoActorService.java +++ b/examples/src/main/java/io/dapr/examples/actors/DemoActorService.java @@ -3,7 +3,7 @@ * Licensed under the MIT License. */ -package io.dapr.examples.actors.http; +package io.dapr.examples.actors; import io.dapr.actors.runtime.ActorRuntime; import io.dapr.springboot.DaprApplication; @@ -19,9 +19,8 @@ import java.time.Duration; * 1. Build and install jars: * mvn clean install * 2. Run the server: - * dapr run --components-path ./components --app-id demoactorservice --app-port 3000 --dapr-http-port 3005 \ - * -- java -jar target/dapr-java-sdk-examples-exec.jar \ - * io.dapr.examples.actors.http.DemoActorService -p 3000 + * dapr run --components-path ./components --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/http/README.md b/examples/src/main/java/io/dapr/examples/actors/README.md similarity index 97% rename from examples/src/main/java/io/dapr/examples/actors/http/README.md rename to examples/src/main/java/io/dapr/examples/actors/README.md index 611833886..a1cf0c4fe 100644 --- a/examples/src/main/java/io/dapr/examples/actors/http/README.md +++ b/examples/src/main/java/io/dapr/examples/actors/README.md @@ -128,7 +128,7 @@ The `@ActorType` annotation indicates the Dapr Java SDK that this interface is a Now, execute the following script in order to run DemoActorService: ```sh -dapr run --components-path ./components --app-id demoactorservice --app-port 3000 --dapr-http-port 3005 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.http.DemoActorService -p 3000 +dapr run --components-path ./components --app-id demoactorservice --app-port 3000 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorService -p 3000 ``` ### Running the Actor client @@ -190,7 +190,7 @@ Then, the code executes the `callActorForever` private method once per actor. In Use the follow command to execute the DemoActorClient: ```sh -dapr run --components-path ./components --app-id demoactorclient --dapr-http-port 3006 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.http.DemoActorClient +dapr run --components-path ./components --app-id demoactorclient -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.actors.DemoActorClient ``` Once running, the `DemoActorClient` logs will start displaying the different steps: diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorReminderRecoveryIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorReminderRecoveryIT.java index c18bf3c2e..218a63f7c 100644 --- a/sdk-tests/src/test/java/io/dapr/it/actors/ActorReminderRecoveryIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/actors/ActorReminderRecoveryIT.java @@ -118,7 +118,7 @@ public class ActorReminderRecoveryIT extends BaseIT { List calls = logs.stream().filter(x -> x.getMethodName().equals(("receiveReminder"))).collect(Collectors.toList()); System.out.printf( - "Size of reminder count list is %d, which means it's been invoked half that many times.", calls.size()); + "Size of reminder count list is %d, which means it's been invoked half that many times.\n", calls.size()); return calls.size() / 2; }