Apply fjtirado suggestions

Signed-off-by: Matheus Cruz <matheuscruz.dev@gmail.com>

Author: mcruzdev

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

@@ -64,6 +64,29 @@ public Optional<Number> asNumber() {
     return object instanceof Number value ? Optional.of(value) : Optional.empty();
   }
 
+  @Override
+  @SuppressWarnings("unchecked")
+  protected <T> Optional<T> asNumber(Class<?> targetNumberClass) {
+    if (!(object instanceof Number num)) {
+      return Optional.empty();
+    }
+    if (targetNumberClass == Integer.class) {
+      return (Optional<T>) Optional.of(num.intValue());
+    } else if (targetNumberClass == Long.class) {
+      return (Optional<T>) Optional.of(num.longValue());
+    } else if (targetNumberClass == Double.class) {
+      return (Optional<T>) Optional.of(num.doubleValue());
+    } else if (targetNumberClass == Float.class) {
+      return (Optional<T>) Optional.of(num.floatValue());
+    } else if (targetNumberClass == Short.class) {
+      return (Optional<T>) Optional.of(num.shortValue());
+    } else if (targetNumberClass == Byte.class) {
+      return (Optional<T>) Optional.of(num.byteValue());
+    } else {
+      return (Optional<T>) Optional.of(num);
+    }
+  }
+
   @Override
   public Optional<Map<String, Object>> asMap() {
     return object instanceof Map ? Optional.of((Map<String, Object>) object) : Optional.empty();

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

@@ -24,6 +24,8 @@ public abstract class AbstractWorkflowModel implements WorkflowModel {
 
   protected abstract <T> Optional<T> convert(Class<T> clazz);
 
+  protected abstract <T> Optional<T> asNumber(Class<?> targetNumberClass);
+
   @Override
   public <T> Optional<T> as(Class<T> clazz) {
     if (WorkflowModel.class.isAssignableFrom(clazz)) {
@@ -35,7 +37,7 @@ public <T> Optional<T> as(Class<T> clazz) {
     } else if (OffsetDateTime.class.isAssignableFrom(clazz)) {
       return (Optional<T>) asDate();
     } else if (Number.class.isAssignableFrom(clazz)) {
-      return asNumber().map(num -> convertNumber(num, clazz));
+      return asNumber(clazz);
     } else if (Collection.class.isAssignableFrom(clazz)) {
       Collection<?> collection = asCollection();
       return collection.isEmpty() ? Optional.empty() : (Optional<T>) Optional.of(collection);
@@ -45,23 +47,4 @@ public <T> Optional<T> as(Class<T> clazz) {
       return convert(clazz);
     }
   }
-
-  @SuppressWarnings("unchecked")
-  private <T> T convertNumber(Number num, Class<T> clazz) {
-    if (clazz == Integer.class) {
-      return (T) Integer.valueOf(num.intValue());
-    } else if (clazz == Long.class) {
-      return (T) Long.valueOf(num.longValue());
-    } else if (clazz == Double.class) {
-      return (T) Double.valueOf(num.doubleValue());
-    } else if (clazz == Float.class) {
-      return (T) Float.valueOf(num.floatValue());
-    } else if (clazz == Short.class) {
-      return (T) Short.valueOf(num.shortValue());
-    } else if (clazz == Byte.class) {
-      return (T) Byte.valueOf(num.byteValue());
-    } else {
-      return (T) num;
-    }
-  }
 }

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

@@ -69,6 +69,29 @@ public Optional<Number> asNumber() {
     return node.isNumber() ? Optional.of(node.asLong()) : Optional.empty();
   }
 
+  @Override
+  @SuppressWarnings("unchecked")
+  protected <T> Optional<T> asNumber(Class<?> targetNumberClass) {
+    if (!node.isNumber()) {
+      return Optional.empty();
+    }
+    if (targetNumberClass == Integer.class) {
+      return (Optional<T>) Optional.of(node.asInt());
+    } else if (targetNumberClass == Long.class) {
+      return (Optional<T>) Optional.of(node.asLong());
+    } else if (targetNumberClass == Double.class) {
+      return (Optional<T>) Optional.of(node.asDouble());
+    } else if (targetNumberClass == Float.class) {
+      return (Optional<T>) Optional.of((float) node.asDouble());
+    } else if (targetNumberClass == Short.class) {
+      return (Optional<T>) Optional.of((short) node.asInt());
+    } else if (targetNumberClass == Byte.class) {
+      return (Optional<T>) Optional.of((byte) node.asInt());
+    } else {
+      return (Optional<T>) Optional.of(node.numberValue());
+    }
+  }
+
   @Override
   public String toString() {
     return node.toPrettyString();