Merge branch 'main' into issue-892

Author: mcruzdev

api/src/test/java/io/serverlessworkflow/api/ApiTest.java

@@ -23,11 +23,10 @@
 import io.serverlessworkflow.api.types.CallHTTP;
 import io.serverlessworkflow.api.types.CallTask;
 import io.serverlessworkflow.api.types.HTTPArguments;
-import io.serverlessworkflow.api.types.OAuth2AuthenticationData;
 import io.serverlessworkflow.api.types.OAuth2AuthenticationData.OAuth2AuthenticationDataGrant;
 import io.serverlessworkflow.api.types.OAuth2AuthenticationPolicy;
-import io.serverlessworkflow.api.types.OAuth2AuthenticationPolicyConfiguration;
 import io.serverlessworkflow.api.types.OAuth2AuthenticationPropertiesEndpoints;
+import io.serverlessworkflow.api.types.OAuth2ConnectAuthenticationProperties;
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.Workflow;
 import java.io.IOException;
@@ -99,20 +98,18 @@ void testOauth2Auth() throws IOException {
             .getAuthenticationPolicy()
             .getOAuth2AuthenticationPolicy();
     assertThat(oauthPolicy).isNotNull();
-    OAuth2AuthenticationPolicyConfiguration oauth2Props =
+    OAuth2ConnectAuthenticationProperties oauth2Props =
         oauthPolicy.getOauth2().getOAuth2ConnectAuthenticationProperties();
     assertThat(oauth2Props).isNotNull();
-    OAuth2AuthenticationPropertiesEndpoints endpoints =
-        oauth2Props.getOAuth2ConnectAuthenticationProperties().getEndpoints();
+    OAuth2AuthenticationPropertiesEndpoints endpoints = oauth2Props.getEndpoints();
     assertThat(endpoints.getToken()).isEqualTo("/auth/token");
     assertThat(endpoints.getIntrospection()).isEqualTo("/auth/introspect");
 
-    OAuth2AuthenticationData oauth2Data = oauth2Props.getOAuth2AuthenticationData();
-    assertThat(oauth2Data.getAuthority().getLiteralUri())
+    assertThat(oauth2Props.getAuthority().getLiteralUri())
         .isEqualTo(URI.create("http://keycloak/realms/fake-authority"));
-    assertThat(oauth2Data.getGrant()).isEqualTo(OAuth2AuthenticationDataGrant.CLIENT_CREDENTIALS);
-    assertThat(oauth2Data.getClient().getId()).isEqualTo("workflow-runtime-id");
-    assertThat(oauth2Data.getClient().getSecret()).isEqualTo("workflow-runtime-secret");
+    assertThat(oauth2Props.getGrant()).isEqualTo(OAuth2AuthenticationDataGrant.CLIENT_CREDENTIALS);
+    assertThat(oauth2Props.getClient().getId()).isEqualTo("workflow-runtime-id");
+    assertThat(oauth2Props.getClient().getSecret()).isEqualTo("workflow-runtime-secret");
   }
 
   @Test

experimental/agentic/src/main/java/io/serverlessworkflow/impl/model/agentic/AgenticModel.java

@@ -46,18 +46,14 @@ public Optional<Map<String, Object>> asMap() {
   }
 
   @Override
-  public <T> Optional<T> as(Class<T> clazz) {
-    if (AgenticScope.class.isAssignableFrom(clazz)) {
-      return Optional.of(clazz.cast(this.agenticScope));
-    } else if (Map.class.isAssignableFrom(clazz)) {
-      return asMap().map(clazz::cast);
-    } else {
-      return super.as(clazz);
-    }
+  public Object asJavaObject() {
+    return agenticScope;
   }
 
   @Override
-  public Object asJavaObject() {
-    return agenticScope;
+  protected <T> Optional<T> convert(Class<T> clazz) {
+    return AgenticScope.class.isAssignableFrom(clazz)
+        ? Optional.of(clazz.cast(this.agenticScope))
+        : super.convert(clazz);
   }
 }

experimental/fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/Agents.java

@@ -15,140 +15,12 @@
  */
 package io.serverlessworkflow.fluent.agentic.langchain4j;
 
-import dev.langchain4j.agent.tool.Tool;
 import dev.langchain4j.agentic.Agent;
-import dev.langchain4j.agentic.scope.AgenticScopeAccess;
-import dev.langchain4j.service.MemoryId;
 import dev.langchain4j.service.UserMessage;
 import dev.langchain4j.service.V;
-import java.util.List;
 
 public class Agents {
 
-  public interface ExpertRouterAgent {
-
-    @Agent
-    String ask(@V("request") String request);
-  }
-
-  public interface ExpertRouterAgentWithMemory extends AgenticScopeAccess {
-
-    @Agent
-    String ask(@MemoryId String memoryId, @V("request") String request);
-  }
-
-  public interface CategoryRouter {
-
-    @UserMessage(
-        """
-            Analyze the following user request and categorize it as 'legal', 'medical' or 'technical'.
-            In case the request doesn't belong to any of those categories categorize it as 'unknown'.
-            Reply with only one of those words and nothing else.
-            The user request is: '{{request}}'.
-            """)
-    @Agent("Categorize a user request")
-    RequestCategory classify(@V("request") String request);
-  }
-
-  public enum RequestCategory {
-    LEGAL,
-    MEDICAL,
-    TECHNICAL,
-    UNKNOWN
-  }
-
-  public interface RouterAgent {
-
-    @UserMessage(
-        """
-            Analyze the following user request and categorize it as 'legal', 'medical' or 'technical',
-            then forward the request as it is to the corresponding expert provided as a tool.
-            Finally return the answer that you received from the expert without any modification.
-
-            The user request is: '{{it}}'.
-            """)
-    @Agent
-    String askToExpert(String request);
-  }
-
-  public interface MedicalExpert {
-
-    @UserMessage(
-        """
-            You are a medical expert.
-            Analyze the following user request under a medical point of view and provide the best possible answer.
-            The user request is {{request}}.
-            """)
-    @Tool("A medical expert")
-    @Agent("A medical expert")
-    String medical(@V("request") String request);
-  }
-
-  public interface MedicalExpertWithMemory {
-
-    @UserMessage(
-        """
-            You are a medical expert.
-            Analyze the following user request under a medical point of view and provide the best possible answer.
-            The user request is {{request}}.
-            """)
-    @Tool("A medical expert")
-    @Agent("A medical expert")
-    String medical(@MemoryId String memoryId, @V("request") String request);
-  }
-
-  public interface LegalExpert {
-
-    @UserMessage(
-        """
-            You are a legal expert.
-            Analyze the following user request under a legal point of view and provide the best possible answer.
-            The user request is {{request}}.
-            """)
-    @Tool("A legal expert")
-    @Agent("A legal expert")
-    String legal(@V("request") String request);
-  }
-
-  public interface LegalExpertWithMemory {
-
-    @UserMessage(
-        """
-            You are a legal expert.
-            Analyze the following user request under a legal point of view and provide the best possible answer.
-            The user request is {{request}}.
-            """)
-    @Tool("A legal expert")
-    @Agent("A legal expert")
-    String legal(@MemoryId String memoryId, @V("request") String request);
-  }
-
-  public interface TechnicalExpert {
-
-    @UserMessage(
-        """
-            You are a technical expert.
-            Analyze the following user request under a technical point of view and provide the best possible answer.
-            The user request is {{request}}.
-            """)
-    @Tool("A technical expert")
-    @Agent("A technical expert")
-    String technical(@V("request") String request);
-  }
-
-  public interface TechnicalExpertWithMemory {
-
-    @UserMessage(
-        """
-            You are a technical expert.
-            Analyze the following user request under a technical point of view and provide the best possible answer.
-            The user request is {{request}}.
-            """)
-    @Tool("A technical expert")
-    @Agent("A technical expert")
-    String technical(@MemoryId String memoryId, @V("request") String request);
-  }
-
   public interface CreativeWriter {
 
     @UserMessage(
@@ -187,71 +59,4 @@ public interface StyleEditor {
     @Agent("Edit a story to better fit a given style")
     String editStory(@V("story") String story, @V("style") String style);
   }
-
-  public interface StyleScorer {
-
-    @UserMessage(
-        """
-                You are a critical reviewer.
-                Give a review score between 0.0 and 1.0 for the following story based on how well it aligns with the style '{{style}}'.
-                Return only the score and nothing else.
-
-                The story is: "{{story}}"
-                """)
-    @Agent("Score a story based on how well it aligns with a given style")
-    double scoreStyle(@V("story") String story, @V("style") String style);
-  }
-
-  public interface StyleReviewLoop {
-
-    @Agent("Review the given story to ensure it aligns with the specified style")
-    String scoreAndReview(@V("story") String story, @V("style") String style);
-  }
-
-  public interface StyledWriter extends AgenticScopeAccess {
-
-    @Agent
-    String writeStoryWithStyle(@V("topic") String topic, @V("style") String style);
-  }
-
-  public interface FoodExpert {
-
-    @UserMessage(
-        """
-            You are a great evening planner.
-            Propose a list of 3 meals matching the given mood.
-            The mood is {{mood}}.
-            For each meal, just give the name of the meal.
-            Provide a list with the 3 items and nothing else.
-            """)
-    @Agent
-    List<String> findMeal(@V("mood") String mood);
-  }
-
-  public interface MovieExpert {
-
-    @UserMessage(
-        """
-            You are a great evening planner.
-            Propose a list of 3 movies matching the given mood.
-            The mood is {mood}.
-            Provide a list with the 3 items and nothing else.
-            """)
-    @Agent
-    List<String> findMovie(@V("mood") String mood);
-  }
-
-  public record EveningPlan(String movie, String meal) {}
-
-  public interface EveningPlannerAgent {
-
-    @Agent
-    List<EveningPlan> plan(@V("mood") String mood);
-  }
-
-  public interface HoroscopeAgent {
-
-    @Agent
-    String invoke(@V("name") String name);
-  }
 }