Resolve some issues added by recents merges (#1210)

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

Author: fjtirado

…l/test/WorkflowNumberConversionTest.java …s/func/WorkflowNumberConversionTest.javaimpl/test/src/test/java/io/serverlessworkflow/impl/test/WorkflowNumberConversionTest.java renamed to experimental/lambda/src/test/java/io/serverless/workflow/impl/executors/func/WorkflowNumberConversionTest.java impl/test/src/test/java/io/serverlessworkflow/impl/test/WorkflowNumberConversionTest.java renamed to experimental/lambda/src/test/java/io/serverless/workflow/impl/executors/func/WorkflowNumberConversionTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.test;
+package io.serverless.workflow.impl.executors.func;
 
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.function;
 

…workflow/impl/test/WorkflowThenTest.java …mpl/executors/func/WorkflowThenTest.javaimpl/test/src/test/java/io/serverlessworkflow/impl/test/WorkflowThenTest.java renamed to experimental/lambda/src/test/java/io/serverless/workflow/impl/executors/func/WorkflowThenTest.java impl/test/src/test/java/io/serverlessworkflow/impl/test/WorkflowThenTest.java renamed to experimental/lambda/src/test/java/io/serverless/workflow/impl/executors/func/WorkflowThenTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.test;
+package io.serverless.workflow.impl.executors.func;
 
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.consume;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.function;

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

@@ -68,24 +68,29 @@ public Optional<Number> asNumber() {
 
   @Override
   protected <N extends Number> Optional<N> asNumber(Class<N> targetNumberClass) {
-    if (!(object instanceof Number num)) {
-      return Optional.empty();
-    }
-    if (targetNumberClass == Integer.class || targetNumberClass == BigInteger.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 || targetNumberClass == BigDecimal.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 {
-      return Optional.of(targetNumberClass.cast(num));
+
+    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();
   }
 
   @Override

impl/test/pom.xml

@@ -94,18 +94,6 @@
             <artifactId>grpc-netty</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-experimental-fluent-func</artifactId>
-            <scope>test</scope>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-experimental-lambda</artifactId>
-            <scope>test</scope>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <resources>