Fix model hierarchy backward compatibility

Provide a default asNumber(Class<N> targerNumberClass) implementation

Signed-off-by: fjtirado <ftirados@redhat.com>

Author: fjtirado

experimental/model/src/main/java/io/serverlessworkflow/impl/model/func/JavaModel.java

@@ -17,8 +17,6 @@
 
 import io.serverlessworkflow.impl.AbstractWorkflowModel;
 import io.serverlessworkflow.impl.WorkflowModel;
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.time.OffsetDateTime;
 import java.util.Collection;
 import java.util.Collections;
@@ -68,29 +66,7 @@ public Optional<Number> asNumber() {
 
   @Override
   protected <N extends Number> Optional<N> asNumber(Class<N> targetNumberClass) {
-
-    if (object instanceof Number num) {
-      if (targetNumberClass.isInstance(object)) {
-        return Optional.of(targetNumberClass.cast(object));
-      } else if (targetNumberClass == Integer.class) {
-        return Optional.of(targetNumberClass.cast(num.intValue()));
-      } else if (targetNumberClass == Long.class) {
-        return Optional.of(targetNumberClass.cast(num.longValue()));
-      } else if (targetNumberClass == Double.class) {
-        return Optional.of(targetNumberClass.cast(num.doubleValue()));
-      } else if (targetNumberClass == Float.class) {
-        return Optional.of(targetNumberClass.cast(num.floatValue()));
-      } else if (targetNumberClass == Short.class) {
-        return Optional.of(targetNumberClass.cast(num.shortValue()));
-      } else if (targetNumberClass == Byte.class) {
-        return Optional.of(targetNumberClass.cast(num.byteValue()));
-      } else if (targetNumberClass == BigDecimal.class) {
-        return Optional.of(targetNumberClass.cast(BigDecimal.valueOf(num.doubleValue())));
-      } else if (targetNumberClass == BigInteger.class) {
-        return Optional.of(targetNumberClass.cast(BigInteger.valueOf(num.longValue())));
-      }
-    }
-    return Optional.empty();
+    return object instanceof Number num ? asSubclass(num, targetNumberClass) : Optional.empty();
   }
 
   @Override

impl/core/src/main/java/io/serverlessworkflow/impl/AbstractWorkflowModel.java

@@ -15,6 +15,8 @@
  */
 package io.serverlessworkflow.impl;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.OffsetDateTime;
 import java.util.Collection;
 import java.util.Map;
@@ -24,7 +26,33 @@ public abstract class AbstractWorkflowModel implements WorkflowModel {
 
   protected abstract <T> Optional<T> convert(Class<T> clazz);
 
-  protected abstract <N extends Number> Optional<N> asNumber(Class<N> targetNumberClass);
+  protected final <N extends Number> Optional<N> asSubclass(
+      Number num, Class<N> targetNumberClass) {
+    if (targetNumberClass.isInstance(num)) {
+      return Optional.of(targetNumberClass.cast(num));
+    } else if (targetNumberClass == Integer.class) {
+      return Optional.of(targetNumberClass.cast(num.intValue()));
+    } else if (targetNumberClass == Long.class) {
+      return Optional.of(targetNumberClass.cast(num.longValue()));
+    } else if (targetNumberClass == Double.class) {
+      return Optional.of(targetNumberClass.cast(num.doubleValue()));
+    } else if (targetNumberClass == Float.class) {
+      return Optional.of(targetNumberClass.cast(num.floatValue()));
+    } else if (targetNumberClass == Short.class) {
+      return Optional.of(targetNumberClass.cast(num.shortValue()));
+    } else if (targetNumberClass == Byte.class) {
+      return Optional.of(targetNumberClass.cast(num.byteValue()));
+    } else if (targetNumberClass == BigDecimal.class) {
+      return Optional.of(targetNumberClass.cast(BigDecimal.valueOf(num.doubleValue())));
+    } else if (targetNumberClass == BigInteger.class) {
+      return Optional.of(targetNumberClass.cast(BigInteger.valueOf(num.longValue())));
+    }
+    return Optional.empty();
+  }
+
+  protected <N extends Number> Optional<N> asNumber(Class<N> targetNumberClass) {
+    return asNumber().flatMap(n -> asSubclass(n, targetNumberClass));
+  }
 
   @Override
   public <T> Optional<T> as(Class<T> clazz) {

impl/model/src/main/java/io/serverlessworkflow/impl/model/jackson/JacksonModel.java

@@ -68,7 +68,7 @@ public Optional<OffsetDateTime> asDate() {
 
   @Override
   public Optional<Number> asNumber() {
-    return node.isNumber() ? Optional.of(node.asLong()) : Optional.empty();
+    return node.isNumber() ? Optional.of(node.numberValue()) : Optional.empty();
   }
 
   @Override

impl/test/src/test/java/io/serverlessworkflow/impl/test/RunShellExecutorTest.java

@@ -166,7 +166,7 @@ void testExitCode() throws IOException {
       SoftAssertions.assertSoftly(
           softly -> {
             softly.assertThat(outputModel.asNumber()).isPresent();
-            softly.assertThat(outputModel.asNumber().get()).isNotEqualTo(0);
+            softly.assertThat(outputModel.asNumber().get()).isEqualTo(0);
           });
     }
   }