diff --git a/fluent/agentic-langchain4j/pom.xml b/experimental/fluent/agentic-langchain4j/pom.xml similarity index 83% rename from fluent/agentic-langchain4j/pom.xml rename to experimental/fluent/agentic-langchain4j/pom.xml index 3aa6ac92..6571c2a0 100644 --- a/fluent/agentic-langchain4j/pom.xml +++ b/experimental/fluent/agentic-langchain4j/pom.xml @@ -5,12 +5,12 @@ 4.0.0 io.serverlessworkflow - serverlessworkflow-fluent + serverlessworkflow-experimental-fluent 8.0.0-SNAPSHOT - serverlessworkflow-fluent-agentic-langchain4j - Serverless Workflow :: Fluent :: Agentic LangChain4j + serverlessworkflow-experimental-fluent-agentic-langchain4j + Serverless Workflow :: Experimental :: Fluent :: Agentic LangChain4j Agentic Workflow DSL Implementation for langchain4j-agentic @@ -20,7 +20,7 @@ io.serverlessworkflow - serverlessworkflow-fluent-agentic + serverlessworkflow-experimental-fluent-agentic dev.langchain4j @@ -55,7 +55,7 @@ io.serverlessworkflow - serverlessworkflow-fluent-agentic + serverlessworkflow-experimental-fluent-agentic test-jar test diff --git a/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/AbstractAgentService.java b/experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/AbstractAgentService.java similarity index 100% rename from fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/AbstractAgentService.java rename to experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/AbstractAgentService.java diff --git a/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/ConditionalAgentServiceImpl.java b/experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/ConditionalAgentServiceImpl.java similarity index 100% rename from fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/ConditionalAgentServiceImpl.java rename to experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/ConditionalAgentServiceImpl.java diff --git a/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/LC4JWorkflowBuilder.java b/experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/LC4JWorkflowBuilder.java similarity index 100% rename from fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/LC4JWorkflowBuilder.java rename to experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/LC4JWorkflowBuilder.java diff --git a/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/LoopAgentServiceImpl.java b/experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/LoopAgentServiceImpl.java similarity index 100% rename from fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/LoopAgentServiceImpl.java rename to experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/LoopAgentServiceImpl.java diff --git a/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/ParallelAgentServiceImpl.java b/experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/ParallelAgentServiceImpl.java similarity index 100% rename from fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/ParallelAgentServiceImpl.java rename to experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/ParallelAgentServiceImpl.java diff --git a/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/SequentialAgentServiceImpl.java b/experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/SequentialAgentServiceImpl.java similarity index 100% rename from fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/SequentialAgentServiceImpl.java rename to experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/SequentialAgentServiceImpl.java diff --git a/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowDefinitionBuilder.java b/experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowDefinitionBuilder.java similarity index 100% rename from fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowDefinitionBuilder.java rename to experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowDefinitionBuilder.java diff --git a/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowInvocationHandler.java b/experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowInvocationHandler.java similarity index 100% rename from fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowInvocationHandler.java rename to experimental/fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowInvocationHandler.java diff --git a/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Agents.java b/experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Agents.java similarity index 100% rename from fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Agents.java rename to experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Agents.java diff --git a/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Models.java b/experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Models.java similarity index 100% rename from fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Models.java rename to experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Models.java diff --git a/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/SequentialAgentServiceImplTest.java b/experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/SequentialAgentServiceImplTest.java similarity index 100% rename from fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/SequentialAgentServiceImplTest.java rename to experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/SequentialAgentServiceImplTest.java diff --git a/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowAgentsIT.java b/experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowAgentsIT.java similarity index 100% rename from fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowAgentsIT.java rename to experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowAgentsIT.java diff --git a/fluent/agentic/pom.xml b/experimental/fluent/agentic/pom.xml similarity index 90% rename from fluent/agentic/pom.xml rename to experimental/fluent/agentic/pom.xml index e168d9bd..bfd156c4 100644 --- a/fluent/agentic/pom.xml +++ b/experimental/fluent/agentic/pom.xml @@ -5,12 +5,12 @@ 4.0.0 io.serverlessworkflow - serverlessworkflow-fluent + serverlessworkflow-experimental-fluent 8.0.0-SNAPSHOT - Serverless Workflow :: Fluent :: Agentic - serverlessworkflow-fluent-agentic + Serverless Workflow :: Experimental :: Fluent :: Agentic + serverlessworkflow-experimental-fluent-agentic @@ -19,7 +19,7 @@ io.serverlessworkflow - serverlessworkflow-fluent-func + serverlessworkflow-experimental-fluent-func dev.langchain4j diff --git a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java b/experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java similarity index 100% rename from fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java rename to experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java diff --git a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentDoTaskBuilder.java b/experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentDoTaskBuilder.java similarity index 100% rename from fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentDoTaskBuilder.java rename to experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentDoTaskBuilder.java diff --git a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentListenTaskBuilder.java b/experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentListenTaskBuilder.java similarity index 100% rename from fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentListenTaskBuilder.java rename to experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentListenTaskBuilder.java diff --git a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilder.java b/experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilder.java similarity index 100% rename from fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilder.java rename to experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilder.java diff --git a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilder.java b/experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilder.java similarity index 100% rename from fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilder.java rename to experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilder.java diff --git a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/LoopAgentsBuilder.java b/experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/LoopAgentsBuilder.java similarity index 100% rename from fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/LoopAgentsBuilder.java rename to experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/LoopAgentsBuilder.java diff --git a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/spi/AgentDoFluent.java b/experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/spi/AgentDoFluent.java similarity index 100% rename from fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/spi/AgentDoFluent.java rename to experimental/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/spi/AgentDoFluent.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentDslWorkflowTest.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentDslWorkflowTest.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentDslWorkflowTest.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentDslWorkflowTest.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilderTest.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilderTest.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilderTest.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilderTest.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilderTest.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilderTest.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilderTest.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilderTest.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/Agents.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/Agents.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/Agents.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/Agents.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentsUtils.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentsUtils.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentsUtils.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentsUtils.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/ChatBotIT.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/ChatBotIT.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/ChatBotIT.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/ChatBotIT.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/CloudEventsTestBuilder.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/CloudEventsTestBuilder.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/CloudEventsTestBuilder.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/CloudEventsTestBuilder.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/EmailDrafterIT.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/EmailDrafterIT.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/EmailDrafterIT.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/EmailDrafterIT.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/MixedWorkflowIT.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/MixedWorkflowIT.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/MixedWorkflowIT.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/MixedWorkflowIT.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/Models.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/Models.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/Models.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/Models.java diff --git a/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/WorkflowTests.java b/experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/WorkflowTests.java similarity index 100% rename from fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/WorkflowTests.java rename to experimental/fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/WorkflowTests.java diff --git a/fluent/agentic/src/test/java/org/acme/EmailDraft.java b/experimental/fluent/agentic/src/test/java/org/acme/EmailDraft.java similarity index 100% rename from fluent/agentic/src/test/java/org/acme/EmailDraft.java rename to experimental/fluent/agentic/src/test/java/org/acme/EmailDraft.java diff --git a/fluent/agentic/src/test/java/org/acme/EmailDrafts.java b/experimental/fluent/agentic/src/test/java/org/acme/EmailDrafts.java similarity index 100% rename from fluent/agentic/src/test/java/org/acme/EmailDrafts.java rename to experimental/fluent/agentic/src/test/java/org/acme/EmailDrafts.java diff --git a/fluent/agentic/src/test/java/org/acme/EmailPolicies.java b/experimental/fluent/agentic/src/test/java/org/acme/EmailPolicies.java similarity index 100% rename from fluent/agentic/src/test/java/org/acme/EmailPolicies.java rename to experimental/fluent/agentic/src/test/java/org/acme/EmailPolicies.java diff --git a/fluent/agentic/src/test/java/org/acme/PolicyDecision.java b/experimental/fluent/agentic/src/test/java/org/acme/PolicyDecision.java similarity index 100% rename from fluent/agentic/src/test/java/org/acme/PolicyDecision.java rename to experimental/fluent/agentic/src/test/java/org/acme/PolicyDecision.java diff --git a/fluent/func/pom.xml b/experimental/fluent/func/pom.xml similarity index 85% rename from fluent/func/pom.xml rename to experimental/fluent/func/pom.xml index 0a90cf79..56d85380 100644 --- a/fluent/func/pom.xml +++ b/experimental/fluent/func/pom.xml @@ -5,12 +5,12 @@ 4.0.0 io.serverlessworkflow - serverlessworkflow-fluent + serverlessworkflow-experimental-fluent 8.0.0-SNAPSHOT - Serverless Workflow :: Fluent :: Functional - serverlessworkflow-fluent-func + Serverless Workflow :: Experimental :: Fluent :: Functional + serverlessworkflow-experimental-fluent-func 17 diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncCallTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncDoTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEmitTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEmitTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEmitTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEmitTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEventFilterBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEventFilterBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEventFilterBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEventFilterBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEventPropertiesBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEventPropertiesBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEventPropertiesBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncEventPropertiesBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForkTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForkTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForkTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForkTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncListenTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncListenTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncListenTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncListenTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncListenToBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncListenToBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncListenToBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncListenToBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncPredicateEventPropertiesBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncPredicateEventPropertiesBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncPredicateEventPropertiesBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncPredicateEventPropertiesBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSetTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSetTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSetTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSetTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncSwitchTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncTaskItemListBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncWorkflowBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncWorkflowBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncWorkflowBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncWorkflowBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/CallFnFluent.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/CallFnFluent.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/CallFnFluent.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/CallFnFluent.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilder.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilder.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilder.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilder.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilderHelper.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilderHelper.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilderHelper.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilderHelper.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/FuncDoFluent.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/FuncDoFluent.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/FuncDoFluent.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/FuncDoFluent.java diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/FuncTransformations.java b/experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/FuncTransformations.java similarity index 100% rename from fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/FuncTransformations.java rename to experimental/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/FuncTransformations.java diff --git a/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/JavaWorkflowBuilderTest.java b/experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/JavaWorkflowBuilderTest.java similarity index 100% rename from fluent/func/src/test/java/io/serverlessworkflow/fluent/func/JavaWorkflowBuilderTest.java rename to experimental/fluent/func/src/test/java/io/serverlessworkflow/fluent/func/JavaWorkflowBuilderTest.java diff --git a/experimental/fluent/pom.xml b/experimental/fluent/pom.xml new file mode 100644 index 00000000..260b9343 --- /dev/null +++ b/experimental/fluent/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + io.serverlessworkflow + serverlessworkflow-experimental + 8.0.0-SNAPSHOT + + Serverless Workflow :: Experimental :: Fluent + serverlessworkflow-experimental-fluent + pom + + + 17 + 17 + UTF-8 + + + + + + io.serverlessworkflow + serverlessworkflow-experimental-types + ${project.version} + + + io.serverlessworkflow + serverlessworkflow-fluent-spec + ${project.version} + + + io.serverlessworkflow + serverlessworkflow-experimental-agentic + ${project.version} + + + io.serverlessworkflow + serverlessworkflow-experimental-lambda + ${project.version} + + + io.serverlessworkflow + serverlessworkflow-experimental-fluent-agentic + ${project.version} + + + io.serverlessworkflow + serverlessworkflow-experimental-fluent-agentic-langchain4j + ${project.version} + + + io.serverlessworkflow + serverlessworkflow-experimental-fluent-agentic + ${project.version} + test-jar + test + + + + + + func + agentic + agentic-langchain4j + + + \ No newline at end of file diff --git a/experimental/lambda-fluent/pom.xml b/experimental/lambda-fluent/pom.xml index a537b36c..49aab346 100644 --- a/experimental/lambda-fluent/pom.xml +++ b/experimental/lambda-fluent/pom.xml @@ -22,7 +22,7 @@ io.serverlessworkflow - serverlessworkflow-fluent-func + serverlessworkflow-experimental-fluent-func io.serverlessworkflow diff --git a/experimental/lambda/pom.xml b/experimental/lambda/pom.xml index 0b57ab0a..3bb15cf4 100644 --- a/experimental/lambda/pom.xml +++ b/experimental/lambda/pom.xml @@ -19,7 +19,7 @@ io.serverlessworkflow - serverlessworkflow-fluent-func + serverlessworkflow-experimental-fluent-func test diff --git a/experimental/pom.xml b/experimental/pom.xml index 7ccb1eda..51c56ded 100644 --- a/experimental/pom.xml +++ b/experimental/pom.xml @@ -27,7 +27,7 @@ io.serverlessworkflow - serverlessworkflow-fluent-func + serverlessworkflow-experimental-fluent-func ${project.version} @@ -37,5 +37,6 @@ lambda agentic lambda-fluent + fluent \ No newline at end of file diff --git a/fluent/pom.xml b/fluent/pom.xml index 0974f904..f6d15aaf 100644 --- a/fluent/pom.xml +++ b/fluent/pom.xml @@ -18,58 +18,8 @@ UTF-8 - - - - io.serverlessworkflow - serverlessworkflow-experimental-types - ${project.version} - - - io.serverlessworkflow - serverlessworkflow-fluent-spec - ${project.version} - - - io.serverlessworkflow - serverlessworkflow-fluent-func - ${project.version} - - - io.serverlessworkflow - serverlessworkflow-fluent-agentic - ${project.version} - - - io.serverlessworkflow - serverlessworkflow-fluent-agentic-langchain4j - ${project.version} - - - io.serverlessworkflow - serverlessworkflow-experimental-agentic - ${project.version} - - - io.serverlessworkflow - serverlessworkflow-experimental-lambda - ${project.version} - - - io.serverlessworkflow - serverlessworkflow-fluent-agentic - ${project.version} - test-jar - test - - - - spec - func - agentic - agentic-langchain4j \ No newline at end of file diff --git a/impl/test/pom.xml b/impl/test/pom.xml index e9e24013..d774335f 100644 --- a/impl/test/pom.xml +++ b/impl/test/pom.xml @@ -57,6 +57,10 @@ com.squareup.okhttp3 mockwebserver + + org.awaitility + awaitility + diff --git a/impl/test/src/test/java/io/serverlessworkflow/impl/test/LifeCycleEventsTest.java b/impl/test/src/test/java/io/serverlessworkflow/impl/test/LifeCycleEventsTest.java index a8bf17bb..2029760f 100644 --- a/impl/test/src/test/java/io/serverlessworkflow/impl/test/LifeCycleEventsTest.java +++ b/impl/test/src/test/java/io/serverlessworkflow/impl/test/LifeCycleEventsTest.java @@ -17,6 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowableOfType; +import static org.awaitility.Awaitility.await; import io.cloudevents.CloudEvent; import io.cloudevents.core.data.PojoCloudEventData; @@ -41,8 +42,10 @@ import io.serverlessworkflow.impl.lifecycle.ce.WorkflowStartedCEData; import io.serverlessworkflow.impl.lifecycle.ce.WorkflowSuspendedCEData; import java.io.IOException; +import java.time.Duration; import java.util.Collection; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; @@ -211,14 +214,17 @@ void testError() throws IOException { } private T assertPojoInCE(String type, Class clazz) { - Thread.yield(); - Optional event = - publishedEvents.stream().filter(ev -> ev.getType().equals(type)).findAny(); - assertThat(event) - .hasValueSatisfying(ce -> assertThat(ce.getData()).isInstanceOf(PojoCloudEventData.class)); - assertThat(event) - .hasValueSatisfying( - ce -> assertThat(((PojoCloudEventData) ce.getData()).getValue()).isInstanceOf(clazz)); - return clazz.cast(((PojoCloudEventData) event.orElseThrow().getData()).getValue()); + CloudEvent ce = + await() + .atMost(Duration.ofSeconds(2)) + .pollInterval(Duration.ofMillis(10)) + .until( + () -> publishedEvents.stream().filter(ev -> ev.getType().equals(type)).findAny(), + Optional::isPresent) + .orElseThrow(); + assertThat(ce.getData()).isInstanceOf(PojoCloudEventData.class); + Object pojo = ((PojoCloudEventData) Objects.requireNonNull(ce.getData())).getValue(); + assertThat(pojo).isInstanceOf(clazz); + return clazz.cast(pojo); } } diff --git a/pom.xml b/pom.xml index 2768fcc4..f49814fc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.serverlessworkflow @@ -36,18 +37,18 @@ HEAD - - api - impl - types - annotations - generators - serialization - examples - experimental - fluent - mermaid - + + api + impl + types + annotations + generators + serialization + examples + experimental + fluent + mermaid + 17 @@ -77,6 +78,7 @@ + 4.2.0 1.5.18 2.20.0 2.20 @@ -170,7 +172,7 @@ serverlessworkflow-types ${project.version} - + io.serverlessworkflow serverlessworkflow-serialization ${project.version} @@ -250,9 +252,15 @@ test - dev.langchain4j - langchain4j-agentic - ${version.dev.langchain4j.beta} + org.awaitility + awaitility + ${version.awaitility} + test + + + dev.langchain4j + langchain4j-agentic + ${version.dev.langchain4j.beta} @@ -304,8 +312,8 @@ - - + + @@ -338,7 +346,7 @@ - +