Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent</artifactId>
<artifactId>serverlessworkflow-experimental-fluent</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>

<artifactId>serverlessworkflow-fluent-agentic-langchain4j</artifactId>
<name>Serverless Workflow :: Fluent :: Agentic LangChain4j</name>
<artifactId>serverlessworkflow-experimental-fluent-agentic-langchain4j</artifactId>
<name>Serverless Workflow :: Experimental :: Fluent :: Agentic LangChain4j</name>
<description>Agentic Workflow DSL Implementation for langchain4j-agentic</description>

<dependencies>
Expand All @@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-agentic</artifactId>
<artifactId>serverlessworkflow-experimental-fluent-agentic</artifactId>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
Expand Down Expand Up @@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-agentic</artifactId>
<artifactId>serverlessworkflow-experimental-fluent-agentic</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent</artifactId>
<artifactId>serverlessworkflow-experimental-fluent</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>

<name>Serverless Workflow :: Fluent :: Agentic</name>
<artifactId>serverlessworkflow-fluent-agentic</artifactId>
<name>Serverless Workflow :: Experimental :: Fluent :: Agentic</name>
<artifactId>serverlessworkflow-experimental-fluent-agentic</artifactId>

<dependencies>
<dependency>
Expand All @@ -19,7 +19,7 @@
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-func</artifactId>
<artifactId>serverlessworkflow-experimental-fluent-func</artifactId>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
Expand Down
6 changes: 3 additions & 3 deletions fluent/func/pom.xml → experimental/fluent/func/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent</artifactId>
<artifactId>serverlessworkflow-experimental-fluent</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>

<name>Serverless Workflow :: Fluent :: Functional</name>
<artifactId>serverlessworkflow-fluent-func</artifactId>
<name>Serverless Workflow :: Experimental :: Fluent :: Functional</name>
<artifactId>serverlessworkflow-experimental-fluent-func</artifactId>

<properties>
<maven.compiler.source>17</maven.compiler.source>
Expand Down
69 changes: 69 additions & 0 deletions experimental/fluent/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<name>Serverless Workflow :: Experimental :: Fluent</name>
<artifactId>serverlessworkflow-experimental-fluent</artifactId>
<packaging>pom</packaging>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-types</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-spec</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-agentic</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-lambda</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-fluent-agentic</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-fluent-agentic-langchain4j</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-fluent-agentic</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<modules>
<module>func</module>
<module>agentic</module>
<module>agentic-langchain4j</module>
</modules>

</project>
2 changes: 1 addition & 1 deletion experimental/lambda-fluent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependencies>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-func</artifactId>
<artifactId>serverlessworkflow-experimental-fluent-func</artifactId>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
Expand Down
2 changes: 1 addition & 1 deletion experimental/lambda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-func</artifactId>
<artifactId>serverlessworkflow-experimental-fluent-func</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion experimental/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-func</artifactId>
<artifactId>serverlessworkflow-experimental-fluent-func</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand All @@ -37,5 +37,6 @@
<module>lambda</module>
<module>agentic</module>
<module>lambda-fluent</module>
<module>fluent</module>
</modules>
</project>
50 changes: 0 additions & 50 deletions fluent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,58 +18,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-types</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-spec</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-func</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-agentic</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-agentic-langchain4j</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-agentic</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-experimental-lambda</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-fluent-agentic</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<modules>
<module>spec</module>
<module>func</module>
<module>agentic</module>
<module>agentic-langchain4j</module>
</modules>

</project>
4 changes: 4 additions & 0 deletions impl/test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -211,14 +214,17 @@ void testError() throws IOException {
}

private <T> T assertPojoInCE(String type, Class<T> clazz) {
Thread.yield();
Optional<CloudEvent> 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);
}
}
48 changes: 28 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.serverlessworkflow</groupId>
Expand Down Expand Up @@ -36,18 +37,18 @@
<tag>HEAD</tag>
</scm>

<modules>
<module>api</module>
<module>impl</module>
<module>types</module>
<module>annotations</module>
<module>generators</module>
<module>serialization</module>
<module>examples</module>
<module>experimental</module>
<module>fluent</module>
<module>mermaid</module>
</modules>
<modules>
<module>api</module>
<module>impl</module>
<module>types</module>
<module>annotations</module>
<module>generators</module>
<module>serialization</module>
<module>examples</module>
<module>experimental</module>
<module>fluent</module>
<module>mermaid</module>
</modules>

<properties>
<java.version>17</java.version>
Expand Down Expand Up @@ -77,6 +78,7 @@


<!-- Dependencies versions, please keep in alphabetical order -->
<version.awaitility>4.2.0</version.awaitility>
<version.ch.qos.logback>1.5.18</version.ch.qos.logback>
<version.com.fasterxml.jackson>2.20.0</version.com.fasterxml.jackson>
<version.com.fasterxml.jackson.annotations>2.20</version.com.fasterxml.jackson.annotations>
Expand Down Expand Up @@ -170,7 +172,7 @@
<artifactId>serverlessworkflow-types</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>io.serverlessworkflow</groupId>
<artifactId>serverlessworkflow-serialization</artifactId>
<version>${project.version}</version>
Expand Down Expand Up @@ -250,9 +252,15 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-agentic</artifactId>
<version>${version.dev.langchain4j.beta}</version>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${version.awaitility}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-agentic</artifactId>
<version>${version.dev.langchain4j.beta}</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -304,8 +312,8 @@
<module name="Checker">
<module name="TreeWalker">
<module name="RegexpSinglelineJava">
<property name="format" value="@author" />
<property name="message" value="No @author tag allowed" />
<property name="format" value="@author"/>
<property name="message" value="No @author tag allowed"/>
</module>
</module>
</module>
Expand Down Expand Up @@ -338,7 +346,7 @@
<configuration>
<java>
<!-- formatter -->
<googleJavaFormat version="1.17.0" />
<googleJavaFormat version="1.17.0"/>
<!-- add/normalize headers -->
<licenseHeader>
<content>
Expand Down