Fix. Timer Actions and channels

Author: sleipnir

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

@@ -11,6 +11,8 @@
 import io.eigr.spawn.internal.client.OkHttpSpawnClient;
 import io.eigr.spawn.internal.client.SpawnClient;
 import io.eigr.spawn.internal.handlers.ActorServiceHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -23,6 +25,7 @@
  * Spawn SDK Entrypoint
  */
 public final class Spawn {
+    private static final Logger log = LoggerFactory.getLogger(Spawn.class);
 
     private final SpawnClient client;
 
@@ -102,6 +105,8 @@ private void registerActorSystem() throws Exception {
                 .setServiceInfo(si)
                 .setActorSystem(actorSystem)
                 .build();
+
+        log.debug("Registering Actors on Proxy. Registry: {}", req);
         this.client.register(req);
     }
 
@@ -136,6 +141,7 @@ private Map<String, ActorOuterClass.Actor> getActors(List<Entity> entities) {
 
             Map<String, String> tags = new HashMap<>();
             ActorOuterClass.Metadata metadata = ActorOuterClass.Metadata.newBuilder()
+                    .setChannelGroup(actorEntity.getChannel())
                     .putAllTags(tags)
                     .build();
 
@@ -170,7 +176,7 @@ private List<ActorOuterClass.Action> getCommands(Entity actorEntity) {
     }
 
     private List<ActorOuterClass.FixedTimerAction> getTimerCommands(Entity actorEntity) {
-        return actorEntity.getActions()
+        List<ActorOuterClass.FixedTimerAction> timerActions = actorEntity.getTimerActions()
                 .values()
                 .stream()
                 .filter(v -> Entity.EntityMethodType.TIMER.equals(v.getType()))
@@ -184,6 +190,9 @@ private List<ActorOuterClass.FixedTimerAction> getTimerCommands(Entity actorEnti
                                 .build()
                 )
                 .collect(Collectors.toList());
+
+        log.debug("Actor have TimeActions: {}", timerActions);
+        return timerActions;
     }
 
     public static final class SpawnSystem {

src/main/java/io/eigr/spawn/internal/Entity.java

@@ -31,6 +31,8 @@ public final class Entity {
     private int minPoolSize;
     private int maxPoolSize;
 
+    private String channel;
+
     public Entity(
             String actorName,
             Class<?> actorType,
@@ -43,7 +45,8 @@ public Entity(
             Map<String, EntityMethod> actions,
             Map<String, EntityMethod> timerActions,
             int minPoolSize,
-            int maxPoolSize) {
+            int maxPoolSize,
+            String channel) {
         this.actorName = actorName;
         this.actorType = actorType;
         this.kind = kind;
@@ -56,6 +59,7 @@ public Entity(
         this.timerActions = timerActions;
         this.minPoolSize = minPoolSize;
         this.maxPoolSize = maxPoolSize;
+        this.channel = channel;
     }
 
     public String getActorName() {
@@ -98,6 +102,10 @@ public Map<String, EntityMethod> getActions() {
         return actions;
     }
 
+    public Map<String, EntityMethod> getTimerActions() {
+        return timerActions;
+    }
+
     public int getMinPoolSize() {
         return minPoolSize;
     }
@@ -106,6 +114,8 @@ public int getMaxPoolSize() {
         return maxPoolSize;
     }
 
+    public String getChannel(){ return channel; }
+
     public enum EntityMethodType {
         DIRECT, TIMER
     }
@@ -184,6 +194,7 @@ public String toString() {
         sb.append(", timerActions=").append(timerActions);
         sb.append(", minPoolSize=").append(minPoolSize);
         sb.append(", maxPoolSize=").append(maxPoolSize);
+        sb.append(", channel=").append(channel);
         sb.append('}');
         return sb.toString();
     }
@@ -204,6 +215,7 @@ public static Entity fromAnnotationToEntity(Class<?> entity, NamedActor actor) {
         final Class stateType = actor.stateType();
         final int minPoolSize = actor.minPoolSize();
         final int maxPoolSize = actor.maxPoolSize();
+        final String channel = actor.channel();
 
         final Map<String, Entity.EntityMethod> actions = buildActions(entity, Action.class);
         final Map<String, Entity.EntityMethod> timerActions = buildActions(entity, TimerAction.class);
@@ -220,7 +232,9 @@ public static Entity fromAnnotationToEntity(Class<?> entity, NamedActor actor) {
                 actions,
                 timerActions,
                 minPoolSize,
-                maxPoolSize);
+                maxPoolSize,
+                channel
+                );
 
         log.info("Registering NamedActor: {}", actorName);
         log.debug("Registering Entity -> {}", entityType);
@@ -243,6 +257,7 @@ public static Entity fromAnnotationToEntity(Class<?> entity, UnNamedActor actor)
         final Class stateType = actor.stateType();
         final int minPoolSize = actor.minPoolSize();
         final int maxPoolSize = actor.maxPoolSize();
+        final String channel = actor.channel();
 
         final Map<String, Entity.EntityMethod> actions = buildActions(entity, Action.class);
         final Map<String, Entity.EntityMethod> timerActions = buildActions(entity, TimerAction.class);
@@ -259,7 +274,8 @@ public static Entity fromAnnotationToEntity(Class<?> entity, UnNamedActor actor)
                 actions,
                 timerActions,
                 minPoolSize,
-                maxPoolSize);
+                maxPoolSize,
+                channel);
 
         log.info("Registering UnNamedActor: {}", actorName);
         log.debug("Registering Entity -> {}", entityType);
@@ -283,6 +299,7 @@ public static Entity fromAnnotationToEntity(Class<?> entity, PooledActor actor)
         final Class stateType = actor.stateType();
         final int minPoolSize = actor.minPoolSize();
         final int maxPoolSize = actor.maxPoolSize();
+        final String channel = actor.channel();
 
         final Map<String, Entity.EntityMethod> actions = buildActions(entity, Action.class);
         final Map<String, Entity.EntityMethod> timerActions = buildActions(entity, TimerAction.class);
@@ -299,7 +316,8 @@ public static Entity fromAnnotationToEntity(Class<?> entity, PooledActor actor)
                 actions,
                 timerActions,
                 minPoolSize,
-                maxPoolSize);
+                maxPoolSize,
+                channel);
 
         log.info("Registering PooledActor: {}", actorName);
         log.debug("Registering Entity -> {}", entityType);