Add lookup option

Author: sleipnir

README.md

@@ -93,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.8.3</version>
+   <version>v0.8.5</version>
 </dependency>
 ```
 We're also going to configure a few things for our application build to work, including compiling the protobuf files. 
@@ -127,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.8.3</version>
+         <version>v0.8.5</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>0.8.3</version>
+    <version>0.8.5</version>
     <name>spawn-java-std-sdk</name>
     <url>http://maven.apache.org</url>
 

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

@@ -9,24 +9,36 @@ public final class ActorIdentity {
     private final String name;
     private final Optional<String> maybeParent;
 
-    private ActorIdentity(String system, String name, String parent){
+    private final boolean lookup;
+
+    private ActorIdentity(String system, String name, String parent, boolean lookup){
         this.system = system;
         this.name = name;
         this.maybeParent = Optional.ofNullable(parent);
+        this.lookup = lookup;
     }
 
-    private ActorIdentity(String system, String name){
+    private ActorIdentity(String system, String name, boolean lookup){
         this.system = system;
         this.name = name;
         this.maybeParent = Optional.empty();
+        this.lookup = lookup;
     }
 
     public static ActorIdentity of(String system, String name) {
-        return new ActorIdentity(system, name);
+        return new ActorIdentity(system, name, true);
     }
 
     public static ActorIdentity of(String system, String name, String parent) {
-        return new ActorIdentity(system, name, parent);
+        return new ActorIdentity(system, name, parent, true);
+    }
+
+    public static ActorIdentity of(String system, String name, boolean lookup) {
+        return new ActorIdentity(system, name, lookup);
+    }
+
+    public static ActorIdentity of(String system, String name, String parent, boolean lookup) {
+        return new ActorIdentity(system, name, parent, lookup);
     }
 
     public String getSystem() {
@@ -49,17 +61,21 @@ public boolean isParent() {
         return this.maybeParent.isPresent();
     }
 
+    public boolean hasLookup() {
+        return lookup;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        ActorIdentity actorIdentity = (ActorIdentity) o;
-        return system.equals(actorIdentity.system) && name.equals(actorIdentity.name) && maybeParent.equals(actorIdentity.maybeParent);
+        ActorIdentity that = (ActorIdentity) o;
+        return lookup == that.lookup && system.equals(that.system) && name.equals(that.name) && maybeParent.equals(that.maybeParent);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(system, name, maybeParent);
+        return Objects.hash(system, name, maybeParent, lookup);
     }
 
     @Override
@@ -68,6 +84,7 @@ public String toString() {
                 .add("system='" + system + "'")
                 .add("name='" + name + "'")
                 .add("maybeParent=" + maybeParent)
+                .add("lookup=" + lookup)
                 .toString();
     }
 }

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

@@ -29,54 +29,23 @@ private ActorRef(ActorOuterClass.ActorId actorId, SpawnClient client) {
         this.actorId = actorId;
     }
 
-    /**
-     * <p>This method is responsible for creating instances of the ActorRef class
-     * </p>
-     *
-     * @param client is the client part of the Spawn protocol and is responsible for communicating with the Proxy.
-     * @param identity ActorIdentity name of the actor that this ActorRef instance should represent
-     * @return the ActorRef instance
-     * @since 0.0.1
-     */
-    protected static ActorRef of(SpawnClient client, Cache<ActorOuterClass.ActorId, ActorRef> cache, ActorIdentity identity) throws ActorCreationException {
-        ActorOuterClass.ActorId actorId;
-
-        if (identity.isParent()) {
-            actorId = buildActorId(identity.getSystem(), identity.getName(), identity.getParent());
-
-            spawnActor(actorId, client);
-        } else {
-            actorId = buildActorId(identity.getSystem(), identity.getName());
-        }
-
-        ActorRef ref = cache.getIfPresent(actorId);
-        if (Objects.nonNull(ref)) {
-            return ref;
-        }
-
-        ref = new ActorRef(actorId, client);
-        cache.put(actorId, ref);
-        return ref;
-    }
-
     /**
      * <p>This method is responsible for creating instances of the ActorRef class when Actor is a UnNamed actor.
      * </p>
      *
      * @param client is the client part of the Spawn protocol and is responsible for communicating with the Proxy.
      * @param identity ActorIdentity name of the actor that this ActorRef instance should represent
-     * @param dispatchParent call proxy to spawn proxy or not
      * @return the ActorRef instance
      * @since 0.0.1
      */
-    protected static ActorRef of(SpawnClient client, Cache<ActorOuterClass.ActorId, ActorRef> cache, ActorIdentity identity, boolean dispatchParent) throws ActorCreationException {
+    protected static ActorRef of(SpawnClient client, Cache<ActorOuterClass.ActorId, ActorRef> cache, ActorIdentity identity) throws ActorCreationException {
         ActorOuterClass.ActorId actorId = buildActorId(identity.getSystem(), identity.getName(), identity.getParent());
         ActorRef ref = cache.getIfPresent(actorId);
         if (Objects.nonNull(ref)) {
             return ref;
         }
 
-        if (dispatchParent) {
+        if (identity.hasLookup()) {
             spawnActor(actorId, client);
         }
 

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

@@ -93,7 +93,6 @@ public int getTerminationGracePeriodSeconds() {
      *
      * @param identity the name of the actor that this ActorRef instance should represent
      * @return the ActorRef instance
-     * @throws {@link io.eigr.spawn.api.exceptions.ActorCreationException}
      * @since 0.0.1
      */
     public ActorRef createActorRef(ActorIdentity identity) throws ActorCreationException {
@@ -123,7 +122,14 @@ public Stream<ActorRef> createMultiActorRefs(List<ActorIdentity> identities) thr
 
         return identities.stream().map(identity -> {
             try {
-                return identity.isParent() ? ActorRef.of(this.client, this.actorIdCache, identity, false) : ActorRef.of(this.client, this.actorIdCache, identity);
+                if (identity.isParent()) {
+                    return ActorRef.of(
+                            this.client,
+                            this.actorIdCache,
+                            ActorIdentity.of(identity.getSystem(), identity.getName(), identity.getParent(), false));
+                }
+
+                return ActorRef.of(this.client, this.actorIdCache, identity);
             } catch (ActorCreationException e) {
                 throw new SpawnFailureException(e);
             }

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

@@ -24,26 +24,16 @@ public final class OkHttpSpawnClient implements SpawnClient {
     private final int proxyPort;
     private final OkHttpClient client;
 
-    private final OkHttpClient spawnClient;
-
     public OkHttpSpawnClient(String system, String proxyHost, int proxyPort) {
         this.system = system;
         this.proxyHost = proxyHost;
         this.proxyPort = proxyPort;
         this.client = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .callTimeout(200, TimeUnit.SECONDS)
-                .retryOnConnectionFailure(true)
-                .connectionPool(new ConnectionPool(256, 100, TimeUnit.SECONDS))
-                .build();
-
-        this.spawnClient = new OkHttpClient.Builder()
                 .connectTimeout(120, TimeUnit.SECONDS)
                 .readTimeout(120, TimeUnit.SECONDS)
                 .writeTimeout(120, TimeUnit.SECONDS)
                 .callTimeout(400, TimeUnit.SECONDS)
+                .retryOnConnectionFailure(true)
                 .connectionPool(new ConnectionPool(256, 100, TimeUnit.SECONDS))
                 .build();
     }
@@ -73,7 +63,7 @@ public Protocol.SpawnResponse spawn(Protocol.SpawnRequest registration) throws A
                 .url(makeSpawnURLFrom(registration.getActors(0).getSystem()))
                 .post(body).build();
 
-        Call call = spawnClient.newCall(request);
+        Call call = client.newCall(request);
         try (Response response = call.execute()) {
             assert response.body() != null;
             return io.eigr.functions.protocol.Protocol.SpawnResponse.parseFrom(