make the actor builder return a Props

Author: BrandonArp

src/main/java/com/arpnetworking/akka/ActorBuilder.java

@@ -1,12 +1,7 @@
 package com.arpnetworking.akka;
 
-import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
 import akka.actor.Props;
 import com.arpnetworking.commons.builder.OvalBuilder;
-import net.sf.oval.constraint.NotEmpty;
-import net.sf.oval.constraint.NotNull;
-import org.codehaus.jackson.map.annotate.JacksonInject;
 
 import java.util.function.Function;
 
@@ -16,34 +11,14 @@
  * @param <B> The type of the builder
  * @author Brandon Arp (brandon dot arp at inscopemetrics dot com)
  */
-public abstract class ActorBuilder<B extends ActorBuilder<B>> extends OvalBuilder<ActorRef> {
+public abstract class ActorBuilder<B extends ActorBuilder<B>> extends OvalBuilder<Props> {
     /**
      * Protected constructor.
      *
      * @param createProps method to create a {@link Props} from the {@link ActorBuilder}
      */
     protected ActorBuilder(final Function<B, Props> createProps) {
-        super(B::createActor);
-        _createProps = createProps;
-    }
-
-    public B setActorName(final String value) {
-        _actorName = value;
-        return self();
-    }
-
-    public B setActorSystem(final ActorSystem value) {
-        _actorSystem = value;
-        return self();
-    }
-
-    /**
-     * Creates an actor in the {@link ActorSystem}.  DO NOT OVERRIDE.
-     *
-     * @return an {@link ActorRef} to a newly launched actor
-     */
-    protected final ActorRef createActor(){
-        return this._actorSystem.actorOf(_createProps.apply(self()));
+        super(createProps);
     }
 
     /**
@@ -53,14 +28,4 @@ protected final ActorRef createActor(){
      * @return instance with correct {@link ActorBuilder} class type.
      */
     protected abstract B self();
-
-    @NotNull
-    @JacksonInject
-    protected ActorSystem _actorSystem;
-
-    @NotNull
-    @NotEmpty
-    protected String _actorName;
-
-    private final Function<B, Props> _createProps;
 }

src/main/java/com/arpnetworking/clusteraggregator/Main.java

@@ -17,6 +17,7 @@
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
+import akka.actor.Props;
 import ch.qos.logback.classic.LoggerContext;
 import com.arpnetworking.clusteraggregator.configuration.ClusterAggregatorConfiguration;
 import com.arpnetworking.commons.builder.Builder;
@@ -100,7 +101,7 @@ public static void main(final String[] args) {
             configurator = Optional.of(new Configurator<>(Main::new, ClusterAggregatorConfiguration.class));
             final ObjectMapper objectMapper = ClusterAggregatorConfiguration.createObjectMapper();
             final SimpleModule module = new SimpleModule();
-            module.addDeserializer(ActorRef.class, new ActorBuilderDeserializer(objectMapper));
+            module.addDeserializer(Props.class, new ActorBuilderDeserializer(objectMapper));
             objectMapper.registerModule(module);
             configuration = Optional.of(new DynamicConfiguration.Builder()
                     .setObjectMapper(objectMapper)

src/main/java/com/arpnetworking/configuration/jackson/akka/ActorBuilderDeserializer.java

@@ -1,6 +1,6 @@
 package com.arpnetworking.configuration.jackson.akka;
 
-import akka.actor.ActorRef;
+import akka.actor.Props;
 import com.arpnetworking.commons.builder.Builder;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -17,7 +17,7 @@
  * Deserializer that will create an ActorBuilder for the given actor, then create the Actor from Guice
  * @author Brandon Arp (brandon dot arp at inscopemetrics dot com)
  */
-public class ActorBuilderDeserializer extends JsonDeserializer<ActorRef> {
+public class ActorBuilderDeserializer extends JsonDeserializer<Props> {
     /**
      * Public constructor.
      *
@@ -28,13 +28,13 @@ public ActorBuilderDeserializer(final ObjectMapper mapper) {
     }
 
     @Override
-    public ActorRef deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException, JsonProcessingException {
+    public Props deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException, JsonProcessingException {
         final TreeNode treeNode = p.readValueAsTree();
         final String type = ((TextNode) treeNode.get("type")).textValue();
         try {
             final Class<?> clazz = Class.forName(type);
-            final Class<? extends Builder<? extends ActorRef>> builder = getBuilderForClass(clazz);
-            final Builder<? extends ActorRef> value = _mapper.readValue(treeNode.toString(), builder);
+            final Class<? extends Builder<? extends Props>> builder = getBuilderForClass(clazz);
+            final Builder<? extends Props> value = _mapper.readValue(treeNode.toString(), builder);
             return value.build();
         } catch (ClassNotFoundException e) {
             throw new JsonMappingException(p, String.format("Unable to find class %s referenced by ActorRef type", type));
@@ -44,9 +44,9 @@ public ActorRef deserialize(final JsonParser p, final DeserializationContext ctx
     }
 
     @SuppressWarnings("unchecked")
-    private static Class<? extends Builder<ActorRef>> getBuilderForClass(final Class<?> clazz)
+    private static Class<? extends Builder<Props>> getBuilderForClass(final Class<?> clazz)
             throws ClassNotFoundException {
-        return (Class<? extends Builder<ActorRef>>) (Class.forName(
+        return (Class<? extends Builder<Props>>) (Class.forName(
                 clazz.getName() + "$Builder",
                 true, // initialize
                 clazz.getClassLoader()));

src/test/java/com/arpnetworking/clusteraggregator/configuration/ActorBuilderTest.java

@@ -1,6 +1,6 @@
 package com.arpnetworking.clusteraggregator.configuration;
 
-import akka.actor.ActorRef;
+import akka.actor.Props;
 import com.arpnetworking.akka.NonJoiningClusterJoiner;
 import com.arpnetworking.commons.jackson.databind.ObjectMapperFactory;
 import com.arpnetworking.configuration.jackson.akka.ActorBuilderDeserializer;
@@ -19,21 +19,19 @@ public class ActorBuilderTest extends BaseActorTest {
     @Test
     public void testBuild() {
         final NonJoiningClusterJoiner.Builder builder = new NonJoiningClusterJoiner.Builder();
-        builder.setActorName("foo");
-        builder.setActorSystem(getSystem());
         builder.build();
     }
 
     @Test
     public void testPolyDeserialize() throws IOException {
         final ObjectMapper mapper = ObjectMapperFactory.createInstance();
         final SimpleModule module = new SimpleModule();
-        module.addDeserializer(ActorRef.class, new ActorBuilderDeserializer(mapper));
+        module.addDeserializer(Props.class, new ActorBuilderDeserializer(mapper));
         mapper.registerModule(module);
 
         @Language("JSON") final String data = "{\n" +
                 "  \"type\": \"com.arpnetworking.akka.NonJoiningClusterJoiner\"\n" +
                 "}";
-        final ActorRef ref = mapper.readValue(data, ActorRef.class);
+        final Props props = mapper.readValue(data, Props.class);
     }
 }