[KF-324] Refactor openapi.yaml, add discriminator.

pom.xml

@@ -279,21 +279,16 @@
                 <!-- Task Elements -->
                 <typeMapping>OneOfTaskElementValuearrayTaskElementValueDocumentarrayResource=TaskElementValueWrapperResource</typeMapping>
                 <typeMapping>OneOfTaskElementValuearrayResource=TaskElementValueWrapperResource</typeMapping>
-                <typeMapping>OneOfstringnumberTaskElementValueDocumentobjectResource=TaskElementValueItemResource</typeMapping>
-                <typeMapping>OneOfstringnumberTaskElementValueDocumentobjectTaskElementValuePrincipalResource=TaskElementValueItemResource</typeMapping>
                 <!-- Process Elements -->
                 <typeMapping>OneOfProcessElementValueResource=ProcessElementValueWrapperResource</typeMapping>
-                <typeMapping>OneOfstringnumberResource=ProcessElementValueItemResource</typeMapping>
               </typeMappings>
               <importMappings>
                 <importMapping>java.time.OffsetDateTime=java.time.Instant</importMapping>
                 <!-- Task Elements -->
                 <importMapping>OneOfTaskElementValuearrayTaskElementValueDocumentarrayResource=com.kuflow.rest.client.resource.TaskElementValueWrapperResource</importMapping>
                 <importMapping>OneOfTaskElementValuearrayResource=com.kuflow.rest.client.resource.TaskElementValueWrapperResource</importMapping>
-                <importMapping>OneOfstringnumberTaskElementValueDocumentobjectTaskElementValuePrincipalResource=com.kuflow.rest.client.resource.TaskElementValueItemResource</importMapping>
                 <!-- Process Elements -->
                 <importMapping>OneOfProcessElementValueResource=com.kuflow.rest.client.resource.ProcessElementValueWrapperResource</importMapping>
-                <importMapping>OneOfstringnumberResource=com.kuflow.rest.client.resource.ProcessElementValueItemResource</importMapping>
               </importMappings>
               <globalProperties>
                 <!-- No skip models defined as the form parameters in "requestBody", ie: multipart/form-data -->

src/main/java/com/kuflow/rest/client/resource/ProcessElementValueWrapperResource.java

@@ -8,7 +8,11 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.kuflow.rest.client.KuFlowRestClientException;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.function.Function;
 
 @JsonDeserialize(using = ProcessElementValueWrapperResourceDeserializer.class)
 @JsonSerialize(using = ProcessElementValueWrapperResourceSerializer.class)
@@ -41,7 +45,44 @@ public static ProcessElementValueWrapperResource of(LocalDate value) {
         return toProcessElementWrapperResource(value);
     }
 
-    private static <T> ProcessElementValueWrapperResource toProcessElementWrapperResource(Object value) {
+    public ProcessElementValueResource getValue() {
+        return this.getValueAsProcessElementValue();
+    }
+
+    public String getValueAsString() {
+        return this.getValueAs(this::getValueAsString);
+    }
+
+    public Double getValueAsDouble() {
+        return this.getValueAs(this::getValueAsDouble);
+    }
+
+    public LocalDate getValueAsLocalDate() {
+        return this.getValueAs(this::getValueAsLocalDate);
+    }
+
+    public Boolean getValid() {
+        if (this.value == null) {
+            return null;
+        }
+
+        ProcessElementValueResource elementValueResource = (ProcessElementValueResource) this.value;
+
+        return elementValueResource.getValid();
+    }
+
+    public ProcessElementValueWrapperResource valid(Boolean value) {
+        if (this.value == null) {
+            throw new UnsupportedOperationException();
+        }
+
+        ProcessElementValueResource elementValueResource = (ProcessElementValueResource) this.value;
+        elementValueResource.setValid(value);
+
+        return this;
+    }
+
+    private static ProcessElementValueWrapperResource toProcessElementWrapperResource(Object value) {
         if (value == null) {
             throw new IllegalArgumentException("Some value is required");
         }
@@ -52,79 +93,104 @@ private static <T> ProcessElementValueWrapperResource toProcessElementWrapperRes
     }
 
     private static ProcessElementValueResource toProcessElementValueResource(Object value) {
-        ProcessElementValueResource elementValueResource = new ProcessElementValueResource();
-
         if (value instanceof String) {
-            elementValueResource.value(ProcessElementValueItemResource.of((String) value));
+            return toProcessElementValueResourceString((String) value);
         } else if (value instanceof Double) {
-            elementValueResource.value(ProcessElementValueItemResource.of((Double) value));
+            return toProcessElementValueResourceNumber((Double) value);
         } else if (value instanceof LocalDate) {
-            elementValueResource.value(ProcessElementValueItemResource.of((LocalDate) value));
+            return toProcessElementValueResourceString(value.toString());
         } else {
-            throw new IllegalArgumentException(String.format("Unkown type %s", value.getClass().getName()));
+            throw new IllegalArgumentException(String.format("Unknown type %s", value.getClass().getName()));
         }
+    }
+
+    private static ProcessElementValueStringResource toProcessElementValueResourceString(String value) {
+        ProcessElementValueStringResource elementValueResource = new ProcessElementValueStringResource();
+        elementValueResource.setType(ProcessElementValueTypeResource.STRING);
+        elementValueResource.value(value);
 
         return elementValueResource;
     }
 
-    public ProcessElementValueResource getValue() {
-        if (this.value == null) {
-            return null;
-        }
-
-        ProcessElementValueResource elementValueResource = (ProcessElementValueResource) this.value;
+    private static ProcessElementValueNumberResource toProcessElementValueResourceNumber(Double value) {
+        ProcessElementValueNumberResource elementValueResource = new ProcessElementValueNumberResource();
+        elementValueResource.setType(ProcessElementValueTypeResource.NUMBER);
+        elementValueResource.value(value);
 
         return elementValueResource;
     }
 
-    public String getValueAsString() {
-        if (this.value == null) {
+    private <R> R getValueAs(Function<ProcessElementValueResource, R> cb) {
+        ProcessElementValueResource value = this.getValueAsProcessElementValue();
+        if (value == null) {
             return null;
         }
 
-        ProcessElementValueResource elementValueResource = (ProcessElementValueResource) this.value;
-
-        return elementValueResource.getValue().getValueAsString();
+        return cb.apply(value);
     }
 
-    public Double getValueAsDouble() {
-        if (this.value == null) {
-            return null;
+    private String getValueAsString(ProcessElementValueResource value) {
+        if (value.getType().equals(ProcessElementValueTypeResource.STRING) && (value instanceof ProcessElementValueStringResource)) {
+            ProcessElementValueStringResource valueString = (ProcessElementValueStringResource) value;
+
+            return valueString.getValue();
         }
 
-        ProcessElementValueResource elementValueResource = (ProcessElementValueResource) this.value;
+        if (value.getType().equals(ProcessElementValueTypeResource.NUMBER) && (value instanceof ProcessElementValueNumberResource)) {
+            ProcessElementValueNumberResource valueNumber = (ProcessElementValueNumberResource) value;
 
-        return elementValueResource.getValue().getValueAsDouble();
+            return valueNumber.getValue() != null ? valueNumber.getValue().toString() : null;
+        }
+
+        throw new KuFlowRestClientException(String.format("value %s is not a String", value));
     }
 
-    public LocalDate getValueAsLocalDate() {
-        if (this.value == null) {
-            return null;
+    private Double getValueAsDouble(ProcessElementValueResource value) {
+        if (value.getType().equals(ProcessElementValueTypeResource.NUMBER) && (value instanceof ProcessElementValueNumberResource)) {
+            ProcessElementValueNumberResource valueNumber = (ProcessElementValueNumberResource) value;
+
+            return valueNumber.getValue();
         }
 
-        ProcessElementValueResource elementValueResource = (ProcessElementValueResource) this.value;
+        if (value.getType().equals(ProcessElementValueTypeResource.STRING) && (value instanceof ProcessElementValueStringResource)) {
+            ProcessElementValueStringResource valueString = (ProcessElementValueStringResource) value;
+
+            try {
+                if (valueString.getValue() == null) {
+                    return null;
+                }
+                return Double.valueOf(valueString.getValue());
+            } catch (NumberFormatException e) {
+                throw new KuFlowRestClientException(String.format("value %s is not a number", valueString), e);
+            }
+        }
 
-        return elementValueResource.getValue().getValueAsLocalDate();
+        throw new KuFlowRestClientException(String.format("value %s is not a Number", value));
     }
 
-    public Boolean getValid() {
-        if (this.value == null) {
+    private LocalDate getValueAsLocalDate(ProcessElementValueResource value) {
+        String valueString = this.getValueAsString(value);
+
+        if (valueString == null) {
             return null;
         }
 
-        ProcessElementValueResource elementValueResource = (ProcessElementValueResource) this.value;
-
-        return elementValueResource.getValid();
+        try {
+            return LocalDate.parse(valueString, DateTimeFormatter.ISO_LOCAL_DATE);
+        } catch (DateTimeParseException e) {
+            throw new KuFlowRestClientException(String.format("value %s is not a date", valueString), e);
+        }
     }
 
-    public ProcessElementValueWrapperResource valid(Boolean value) {
+    private ProcessElementValueResource getValueAsProcessElementValue() {
         if (this.value == null) {
-            throw new UnsupportedOperationException();
+            return null;
         }
 
-        ProcessElementValueResource elementValueResource = (ProcessElementValueResource) this.value;
-        elementValueResource.setValid(value);
+        if (this.value instanceof ProcessElementValueResource) {
+            return (ProcessElementValueResource) this.value;
+        }
 
-        return this;
+        throw new IllegalArgumentException(String.format("Unknown value type %s", this.value.getClass().getName()));
     }
 }