new jar

Author: ishan

Diff for: .idea/workspace.xml

@@ -1,9 +1,20 @@
 package morph.base.actions;
 
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import morph.base.actions.impl.GoToFlowAction;
+import morph.base.actions.impl.PublishMessageAction;
+import morph.base.actions.impl.SetVariableAction;
+
 /**
  * Created by jayeshathila
  * on 24/04/17.
  */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, visible = true, property =
+        "name", defaultImpl = Void.class)
+@JsonSubTypes({@JsonSubTypes.Type(value = PublishMessageAction.class, name = PublishMessageAction.PUBLISH),
+        @JsonSubTypes.Type(value = GoToFlowAction.class, name = GoToFlowAction.GO_TO_FLOW),
+        @JsonSubTypes.Type(value = SetVariableAction.class, name = SetVariableAction.SET_VARIABLE)})
 public interface Action {
 
     String getName();

Diff for: src/main/java/morph/base/actions/Action.java

@@ -8,24 +8,20 @@
  */
 public class GoToFlowAction implements Action {
 
+    public static final String GO_TO_FLOW = "goToFlow";
     private final String nextFlowKey;
-    private final boolean rerunCurrentFlow;
+
 
     public GoToFlowAction(String nextFlowKey, boolean rerunCurrectFlow) {
         this.nextFlowKey = nextFlowKey;
-        this.rerunCurrentFlow = rerunCurrectFlow;
     }
 
     public String getNextFlowKey() {
         return nextFlowKey;
     }
 
-    public boolean isRerunCurrentFlow() {
-        return rerunCurrentFlow;
-    }
-
     @Override
     public String getName() {
-        return "goToFlow";
+        return GO_TO_FLOW;
     }
 }

Diff for: src/main/java/morph/base/actions/impl/GoToFlowAction.java

@@ -9,6 +9,7 @@
  */
 public class PublishMessageAction implements Action {
 
+    public static final String PUBLISH = "publish";
     private SimplifiedMessage simplifiedMessage;
 
     public SimplifiedMessage getSimplifiedMessage() {
@@ -21,6 +22,6 @@ public void setSimplifiedMessage(SimplifiedMessage simplifiedMessage) {
 
     @Override
     public String getName() {
-        return "publish";
+        return PUBLISH;
     }
 }

Diff for: src/main/java/morph/base/actions/impl/PublishMessageAction.java

@@ -10,6 +10,7 @@
  */
 public class SetVariableAction implements Action {
 
+    public static final String SET_VARIABLE = "setVariableAction";
     private VariableScope variableScope;
     private String variableKey;
     private String variableTitle;
@@ -61,7 +62,7 @@ public void setVariableTitle(String variableTitle) {
 
     @Override
     public String getName() {
-        return "setVariableAction";
+        return SET_VARIABLE;
     }
 
     @Override

Diff for: src/main/java/morph/base/actions/impl/SetVariableAction.java

@@ -16,33 +16,29 @@ public class SimplifiedMessage {
     /**
      * Represents the customer interface account key
      */
-    @JsonProperty(SimplifiedMessageMapping.USER_ID)
-    private String customerIAK;
+    private String userId;
 
-    @JsonProperty(SimplifiedMessageMapping.BOT_ID)
     private String botId;
 
     /**
      * The main field that contains the message content
      */
-    @JsonProperty(SimplifiedMessage.SimplifiedMessageMapping.MESSAGES)
-    private List<SimplifiedMessagePayload> payloads;
+    private List<SimplifiedMessagePayload> messages;
 
-
-    public String getCustomerIAK() {
-        return customerIAK;
+    public String getUserId() {
+        return userId;
     }
 
-    public void setCustomerIAK(String customerIAK) {
-        this.customerIAK = customerIAK;
+    public void setUserId(String userId) {
+        this.userId = userId;
     }
 
-    public List<SimplifiedMessagePayload> getPayloads() {
-        return payloads;
+    public List<SimplifiedMessagePayload> getMessages() {
+        return messages;
     }
 
-    public void setPayloads(List<SimplifiedMessagePayload> payloads) {
-        this.payloads = payloads;
+    public void setMessages(List<SimplifiedMessagePayload> messages) {
+        this.messages = messages;
     }
 
     public String getBotId() {
@@ -53,19 +49,12 @@ public void setBotId(String botId) {
         this.botId = botId;
     }
 
-    public interface SimplifiedMessageMapping {
-        String USER_ID = "user_id";
-        String BOT_ID = "bot_id";
-        String MESSAGE_TYPE = "type";
-        String MESSAGES = "messages";
-    }
-
     @Override
     public String toString() {
         return "SimplifiedMessage{" +
-                "customerIAK='" + customerIAK + '\'' +
+                "userId='" + userId + '\'' +
                 ", botId='" + botId + '\'' +
-                ", payloads=" + payloads +
+                ", messages=" + messages +
                 '}';
     }
 }

Diff for: src/main/java/morph/base/beans/simplifiedmessage/SimplifiedMessage.java

@@ -20,7 +20,6 @@ public abstract class SimplifiedMessagePayload {
 
     private List<SuggestionElement> suggestionElements;
 
-    @JsonProperty(SimplifiedMessage.SimplifiedMessageMapping.MESSAGE_TYPE)
     private MessageType messageType;
 
     public SimplifiedMessagePayload(MessageType messageType) {