Skip to content

Fix model hierarchy backward compatibility #1214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjtirado merged 1 commit into from
Mar 9, 2026
Merged

Fix model hierarchy backward compatibility #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions experimental/model/src/main/java/io/serverlessworkflow/impl/model/func/JavaModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
30 changes: 29 additions & 1 deletion impl/core/src/main/java/io/serverlessworkflow/impl/AbstractWorkflowModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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())));
Copy link

Copilot AI Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

asSubclass converts to BigDecimal via BigDecimal.valueOf(num.doubleValue()), which (a) can throw NumberFormatException for NaN/Infinity inputs and (b) loses precision for large integral values (e.g., Long > 2^53). Consider using type-specific exact conversions (e.g., BigDecimal.valueOf(long) for integral types, new BigDecimal((BigInteger) num) for BigInteger, BigDecimal.valueOf(double) only for floating types) and returning Optional.empty() when conversion is not representable (including non-finite doubles).

Suggested change
return Optional.of(targetNumberClass.cast(BigDecimal.valueOf(num.doubleValue())));
BigDecimal result;
if (num instanceof BigDecimal) {
result = (BigDecimal) num;
} else if (num instanceof BigInteger) {
result = new BigDecimal((BigInteger) num);
} else if (num instanceof Byte
|| num instanceof Short
|| num instanceof Integer
|| num instanceof Long) {
result = BigDecimal.valueOf(num.longValue());
} else if (num instanceof Float || num instanceof Double) {
double d = num.doubleValue();
if (Double.isNaN(d) || Double.isInfinite(d)) {
return Optional.empty();
}
result = BigDecimal.valueOf(d);
} else {
result = new BigDecimal(num.toString());
}
return Optional.of(targetNumberClass.cast(result));

Copilot uses AI. Check for mistakes.
} else if (targetNumberClass == BigInteger.class) {
return Optional.of(targetNumberClass.cast(BigInteger.valueOf(num.longValue())));
}
Comment on lines +45 to +49
Copy link

Copilot AI Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

asSubclass converts to BigDecimal via BigDecimal.valueOf(num.doubleValue()) and to BigInteger via BigInteger.valueOf(num.longValue()), which is lossy for large integral values and for BigInteger/BigDecimal sources outside long/double precision. Since this helper is now shared across models as the default number-conversion path, consider using non-lossy conversions where possible (e.g., BigInteger -> BigDecimal via constructor, BigDecimal -> BigInteger via toBigInteger, and avoiding doubleValue() for integral inputs).

Copilot uses AI. Check for mistakes.
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) {
Expand Down
4 changes: 2 additions & 2 deletions impl/core/src/main/java/io/serverlessworkflow/impl/scripts/ScriptUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ public static WorkflowModel modelFromOutput(
case ALL ->
modelFactory.fromAny(
new ProcessResult(
0, streamSuppliers.outputStream().get(), streamSuppliers.errorStream().get()));
code, streamSuppliers.outputStream().get(), streamSuppliers.errorStream().get()));
case NONE -> model;
case CODE -> modelFactory.from(0);
case CODE -> modelFactory.from(code);
case STDOUT -> modelFactory.from(streamSuppliers.outputStream().get());
Comment on lines 47 to 53
Copy link

Copilot AI Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change fixes exit-code propagation for ProcessReturnType.ALL and CODE, but there’s no regression test covering the failure case when return: all is used (i.e., ensuring ProcessResult.code is non-zero for a failing command). Adding a test workflow that fails with return: all would help prevent this from regressing again.

Copilot uses AI. Check for mistakes.
case STDERR -> modelFactory.from(streamSuppliers.errorStream().get());
};
Expand Down
2 changes: 1 addition & 1 deletion impl/model/src/main/java/io/serverlessworkflow/impl/model/jackson/JacksonModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down