Refactoring class to avoid casts and raw use.

Author: h3nrique

src/main/java/io/eigr/spawn/api/actors/Value.java

@@ -11,18 +11,16 @@
 import java.util.Objects;
 import java.util.Optional;
 
-public final class Value<S extends GeneratedMessageV3, R extends GeneratedMessageV3> {
-
-    private S state;
-    private R response;
+public final class Value {
 
+    private Object state;
+    private Object response;
     private boolean checkpoint;
     private Optional<Broadcast<?>> broadcast;
     private Optional<Forward> forward;
     private Optional<Pipe> pipe;
-    private Optional<List<SideEffect>> effects;
-
-    private ResponseType type;
+    private Optional<List<SideEffect<?>>> effects;
+    private final ResponseType type;
 
     private Value() {
         this.state = null;
@@ -36,13 +34,13 @@ private Value() {
     }
 
     private Value(
-            R response,
-            S state,
+            Object response,
+            Object state,
             boolean checkpoint,
             Optional<Broadcast<?>> broadcast,
             Optional<Forward> forward,
             Optional<Pipe> pipe,
-            Optional<List<SideEffect>> effects,
+            Optional<List<SideEffect<?>>> effects,
             ResponseType type) {
         this.response = response;
         this.state = state;
@@ -54,16 +52,16 @@ private Value(
         this.type = type;
     }
 
-    public static <S, V> Value at() {
+    public static Value at() {
         return new Value();
     }
 
-    public R getResponse() {
-        return response;
+    public <R extends GeneratedMessageV3> R getResponse() {
+        return (R) response;
     }
 
-    public S getState() {
-        return state;
+    public <S extends GeneratedMessageV3> S getState() {
+        return (S) state;
     }
 
     public boolean getCheckpoint() {
@@ -82,31 +80,31 @@ public Optional<Pipe> getPipe() {
         return pipe;
     }
 
-    public Optional<List<SideEffect>> getEffects() {
+    public Optional<List<SideEffect<?>>> getEffects() {
         return effects;
     }
 
     public ResponseType getType() {
         return type;
     }
 
-    public Value response(R value) {
+    public Value response(Object value) {
         this.response = value;
         return this;
     }
 
-    public Value state(S state) {
+    public <S extends GeneratedMessageV3> Value state(S state) {
         this.state = state;
         return this;
     }
 
-    public Value state(S state, boolean checkpoint) {
+    public <S extends GeneratedMessageV3> Value state(S state, boolean checkpoint) {
         this.state = state;
         this.checkpoint = checkpoint;
         return this;
     }
 
-    public Value flow(Broadcast broadcast) {
+    public Value flow(Broadcast<?> broadcast) {
         this.broadcast = Optional.of(broadcast);
         return this;
     }
@@ -121,8 +119,8 @@ public Value flow(Pipe pipe) {
         return this;
     }
 
-    public Value flow(SideEffect effect) {
-        List<SideEffect> ef;
+    public Value flow(SideEffect<?> effect) {
+        List<SideEffect<?>> ef;
         if (this.effects.isPresent()) {
             ef = this.effects.get();
             ef.add(effect);
@@ -135,7 +133,7 @@ public Value flow(SideEffect effect) {
         return this;
     }
 
-    public Value flow(List<SideEffect> effects) {
+    public Value flow(List<SideEffect<?>> effects) {
         this.effects = Optional.of(effects);
         return this;
     }
@@ -171,7 +169,7 @@ public String toString() {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        Value<?, ?> value = (Value<?, ?>) o;
+        Value value = (Value) o;
         return Objects.equals(state, value.state) &&
                 Objects.equals(response, value.response) &&
                 Objects.equals(checkpoint, value.checkpoint) &&

src/main/java/io/eigr/spawn/internal/transport/server/ActorServiceHandler.java

@@ -12,9 +12,6 @@
 import io.eigr.spawn.api.actors.Value;
 import io.eigr.spawn.api.actors.ActorContext;
 import io.eigr.spawn.api.actors.ActorFactory;
-import io.eigr.spawn.api.actors.workflows.Broadcast;
-import io.eigr.spawn.api.actors.workflows.Forward;
-import io.eigr.spawn.api.actors.workflows.Pipe;
 import io.eigr.spawn.api.actors.workflows.SideEffect;
 import io.eigr.spawn.api.exceptions.ActorInvocationException;
 import io.eigr.spawn.internal.Entity;
@@ -210,29 +207,29 @@ private Protocol.Workflow buildWorkflow(Value valueResponse) {
         Protocol.Workflow.Builder workflowBuilder = Protocol.Workflow.newBuilder();
 
         if (valueResponse.getBroadcast().isPresent()) {
-            Protocol.Broadcast b = ((Broadcast) valueResponse.getBroadcast().get()).build();
+            Protocol.Broadcast b = valueResponse.getBroadcast().get().build();
             workflowBuilder.setBroadcast(b);
         }
 
         if (valueResponse.getForward().isPresent()) {
-            Protocol.Forward f = ((Forward) valueResponse.getForward().get()).build();
+            Protocol.Forward f = valueResponse.getForward().get().build();
             workflowBuilder.setForward(f);
         }
 
         if (valueResponse.getPipe().isPresent()) {
-            Protocol.Pipe p = ((Pipe) valueResponse.getPipe().get()).build();
+            Protocol.Pipe p = valueResponse.getPipe().get().build();
             workflowBuilder.setPipe(p);
         }
 
         if (valueResponse.getEffects().isPresent()) {
-            List<SideEffect> efs = ((List<SideEffect>) valueResponse.getEffects().get());
+            List<SideEffect<?>> efs = valueResponse.getEffects().get();
             workflowBuilder.addAllEffects(getProtocolEffects(efs));
         }
 
         return workflowBuilder.build();
     }
 
-    private List<Protocol.SideEffect> getProtocolEffects(List<SideEffect> effects) {
+    private List<Protocol.SideEffect> getProtocolEffects(List<SideEffect<?>> effects) {
         return effects.stream()
                 .map(SideEffect::build)
                 .collect(Collectors.toList());