Implement missing Arazzo spec features

src/main/java/com/apiflows/model/Action.java

@@ -0,0 +1,60 @@
+package com.apiflows.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class Action {
+
+    private String name;
+    private String type;
+    private String workflowId;
+    private String stepId;
+    private List<Criterion> criteria;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getWorkflowId() {
+        return workflowId;
+    }
+
+    public void setWorkflowId(String workflowId) {
+        this.workflowId = workflowId;
+    }
+
+    public String getStepId() {
+        return stepId;
+    }
+
+    public void setStepId(String stepId) {
+        this.stepId = stepId;
+    }
+
+    public List<Criterion> getCriteria() {
+        return criteria;
+    }
+
+    public void setCriteria(List<Criterion> criteria) {
+        this.criteria = criteria;
+    }
+
+    public void addCriteria(Criterion criterion) {
+        if (this.criteria == null) {
+            this.criteria = new ArrayList<>();
+        }
+        this.criteria.add(criterion);
+    }
+}

src/main/java/com/apiflows/model/Criterion.java

@@ -1,12 +1,16 @@
 package com.apiflows.model;
 
+import com.apiflows.parser.util.CriterionTypeDeserializer;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 public class Criterion {
 
     private String condition;
     private String context;
-    private String type;
+
+    @JsonDeserialize(using = CriterionTypeDeserializer.class)
+    private Object type;
 
     public String getCondition() {
         return condition;
@@ -24,14 +28,25 @@
         this.context = context;
     }
 
+    /** Returns the simple string type (e.g. "simple", "regex") or null if an expression type object is used. */
+    @JsonProperty("type")
     public String getType() {
-        return type;
+        return type instanceof String ? (String) type : null;
     }
 
     public void setType(String type) {
         this.type = type;
     }
 
+    /** Returns the expression type object when type is "jsonpath" or "xpath" with a version, or null otherwise. */
+    public CriterionExpressionType getExpressionType() {
+        return type instanceof CriterionExpressionType ? (CriterionExpressionType) type : null;
+    }
+
+    public void setExpressionType(CriterionExpressionType expressionType) {
+        this.type = expressionType;
+    }
+
     public Criterion condition(String condition) {
         this.condition = condition;
         return this;
@@ -46,5 +61,10 @@
         this.type = type;
         return this;
     }
+
+    public Criterion expressionType(CriterionExpressionType expressionType) {
+        this.type = expressionType;
+        return this;
+    }
 }
 

src/main/java/com/apiflows/model/CriterionExpressionType.java

@@ -0,0 +1,37 @@
+package com.apiflows.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class CriterionExpressionType {
+
+    private String type;
+    private String version;
+
+    @JsonProperty("type")
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @JsonProperty("version")
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public CriterionExpressionType type(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public CriterionExpressionType version(String version) {
+        this.version = version;
+        return this;
+    }
+}

src/main/java/com/apiflows/model/FailureAction.java

@@ -1,40 +1,9 @@
 package com.apiflows.model;
 
-import java.util.ArrayList;
-import java.util.List;
+public class FailureAction extends Action {
 
-public class FailureAction {
-
-    private String type;
-    private String workflowId;
-    private String stepId;
     private Double retryAfter;
     private Integer retryLimit;
-    private List<Criterion> criteria;
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getWorkflowId() {
-        return workflowId;
-    }
-
-    public void setWorkflowId(String workflowId) {
-        this.workflowId = workflowId;
-    }
-
-    public String getStepId() {
-        return stepId;
-    }
-
-    public void setStepId(String stepId) {
-        this.stepId = stepId;
-    }
 
     public Double getRetryAfter() {
         return retryAfter;
@@ -52,26 +21,23 @@ public void setRetryLimit(Integer retryLimit) {
         this.retryLimit = retryLimit;
     }
 
-    public List<Criterion> getCriteria() {
-        return criteria;
-    }
-
-    public void setCriteria(List<Criterion> criteria) {
-        this.criteria = criteria;
+    public FailureAction name(String name) {
+        setName(name);
+        return this;
     }
 
     public FailureAction type(String type) {
-        this.type = type;
+        setType(type);
         return this;
     }
 
     public FailureAction stepId(String stepId) {
-        this.stepId = stepId;
+        setStepId(stepId);
         return this;
     }
 
     public FailureAction workflowId(String workflowId) {
-        this.workflowId = workflowId;
+        setWorkflowId(workflowId);
         return this;
     }
 
@@ -84,11 +50,4 @@ public FailureAction retryLimit(Integer retryLimit) {
         this.retryLimit = retryLimit;
         return this;
     }
-
-    public void addCriteria(Criterion criterion) {
-        if(this.criteria == null) {
-            this.criteria = new ArrayList<>();
-        }
-        this.criteria.add(criterion);
-    }
 }

src/main/java/com/apiflows/model/Info.java

@@ -5,6 +5,7 @@
 public class Info {
 
     private String title;
+    private String summary;
     private String version;
     private String description;
 
@@ -17,6 +18,15 @@ public void setTitle(String title) {
         this.title = title;
     }
 
+    @JsonProperty("summary")
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
     @JsonProperty("version")
     public String getVersion() {
         return version;
@@ -40,6 +50,11 @@ public Info title(String title) {
         return this;
     }
 
+    public Info summary(String summary) {
+        this.summary = summary;
+        return this;
+    }
+
     public Info version(String version) {
         this.version = version;
         return this;

src/main/java/com/apiflows/model/Parameter.java

@@ -6,7 +6,7 @@ public class Parameter {
 
     private String name;
     private String in;
-    private String value;
+    private Object value;
     private String reference;
 
     @JsonProperty("name")
@@ -28,11 +28,11 @@ public void setIn(String in) {
     }
 
     @JsonProperty("value")
-    public String getValue() {
+    public Object getValue() {
         return value;
     }
 
-    public void setValue(String value) {
+    public void setValue(Object value) {
         this.value = value;
     }
 
@@ -55,7 +55,7 @@ public Parameter in(String in) {
         return this;
     }
 
-    public Parameter value(String value) {
+    public Parameter value(Object value) {
         this.value = value;
         return this;
     }

src/main/java/com/apiflows/model/SuccessAction.java

@@ -1,66 +1,24 @@
 package com.apiflows.model;
 
-import java.util.ArrayList;
-import java.util.List;
+public class SuccessAction extends Action {
 
-public class SuccessAction {
-
-    private String type;
-    private String workflowId;
-    private String stepId;
-    private List<Criterion> criteria;
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getWorkflowId() {
-        return workflowId;
-    }
-
-    public void setWorkflowId(String workflowId) {
-        this.workflowId = workflowId;
-    }
-
-    public String getStepId() {
-        return stepId;
-    }
-
-    public void setStepId(String stepId) {
-        this.stepId = stepId;
-    }
-
-    public List<Criterion> getCriteria() {
-        return criteria;
-    }
-
-    public void setCriteria(List<Criterion> criteria) {
-        this.criteria = criteria;
-    }
-
-    public void addCriteria(Criterion criterion) {
-        if(this.criteria == null) {
-            this.criteria = new ArrayList<>();
-        }
-        this.criteria.add(criterion);
+    public SuccessAction name(String name) {
+        setName(name);
+        return this;
     }
 
     public SuccessAction type(String type) {
-        this.type = type;
+        setType(type);
         return this;
     }
 
     public SuccessAction workflowId(String workflowId) {
-        this.workflowId = workflowId;
+        setWorkflowId(workflowId);
         return this;
     }
 
     public SuccessAction stepId(String stepId) {
-        this.stepId = stepId;
+        setStepId(stepId);
         return this;
     }
 }