Merge.

Author: h3nrique

README.md

@@ -17,7 +17,8 @@ JVM User Language Support for [Spawn](https://github.com/eigr/spawn).
 4. [Using Actors](#using-actors)
     - [Call Named Actors](#call-named-actors)
     - [Call Unnamed Actors](#call-unnamed-actors)
-    - [Async and other options](#async-calls-and-other-options)
+    - [Async](#async)
+    - [Timeouts](#timeouts)
 5. [Deploy](#deploy)
     - [Defining an ActorSystem](#defining-an-actorsytem)
     - [Defining an ActorHost](#defining-an-actorhost)
@@ -92,7 +93,7 @@ The second thing we have to do is add the spawn dependency to the project.
 <dependency>
    <groupId>com.github.eigr</groupId>
    <artifactId>spawn-java-std-sdk</artifactId>
-   <version>v0.6.2</version>
+   <version>v0.6.5</version>
 </dependency>
 ```
 We're also going to configure a few things for our application build to work, including compiling the protobuf files. 
@@ -126,7 +127,7 @@ See below a full example of the pom.xml file:
       <dependency>
          <groupId>com.github.eigr</groupId>
          <artifactId>spawn-java-std-sdk</artifactId>
-         <version>v0.6.2</version>
+         <version>v0.6.5</version>
       </dependency>
       <dependency>
          <groupId>ch.qos.logback</groupId>
@@ -837,8 +838,8 @@ Domain.Request msg = Domain.Request.newBuilder()
        .setLanguage("erlang")
        .build();
 
-Optional<Object> maybeResponse = joeActor.invoke("setLanguage", msg, Domain.Reply.class);
-Domain.Reply reply = (Domain.Reply)maybeResponse.get();
+Optional<Domain.Reply> maybeResponse = joeActor.invoke("setLanguage", msg, Domain.Reply.class);
+Domain.Reply reply = maybeResponse.get();
 ```
 
 More detailed in complete main class:
@@ -874,7 +875,7 @@ public class App {
               .build();
 
       Optional<Object> maybeResponse = joeActor.invoke("setLanguage", msg, Domain.Reply.class);
-      Domain.Reply reply = (Domain.Reply)maybeResponse.get();
+      Domain.Reply reply = maybeResponse.get();
    }
 }
 ```
@@ -920,8 +921,8 @@ Domain.Request msg = Domain.Request.newBuilder()
        .setLanguage("erlang")
        .build();
 
-Optional<Object> maybeResponse = mike.invoke("setLanguage", msg, Domain.Reply.class);
-Domain.Reply reply = (Domain.Reply)maybeResponse.get();
+Optional<Domain.Reply> maybeResponse = mike.invoke("setLanguage", msg, Domain.Reply.class);
+Domain.Reply reply = maybeResponse.get();
 ```
 
 The important part of the code above is the following snippet:
@@ -934,7 +935,7 @@ These tells Spawn that this actor will actually be named at runtime. The name pa
 in this case is just a reference to "abs_actor" Actor that will be used later 
 so that we can actually create an instance of the real Actor.
 
-### Async calls and other options
+### Async
 
 Basically Spawn can perform actor functions in two ways. Synchronously, where the callee waits for a response, 
 or asynchronously, where the callee doesn't care about the return value of the call. 
@@ -947,6 +948,45 @@ Therefore, to call an actor's function asynchronously, just use the invokeAsync
 mike.invokeAsync("setLanguage", msg);
 ```
 
+### Timeouts
+
+It is possible to change the request waiting timeout using the invocation options as below:
+
+```Java
+package io.eigr.spawn.java.demo;
+
+import io.eigr.spawn.api.ActorRef;
+import io.eigr.spawn.api.InvocationOpts;
+import io.eigr.spawn.api.Spawn;
+import io.eigr.spawn.api.TransportOpts;
+import io.eigr.spawn.java.demo.domain.Domain;
+
+import java.util.Optional;
+
+public class App {
+   public static void main(String[] args) throws Exception {
+      Spawn spawnSystem = new Spawn.SpawnSystem()
+              .create("spawn-system")
+              .withActor(Joe.class)
+              .build();
+
+      spawnSystem.start();
+
+      ActorRef joeActor = spawnSystem.createActorRef("spawn-system", "joe");
+
+      Domain.Request msg = Domain.Request.newBuilder()
+              .setLanguage("erlang")
+              .build();
+
+      InvocationOpts opts = InvocationOpts.builder()
+              .timeoutSeconds(Duration.ofSeconds(30))
+              .build();
+      
+      Optional<Domain.Reply> maybeResponse = joeActor.invoke("setLanguage", msg, Domain.Reply.class, opts);
+   }
+}
+```
+
 ## Deploy
 
 See [Getting Started](https://github.com/eigr/spawn#getting-started) section from the main Spawn repository for more 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>io.eigr.spawn</groupId>
     <artifactId>spawn-java-std-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>0.6.2</version>
+    <version>0.6.5</version>
     <name>spawn-java-std-sdk</name>
     <url>http://maven.apache.org</url>
 

src/main/java/io/eigr/spawn/api/ActorRef.java

@@ -13,6 +13,8 @@
 import io.eigr.spawn.internal.transport.client.SpawnClient;
 
 import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -203,8 +205,9 @@ public <T extends GeneratedMessageV3> void invokeAsync(String action) throws Spa
     public <T extends GeneratedMessageV3> void invokeAsync(String action, InvocationOpts opts) throws SpawnException {
         InvocationOpts mergedOpts = InvocationOpts.builder()
                 .async(true)
-                .delay(opts.getDelay())
+                .delaySeconds(opts.getDelaySeconds())
                 .scheduledTo(opts.getScheduledTo())
+                .timeoutSeconds(opts.getTimeoutSeconds())
                 .build();
 
         invokeActor(action, Empty.getDefaultInstance(), null, Optional.ofNullable(mergedOpts));
@@ -238,8 +241,9 @@ public <T extends GeneratedMessageV3, S extends GeneratedMessageV3> void invokeA
     public <T extends GeneratedMessageV3, S extends GeneratedMessageV3> void invokeAsync(String action, S value, InvocationOpts opts) throws SpawnException {
         InvocationOpts mergedOpts = InvocationOpts.builder()
                 .async(true)
-                .delay(opts.getDelay())
+                .delaySeconds(opts.getDelaySeconds())
                 .scheduledTo(opts.getScheduledTo())
+                .timeoutSeconds(opts.getTimeoutSeconds())
                 .build();
 
         invokeActor(action, value, null, Optional.of(mergedOpts));
@@ -275,9 +279,11 @@ private <T extends GeneratedMessageV3, S extends GeneratedMessageV3> Optional<T>
 
         Protocol.InvocationRequest.Builder invocationRequestBuilder = Protocol.InvocationRequest.newBuilder();
 
+        Map<String, String> metadata = new HashMap<>();
         options.ifPresent(opts -> {
             invocationRequestBuilder.setAsync(opts.isAsync());
-            opts.getDelay().ifPresent(invocationRequestBuilder::setScheduledTo);
+            metadata.put("request-timeout", String.valueOf(opts.getTimeout()));
+            opts.getDelaySeconds().ifPresent(invocationRequestBuilder::setScheduledTo);
             // 'scheduledTo' override 'delay' if both is set.
             opts.getScheduledTo()
                     .ifPresent(scheduleTo -> invocationRequestBuilder.setScheduledTo(opts.getScheduleTimeInLong()));
@@ -294,6 +300,7 @@ private <T extends GeneratedMessageV3, S extends GeneratedMessageV3> Optional<T>
                 .setActor(actorRef)
                 .setActionName(cmd)
                 .setValue(commandArg)
+                .putAllMetadata(metadata)
                 .build();
 
         Protocol.InvocationResponse resp = this.client.invoke(invocationRequestBuilder.build());

src/main/java/io/eigr/spawn/api/InvocationOpts.java

@@ -5,6 +5,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Optional;
@@ -19,7 +20,10 @@ public class InvocationOpts {
     private boolean async = false;
 
     @Builder.Default
-    private Optional<Long> delay = Optional.empty();
+    private Duration timeoutSeconds = Duration.ofSeconds(10);
+
+    @Builder.Default
+    private Optional<Long> delaySeconds = Optional.empty();
 
     @Builder.Default
     private Optional<LocalDateTime> scheduledTo = Optional.empty();
@@ -32,4 +36,8 @@ public long getScheduleTimeInLong() {
 
         return 0;
     }
+
+    public long getTimeout() {
+        return this.timeoutSeconds.toMillis();
+    }
 }

src/main/java/io/eigr/spawn/api/actors/workflows/SideEffect.java

@@ -43,14 +43,12 @@ public static <T extends GeneratedMessageV3> SideEffect to(ActorRef actor, Strin
     public Protocol.SideEffect build() {
         Protocol.InvocationRequest.Builder requestBuilder = Protocol.InvocationRequest.newBuilder();
 
-        if (this.opts.isPresent()) {
-            InvocationOpts options = this.opts.get();
-            if (options.getDelay().isPresent() && !options.getScheduledTo().isPresent()) {
-                requestBuilder.setScheduledTo(options.getDelay().get());
-            } else if (options.getScheduledTo().isPresent()) {
-                requestBuilder.setScheduledTo(options.getScheduleTimeInLong());
-            }
-        }
+        opts.ifPresent(invocationOpts -> {
+            invocationOpts.getDelaySeconds().ifPresent(requestBuilder::setScheduledTo);
+            // 'scheduledTo' override 'delay' if both is set.
+            invocationOpts.getScheduledTo()
+                    .ifPresent(scheduleTo -> requestBuilder.setScheduledTo(invocationOpts.getScheduleTimeInLong()));
+        });
 
         requestBuilder.setSystem(ActorOuterClass.ActorSystem.newBuilder()
                         .setName(this.actor.getActorSystem())

src/test/java/io/eigr/spawn/SpawnTest.java

@@ -1,5 +1,6 @@
 package io.eigr.spawn;
 
+import io.eigr.spawn.api.InvocationOpts;
 import io.eigr.spawn.api.Spawn;
 import io.eigr.spawn.api.ActorRef;
 import io.eigr.spawn.api.TransportOpts;
@@ -8,6 +9,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.time.Duration;
 import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;