From 168eb4e55d2d1e20000f04a1a79f637fc96b899c Mon Sep 17 00:00:00 2001
From: fjtirado <ftirados@redhat.com>
Date: Tue, 17 Feb 2026 16:04:06 +0100
Subject: [PATCH] Refactor experimental fluent dependencies

It is better to keep the dsl test as they were and put the model
test in the lambda module

Signed-off-by: fjtirado <ftirados@redhat.com>
---
 experimental/fluent/func/pom.xml              | 12 -----------
 .../fluent/func/FuncDSLTest.java              | 20 +------------------
 .../executors/func/FluentDSLCallTest.java     | 19 ++++++++++++++++++
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/experimental/fluent/func/pom.xml b/experimental/fluent/func/pom.xml
index 5beaf49d1..dcf2aa96f 100644
--- a/experimental/fluent/func/pom.xml
+++ b/experimental/fluent/func/pom.xml
@@ -45,17 +45,5 @@
             <version>${version.org.mockito}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-impl-model</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-impl-jackson</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java b/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java
index 2e07737cc..3dbe95094 100644
--- a/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java
+++ b/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/FuncDSLTest.java
@@ -23,6 +23,7 @@
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.http;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.listen;
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.toOne;
+import static io.serverlessworkflow.fluent.spec.dsl.DSL.auth;
 import static io.serverlessworkflow.fluent.spec.dsl.DSL.use;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -41,8 +42,6 @@
 import io.serverlessworkflow.fluent.func.dsl.FuncDSL;
 import io.serverlessworkflow.fluent.func.dsl.FuncEmitSpec;
 import io.serverlessworkflow.fluent.func.dsl.FuncListenSpec;
-import io.serverlessworkflow.impl.WorkflowApplication;
-import io.serverlessworkflow.impl.WorkflowDefinition;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -433,21 +432,4 @@ void call_with_preconfigured_http_spec() {
             .getUse());
     assertEquals(Map.of("foo", "bar"), http.getWith().getBody());
   }
-
-  @Test
-  void set_with_map() {
-    try (WorkflowApplication app = WorkflowApplication.builder().build()) {
-      Workflow workflow =
-          FuncWorkflowBuilder.workflow()
-              .tasks(f -> f.set(s -> s.expr(Map.of("message", "hello world!"))))
-              .build();
-
-      WorkflowDefinition workflowDefinition = app.workflowDefinition(workflow);
-
-      Map<String, Object> output =
-          workflowDefinition.instance(Map.of()).start().join().asMap().orElseThrow();
-
-      assertEquals(Map.of("message", "hello world!"), output);
-    }
-  }
 }
diff --git a/experimental/lambda/src/test/java/io/serverless/workflow/impl/executors/func/FluentDSLCallTest.java b/experimental/lambda/src/test/java/io/serverless/workflow/impl/executors/func/FluentDSLCallTest.java
index fb8c8d940..23c019083 100644
--- a/experimental/lambda/src/test/java/io/serverless/workflow/impl/executors/func/FluentDSLCallTest.java
+++ b/experimental/lambda/src/test/java/io/serverless/workflow/impl/executors/func/FluentDSLCallTest.java
@@ -17,6 +17,7 @@
 
 import static io.serverlessworkflow.fluent.func.dsl.FuncDSL.function;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.serverlessworkflow.api.types.FlowDirectiveEnum;
 import io.serverlessworkflow.api.types.Workflow;
@@ -26,6 +27,7 @@
 import io.serverlessworkflow.impl.WorkflowInstance;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import org.junit.jupiter.api.Test;
 
@@ -112,4 +114,21 @@ void testSwitch() throws InterruptedException, ExecutionException {
       assertThat(definition.instance(4).start().get().asNumber().orElseThrow()).isEqualTo(0);
     }
   }
+
+  @Test
+  void set_with_map() {
+    try (WorkflowApplication app = WorkflowApplication.builder().build()) {
+      Workflow workflow =
+          FuncWorkflowBuilder.workflow()
+              .tasks(f -> f.set(s -> s.expr(Map.of("message", "hello world!"))))
+              .build();
+
+      WorkflowDefinition workflowDefinition = app.workflowDefinition(workflow);
+
+      Map<String, Object> output =
+          workflowDefinition.instance(Map.of()).start().join().asMap().orElseThrow();
+
+      assertEquals(Map.of("message", "hello world!"), output);
+    }
+  }
 }