Skip to content

Commit b4d7cc9

Browse files
committed
ajust JavaForExecutorBuilder and ForTaskFunction
1 parent 459f8dc commit b4d7cc9

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaForExecutorBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ protected WorkflowValueResolver<Collection<?>> buildCollectionFilter() {
7171
private Object collectionFilterObject(ForTaskFunction taskFunctions) {
7272
return taskFunctions
7373
.getForClass()
74-
.<Object>map(
75-
forClass -> (Object) new TypedFunction(taskFunctions.getCollection(), (Class) forClass))
74+
.map(forClass -> new TypedFunction(taskFunctions.getCollection(), forClass))
7675
.orElse(taskFunctions.getCollection());
7776
}
7877
}

experimental/types/src/main/java/io/serverlessworkflow/api/types/func/ForTaskFunction.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ public class ForTaskFunction extends ForTask {
3131
private Optional<Class<?>> forClass = Optional.empty();
3232
private Function<?, Collection<?>> collection;
3333

34-
public ForTaskFunction() {
35-
normalizeOptionalFields();
36-
}
37-
3834
public <T, V> ForTaskFunction withWhile(LoopPredicate<T, V> whilePredicate) {
3935
return withWhile(toPredicate(whilePredicate));
4036
}
@@ -118,8 +114,8 @@ private <T, V> ForTaskFunction withWhile(
118114
Optional<Class<?>> modelClass,
119115
Optional<Class<?>> itemClass) {
120116
this.whilePredicate = whilePredicate;
121-
this.whileClass = modelClass != null ? modelClass : Optional.empty();
122-
this.itemClass = itemClass != null ? itemClass : Optional.empty();
117+
this.whileClass = modelClass;
118+
this.itemClass = itemClass;
123119
return this;
124120
}
125121

@@ -168,6 +164,7 @@ private void normalizeOptionalFields() {
168164

169165
private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {
170166
input.defaultReadObject();
167+
// Preserve compatibility with older serialized instances that may have null optionals.
171168
normalizeOptionalFields();
172169
}
173170
}

0 commit comments

Comments
 (0)