Skip to content

Commit f263728

Browse files
fjtiradofjtirado
authored
[Fix #1209] Adding Context and Filter predicate (#1224)
* [Fix #1209] Adding Context and Filter predicate Signed-off-by: fjtirado <ftirados@redhat.com> * [Fix #1209] Copilot wall of text comments. Signed-off-by: fjtirado <ftirados@redhat.com> --------- Signed-off-by: fjtirado <ftirados@redhat.com>
1 parent fac2213 commit f263728

41 files changed

Lines changed: 531 additions & 259 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import io.serverlessworkflow.api.types.func.CallJava;
1919
import io.serverlessworkflow.api.types.func.CallTaskJava;
20-
import io.serverlessworkflow.api.types.func.JavaContextFunction;
21-
import io.serverlessworkflow.api.types.func.JavaFilterFunction;
20+
import io.serverlessworkflow.api.types.func.ContextFunction;
21+
import io.serverlessworkflow.api.types.func.FilterFunction;
2222
import io.serverlessworkflow.fluent.func.spi.ConditionalTaskBuilder;
2323
import io.serverlessworkflow.fluent.func.spi.FuncTaskTransformations;
2424
import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
@@ -51,22 +51,21 @@ public <T, V> FuncCallTaskBuilder function(Function<T, V> function, Class<T> arg
5151
return this;
5252
}
5353

54-
public <T, V> FuncCallTaskBuilder function(JavaContextFunction<T, V> function) {
54+
public <T, V> FuncCallTaskBuilder function(ContextFunction<T, V> function) {
5555
return function(function, null);
5656
}
5757

58-
public <T, V> FuncCallTaskBuilder function(
59-
JavaContextFunction<T, V> function, Class<T> argClass) {
58+
public <T, V> FuncCallTaskBuilder function(ContextFunction<T, V> function, Class<T> argClass) {
6059
this.callTaskJava = new CallTaskJava(CallJava.function(function, argClass));
6160
super.setTask(this.callTaskJava.getCallJava());
6261
return this;
6362
}
6463

65-
public <T, V> FuncCallTaskBuilder function(JavaFilterFunction<T, V> function) {
64+
public <T, V> FuncCallTaskBuilder function(FilterFunction<T, V> function) {
6665
return function(function, null);
6766
}
6867

69-
public <T, V> FuncCallTaskBuilder function(JavaFilterFunction<T, V> function, Class<T> argClass) {
68+
public <T, V> FuncCallTaskBuilder function(FilterFunction<T, V> function, Class<T> argClass) {
7069
this.callTaskJava = new CallTaskJava(CallJava.function(function, argClass));
7170
super.setTask(this.callTaskJava.getCallJava());
7271
return this;

‎experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.serverlessworkflow.api.types.SwitchCase;
2121
import io.serverlessworkflow.api.types.SwitchItem;
2222
import io.serverlessworkflow.api.types.SwitchTask;
23-
import io.serverlessworkflow.api.types.func.SwitchCaseFunction;
23+
import io.serverlessworkflow.api.types.func.SwitchCasePredicate;
2424
import io.serverlessworkflow.fluent.func.spi.ConditionalTaskBuilder;
2525
import io.serverlessworkflow.fluent.func.spi.FuncTaskTransformations;
2626
import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
@@ -59,7 +59,7 @@ public FuncSwitchTaskBuilder onPredicate(
5959
String name, Consumer<SwitchCasePredicateBuilder> consumer) {
6060
final SwitchCasePredicateBuilder switchCase = new SwitchCasePredicateBuilder();
6161
consumer.accept(switchCase);
62-
final SwitchCaseFunction switchCaseValue = (SwitchCaseFunction) switchCase.build();
62+
final SwitchCasePredicate switchCaseValue = (SwitchCasePredicate) switchCase.build();
6363

6464
// Handling default cases
6565
if (switchCaseValue.predicate() == null) {
@@ -89,10 +89,10 @@ public SwitchTask build() {
8989
}
9090

9191
public static final class SwitchCasePredicateBuilder {
92-
private final SwitchCaseFunction switchCase;
92+
private final SwitchCasePredicate switchCase;
9393

9494
SwitchCasePredicateBuilder() {
95-
this.switchCase = new SwitchCaseFunction();
95+
this.switchCase = new SwitchCasePredicate();
9696
}
9797

9898
public <T> SwitchCasePredicateBuilder when(Predicate<T> when) {

‎experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncCallStep.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.serverlessworkflow.fluent.func.dsl;
1717

18-
import io.serverlessworkflow.api.types.func.JavaContextFunction;
19-
import io.serverlessworkflow.api.types.func.JavaFilterFunction;
18+
import io.serverlessworkflow.api.types.func.ContextFunction;
19+
import io.serverlessworkflow.api.types.func.FilterFunction;
2020
import io.serverlessworkflow.fluent.func.FuncCallTaskBuilder;
2121
import io.serverlessworkflow.fluent.func.FuncTaskItemListBuilder;
2222
import java.util.function.Consumer;
@@ -26,8 +26,8 @@ public final class FuncCallStep<T, R> extends Step<FuncCallStep<T, R>, FuncCallT
2626

2727
private final String name;
2828
private final Function<T, R> fn;
29-
private final JavaContextFunction<T, R> ctxFn;
30-
private final JavaFilterFunction<T, R> filterFn;
29+
private final ContextFunction<T, R> ctxFn;
30+
private final FilterFunction<T, R> filterFn;
3131
private final Class<T> argClass;
3232

3333
/** Function<T,R> variant (unnamed). */
@@ -44,27 +44,27 @@ public final class FuncCallStep<T, R> extends Step<FuncCallStep<T, R>, FuncCallT
4444
this.argClass = argClass;
4545
}
4646

47-
/** JavaContextFunction<T,R> variant (unnamed). */
48-
FuncCallStep(JavaContextFunction<T, R> ctxFn, Class<T> argClass) {
47+
/** ContextFunction<T,R> variant (unnamed). */
48+
FuncCallStep(ContextFunction<T, R> ctxFn, Class<T> argClass) {
4949
this(null, ctxFn, argClass);
5050
}
5151

52-
/** JavaContextFunction<T,R> variant (named). */
53-
FuncCallStep(String name, JavaContextFunction<T, R> ctxFn, Class<T> argClass) {
52+
/** ContextFunction<T,R> variant (named). */
53+
FuncCallStep(String name, ContextFunction<T, R> ctxFn, Class<T> argClass) {
5454
this.name = name;
5555
this.fn = null;
5656
this.ctxFn = ctxFn;
5757
this.filterFn = null;
5858
this.argClass = argClass;
5959
}
6060

61-
/** JavaFilterFunction<T,R> variant (unnamed). */
62-
FuncCallStep(JavaFilterFunction<T, R> filterFn, Class<T> argClass) {
61+
/** FilterFunction<T,R> variant (unnamed). */
62+
FuncCallStep(FilterFunction<T, R> filterFn, Class<T> argClass) {
6363
this(null, filterFn, argClass);
6464
}
6565

66-
/** JavaFilterFunction<T,R> variant (named). */
67-
FuncCallStep(String name, JavaFilterFunction<T, R> filterFn, Class<T> argClass) {
66+
/** FilterFunction<T,R> variant (named). */
67+
FuncCallStep(String name, FilterFunction<T, R> filterFn, Class<T> argClass) {
6868
this.name = name;
6969
this.fn = null;
7070
this.ctxFn = null;

‎experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/FuncDSL.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import io.cloudevents.CloudEventData;
1919
import io.serverlessworkflow.api.types.FlowDirectiveEnum;
20-
import io.serverlessworkflow.api.types.func.JavaContextFunction;
21-
import io.serverlessworkflow.api.types.func.JavaFilterFunction;
20+
import io.serverlessworkflow.api.types.func.ContextFunction;
21+
import io.serverlessworkflow.api.types.func.FilterFunction;
2222
import io.serverlessworkflow.fluent.func.FuncCallTaskBuilder;
2323
import io.serverlessworkflow.fluent.func.FuncEmitTaskBuilder;
2424
import io.serverlessworkflow.fluent.func.FuncSwitchTaskBuilder;
@@ -281,7 +281,7 @@ public static FuncPredicateEventConfigurer event(String type) {
281281

282282
/**
283283
* Build a call step for functions that need {@link WorkflowContextData} as the first parameter.
284-
* The DSL wraps it as a {@link JavaContextFunction} and injects the runtime context.
284+
* The DSL wraps it as a {@link ContextFunction} and injects the runtime context.
285285
*
286286
* <p>Signature expected: {@code (ctx, payload) -> result}
287287
*
@@ -291,16 +291,16 @@ public static FuncPredicateEventConfigurer event(String type) {
291291
* @param <R> result type
292292
* @return a call step
293293
*/
294-
public static <T, R> FuncCallStep<T, R> withContext(JavaContextFunction<T, R> fn, Class<T> in) {
294+
public static <T, R> FuncCallStep<T, R> withContext(ContextFunction<T, R> fn, Class<T> in) {
295295
return withContext(null, fn, in);
296296
}
297297

298-
public static <T, R> FuncCallStep<T, R> withContext(JavaContextFunction<T, R> fn) {
298+
public static <T, R> FuncCallStep<T, R> withContext(ContextFunction<T, R> fn) {
299299
return withContext(null, fn, ReflectionUtils.inferInputType(fn));
300300
}
301301

302302
/**
303-
* Named variant of {@link #withContext(JavaContextFunction, Class)}.
303+
* Named variant of {@link #withContext(ContextFunction, Class)}.
304304
*
305305
* @param name task name
306306
* @param fn context-aware function
@@ -310,18 +310,18 @@ public static <T, R> FuncCallStep<T, R> withContext(JavaContextFunction<T, R> fn
310310
* @return a named call step
311311
*/
312312
public static <T, R> FuncCallStep<T, R> withContext(
313-
String name, JavaContextFunction<T, R> fn, Class<T> in) {
313+
String name, ContextFunction<T, R> fn, Class<T> in) {
314314
return new FuncCallStep<>(name, fn, in);
315315
}
316316

317-
public static <T, R> FuncCallStep<T, R> withContext(String name, JavaContextFunction<T, R> fn) {
317+
public static <T, R> FuncCallStep<T, R> withContext(String name, ContextFunction<T, R> fn) {
318318
return new FuncCallStep<>(name, fn, ReflectionUtils.inferInputType(fn));
319319
}
320320

321321
/**
322322
* Build a call step for functions that need {@link WorkflowContextData} and {@link
323323
* TaskContextData} as the first and second parameter. The DSL wraps it as a {@link
324-
* JavaFilterFunction} and injects the runtime context.
324+
* FilterFunction} and injects the runtime context.
325325
*
326326
* <p>Signature expected: {@code (payload, wctx, tctx) -> result}
327327
*
@@ -331,12 +331,12 @@ public static <T, R> FuncCallStep<T, R> withContext(String name, JavaContextFunc
331331
* @param <R> result type
332332
* @return a call step
333333
*/
334-
public static <T, R> FuncCallStep<T, R> withFilter(JavaFilterFunction<T, R> fn, Class<T> in) {
334+
public static <T, R> FuncCallStep<T, R> withFilter(FilterFunction<T, R> fn, Class<T> in) {
335335
return withFilter(null, fn, in);
336336
}
337337

338338
/**
339-
* Named variant of {@link #withFilter(JavaFilterFunction, Class)}.
339+
* Named variant of {@link #withFilter(FilterFunction, Class)}.
340340
*
341341
* @param name task name
342342
* @param fn context-aware filter function
@@ -346,15 +346,15 @@ public static <T, R> FuncCallStep<T, R> withFilter(JavaFilterFunction<T, R> fn,
346346
* @return a named call step
347347
*/
348348
public static <T, R> FuncCallStep<T, R> withFilter(
349-
String name, JavaFilterFunction<T, R> fn, Class<T> in) {
349+
String name, FilterFunction<T, R> fn, Class<T> in) {
350350
return new FuncCallStep<>(name, fn, in);
351351
}
352352

353-
public static <T, R> FuncCallStep<T, R> withFilter(JavaFilterFunction<T, R> fn) {
353+
public static <T, R> FuncCallStep<T, R> withFilter(FilterFunction<T, R> fn) {
354354
return withFilter(null, fn, ReflectionUtils.inferInputType(fn));
355355
}
356356

357-
public static <T, R> FuncCallStep<T, R> withFilter(String name, JavaFilterFunction<T, R> fn) {
357+
public static <T, R> FuncCallStep<T, R> withFilter(String name, FilterFunction<T, R> fn) {
358358
return withFilter(name, fn, ReflectionUtils.inferInputType(fn));
359359
}
360360

@@ -370,7 +370,7 @@ public static <T, R> FuncCallStep<T, R> withFilter(String name, JavaFilterFuncti
370370
*/
371371
public static <T, R> FuncCallStep<T, R> withInstanceId(
372372
String name, InstanceIdFunction<T, R> fn, Class<T> in) {
373-
JavaContextFunction<T, R> jcf = (payload, wctx) -> fn.apply(wctx.instanceData().id(), payload);
373+
ContextFunction<T, R> jcf = (payload, wctx) -> fn.apply(wctx.instanceData().id(), payload);
374374
return new FuncCallStep<>(name, jcf, in);
375375
}
376376

@@ -426,7 +426,7 @@ static String defaultUniqueId(WorkflowContextData wctx, TaskContextData tctx) {
426426
*/
427427
public static <T, R> FuncCallStep<T, R> withUniqueId(
428428
String name, UniqueIdBiFunction<T, R> fn, Class<T> in) {
429-
JavaFilterFunction<T, R> jff =
429+
FilterFunction<T, R> jff =
430430
(payload, wctx, tctx) -> fn.apply(defaultUniqueId(wctx, tctx), payload);
431431
return new FuncCallStep<>(name, jff, in);
432432
}

‎experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/dsl/ReflectionUtils.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.serverlessworkflow.fluent.func.dsl;
1717

18-
import io.serverlessworkflow.api.types.func.JavaContextFunction;
19-
import io.serverlessworkflow.api.types.func.JavaFilterFunction;
18+
import io.serverlessworkflow.api.types.func.ContextFunction;
19+
import io.serverlessworkflow.api.types.func.FilterFunction;
2020
import java.lang.invoke.MethodType;
2121
import java.lang.invoke.SerializedLambda;
2222
import java.lang.reflect.Method;
@@ -32,12 +32,12 @@ final class ReflectionUtils {
3232
private ReflectionUtils() {}
3333

3434
@SuppressWarnings("unchecked")
35-
static <T> Class<T> inferInputType(JavaContextFunction<T, ?> fn) {
35+
static <T> Class<T> inferInputType(ContextFunction<T, ?> fn) {
3636
return throwIllegalStateIfNull((Class<T>) inferInputTypeFromAny(fn, 0));
3737
}
3838

3939
@SuppressWarnings("unchecked")
40-
static <T> Class<T> inferInputType(JavaFilterFunction<T, ?> fn) {
40+
static <T> Class<T> inferInputType(FilterFunction<T, ?> fn) {
4141
return throwIllegalStateIfNull((Class<T>) inferInputTypeFromAny(fn, 0));
4242
}
4343

0 commit comments

Comments
 (0)