New release. Delegate spawn actor to proxy

Author: sleipnir

.gitignore

@@ -1,5 +1,6 @@
 target/
 .idea/
+bin/
 pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
@@ -10,4 +11,4 @@ buildNumber.properties
 .mvn/timing.properties
 # https://github.com/takari/maven-wrapper#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
-spawn-java-std-sdk.iml
+spawn-java-std-sdk.iml

README.md

@@ -94,7 +94,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>v1.0.1</version>
+   <version>v1.2.0</version>
 </dependency>
 ```
 We're also going to configure a few things for our application build to work, including compiling the protobuf files. 
@@ -128,7 +128,7 @@ See below a full example of the pom.xml file:
       <dependency>
          <groupId>com.github.eigr</groupId>
          <artifactId>spawn-java-std-sdk</artifactId>
-         <version>v1.0.1</version>
+         <version>v1.2.0</version>
       </dependency>
       <dependency>
          <groupId>ch.qos.logback</groupId>

pom.xml

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

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

@@ -45,7 +45,7 @@ protected static ActorRef of(SpawnClient client, Cache<ActorOuterClass.ActorId,
         if (identity.isParent()) {
             actorId = buildActorId(identity.getSystem(), identity.getName(), identity.getParent());
 
-            spawnActor(actorId, client);
+            //spawnActor(actorId, client);
         } else {
             actorId = buildActorId(identity.getSystem(), identity.getName());
         }
@@ -207,9 +207,9 @@ public <T extends GeneratedMessageV3> void invokeAsync(String action, Invocation
      * @param value  the action argument object.
      * @since 0.0.1
      */
-    public <T extends GeneratedMessageV3, S extends GeneratedMessageV3> void invokeAsync(String action, S value) throws ActorInvocationException {
+    public <T extends GeneratedMessageV3> void invokeAsync(String action, T value) throws ActorInvocationException {
         InvocationOpts opts = InvocationOpts.builder().async(true).build();
-        invokeActor(action, value, null, Optional.of(opts));
+        invokeActorAsync(action, value, Optional.of(opts));
     }
 
     /**
@@ -223,15 +223,15 @@ public <T extends GeneratedMessageV3, S extends GeneratedMessageV3> void invokeA
      *               Please see the {@link io.eigr.spawn.api.InvocationOpts} class for more information
      * @since 0.0.1
      */
-    public <T extends GeneratedMessageV3, S extends GeneratedMessageV3> void invokeAsync(String action, S value, InvocationOpts opts) throws ActorInvocationException {
+    public <T extends GeneratedMessageV3> void invokeAsync(String action, T value, InvocationOpts opts) throws ActorInvocationException {
         InvocationOpts mergedOpts = InvocationOpts.builder()
                 .async(true)
                 .delaySeconds(opts.getDelaySeconds())
                 .scheduledTo(opts.getScheduledTo())
                 .timeoutSeconds(opts.getTimeoutSeconds())
                 .build();
 
-        invokeActor(action, value, null, Optional.of(mergedOpts));
+        invokeActorAsync(action, value, Optional.of(mergedOpts));
     }
 
     public String getActorSystem() {
@@ -264,6 +264,10 @@ private <T extends GeneratedMessageV3, S extends GeneratedMessageV3> Optional<T>
 
         Protocol.InvocationRequest.Builder invocationRequestBuilder = Protocol.InvocationRequest.newBuilder();
 
+        if (Objects.nonNull(this.actorId.getParent()) && !this.actorId.getParent().isEmpty()) {
+            invocationRequestBuilder.setRegisterRef(this.actorId.getParent());
+        }
+
         Map<String, String> metadata = new HashMap<>();
         options.ifPresent(opts -> {
             invocationRequestBuilder.setAsync(opts.isAsync());
@@ -285,6 +289,7 @@ private <T extends GeneratedMessageV3, S extends GeneratedMessageV3> Optional<T>
                 .setActor(actorRef)
                 .setActionName(cmd)
                 .setValue(commandArg)
+
                 .putAllMetadata(metadata)
                 .build();
 
@@ -312,4 +317,36 @@ private <T extends GeneratedMessageV3, S extends GeneratedMessageV3> Optional<T>
 
         return Optional.empty();
     }
+
+    private <T extends GeneratedMessageV3, S extends GeneratedMessageV3> void invokeActorAsync(
+            String cmd, S argument, Optional<InvocationOpts> options) {
+        Objects.requireNonNull(this.actorId, "ActorId cannot be null");
+
+        Protocol.InvocationRequest.Builder invocationRequestBuilder = Protocol.InvocationRequest.newBuilder();
+
+        Map<String, String> metadata = new HashMap<>();
+        options.ifPresent(opts -> {
+            invocationRequestBuilder.setAsync(true);
+            opts.getDelaySeconds().ifPresent(invocationRequestBuilder::setScheduledTo);
+            // 'scheduledTo' override 'delay' if both is set.
+            opts.getScheduledTo()
+                    .ifPresent(scheduleTo -> invocationRequestBuilder.setScheduledTo(opts.getScheduleTimeInLong()));
+        });
+
+        final ActorOuterClass.Actor actorRef = ActorOuterClass.Actor.newBuilder()
+                .setId(this.actorId)
+                .build();
+
+        Any commandArg = Any.pack(argument);
+
+        invocationRequestBuilder
+                .setSystem(ActorOuterClass.ActorSystem.newBuilder().setName(this.actorId.getSystem()).build())
+                .setActor(actorRef)
+                .setActionName(cmd)
+                .setValue(commandArg)
+                .putAllMetadata(metadata)
+                .build();
+
+        this.client.invokeAsync(invocationRequestBuilder.build());
+    }
 }

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

@@ -311,9 +311,7 @@ public SpawnSystem createFromEnv() {
          */
         public SpawnSystem withActor(Class<?> actorKlass) {
             Optional<Entity> maybeEntity = getEntity(actorKlass);
-            if (maybeEntity.isPresent()) {
-                this.entities.add(maybeEntity.get());
-            }
+            maybeEntity.ifPresent(this.entities::add);
             return this;
         }
 
@@ -330,9 +328,7 @@ public SpawnSystem withActor(Class<?> actorKlass) {
          */
         public SpawnSystem withActor(Class<?> actorKlass, Object arg, ActorFactory factory) {
             Optional<Entity> maybeEntity = getEntity(actorKlass, arg, factory);
-            if (maybeEntity.isPresent()) {
-                this.entities.add(maybeEntity.get());
-            }
+            maybeEntity.ifPresent(this.entities::add);
             return this;
         }
 

src/main/java/io/eigr/spawn/internal/transport/client/OkHttpSpawnClient.java

@@ -8,6 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -94,6 +95,31 @@ public Protocol.InvocationResponse invoke(Protocol.InvocationRequest request) th
         }
     }
 
+    @Override
+    public void invokeAsync(Protocol.InvocationRequest request) {
+        RequestBody body = RequestBody.create(
+                request.toByteArray(), MediaType.parse(SPAWN_MEDIA_TYPE));
+
+        Request invocationRequest = new Request.Builder()
+                .url(makeURLForSystemAndActor(request.getSystem().getName(), request.getActor().getId().getName()))
+                .post(body)
+                .build();
+
+        Call invocationCall = client.newCall(invocationRequest);
+        invocationCall.enqueue(new Callback() {
+            @Override
+            public void onFailure(final Call call, IOException err) {
+                log.error("Error while actor invoke async.", err);
+            }
+
+            @Override
+            public void onResponse(Call call, final Response response) throws IOException {
+                String res = response.body().string();
+                log.trace("actor invoke async response [{}].", res);
+            }
+        });
+    }
+
     private String makeURLForSystemAndActor(String systemName, String actorName) {
         String uri = String.format("/api/v1/system/%s/actors/%s/invoke", systemName, actorName);
         return makeURLFrom(uri);

src/main/java/io/eigr/spawn/internal/transport/client/SpawnClient.java

@@ -10,5 +10,7 @@ public interface SpawnClient {
     Protocol.RegistrationResponse register(Protocol.RegistrationRequest registration) throws ActorRegistrationException;
     Protocol.SpawnResponse spawn(Protocol.SpawnRequest registration) throws ActorCreationException;
     Protocol.InvocationResponse invoke(Protocol.InvocationRequest request) throws ActorInvocationException;
+
+    void invokeAsync(Protocol.InvocationRequest request);
 }
 

src/main/proto/eigr/functions/protocol/actors/protocol.proto

@@ -356,6 +356,8 @@ message InvocationRequest {
     int64 scheduled_to = 9;
 
     bool pooled = 10;
+
+    string register_ref = 11;
 }
 
 // ActorInvocation is a translation message between a local invocation made via InvocationRequest