Small refactor

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

experimental/agentic/src/main/java/io/serverlessworkflow/impl/expressions/agentic/AgenticModelCollection.java

@@ -15,7 +15,6 @@
  */
 package io.serverlessworkflow.impl.expressions.agentic;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import dev.langchain4j.agentic.scope.AgenticScope;
@@ -27,7 +26,6 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 
 public class AgenticModelCollection extends JavaModelCollection {
@@ -45,32 +43,22 @@ public boolean add(WorkflowModel e) {
     Optional<Map<String, Object>> asMap = e.asMap();
     if (asMap.isPresent()) {
       this.agenticScope.writeStates(asMap.get());
-    } else {
-      // Update the agenticScope with the event body, so agents can use the event data as input
-      Object javaObj = e.asJavaObject();
-      if (javaObj instanceof CloudEvent) {
-        try {
-          this.agenticScope.writeStates(
-              mapper.readValue(
-                  Objects.requireNonNull(((CloudEvent) javaObj).getData()).toString(),
-                  new TypeReference<>() {}));
-        } catch (JsonProcessingException ex) {
-          throw new IllegalArgumentException(
-              "Unable to parse CloudEvent, data must be a valid JSON", ex);
-        }
-      } else if (javaObj instanceof CloudEventData) {
-        try {
-          this.agenticScope.writeStates(
-              mapper.readValue(
-                  Objects.requireNonNull(((CloudEventData) javaObj)).toBytes(),
-                  new TypeReference<>() {}));
-        } catch (IOException ex) {
-          throw new IllegalArgumentException(
-              "Unable to parse CloudEventData, data must be a valid JSON", ex);
-        }
+      return super.add(e);
+    }
+
+    // Update the agenticScope with the event body, so agents can use the event data as input
+    Object javaObj = e.asJavaObject();
+    try {
+      if (javaObj instanceof CloudEvent ce && ce.getData() != null) {
+        agenticScope.writeStates(
+            mapper.readValue(ce.getData().toBytes(), new TypeReference<>() {}));
+      } else if (javaObj instanceof CloudEventData ced) {
+        agenticScope.writeStates(mapper.readValue(ced.toBytes(), new TypeReference<>() {}));
       } else {
-        this.agenticScope.writeState(AgenticModelFactory.DEFAULT_AGENTIC_SCOPE_STATE_KEY, javaObj);
+        agenticScope.writeState(AgenticModelFactory.DEFAULT_AGENTIC_SCOPE_STATE_KEY, javaObj);
       }
+    } catch (IOException ex) {
+      throw new IllegalArgumentException("Unable to parse CloudEvent data as JSON", ex);
     }
 
     // add to the collection

experimental/agentic/src/main/java/io/serverlessworkflow/impl/expressions/agentic/AgenticModelFactory.java

@@ -31,6 +31,18 @@ class AgenticModelFactory implements WorkflowModelFactory {
   private final AgenticScopeRegistryAssessor scopeRegistryAssessor =
       new AgenticScopeRegistryAssessor();
 
+  private void updateAgenticScope(Object value) {
+    this.scopeRegistryAssessor.getAgenticScope().writeState(DEFAULT_AGENTIC_SCOPE_STATE_KEY, value);
+  }
+
+  private void updateAgenticScope(Map<String, Object> state) {
+    this.scopeRegistryAssessor.getAgenticScope().writeStates(state);
+  }
+
+  private AgenticModel asAgenticModel(Object value) {
+    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), value);
+  }
+
   @Override
   @SuppressWarnings("unchecked")
   public WorkflowModel fromAny(WorkflowModel prev, Object obj) {
@@ -41,12 +53,12 @@ public WorkflowModel fromAny(WorkflowModel prev, Object obj) {
     }
 
     if (obj instanceof Map) {
-      this.scopeRegistryAssessor.getAgenticScope().writeStates((Map<String, Object>) obj);
+      this.updateAgenticScope((Map<String, Object>) obj);
     } else {
-      this.scopeRegistryAssessor.getAgenticScope().writeState(DEFAULT_AGENTIC_SCOPE_STATE_KEY, obj);
+      this.updateAgenticScope(obj);
     }
 
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), obj);
+    return asAgenticModel(obj);
   }
 
   @Override
@@ -64,55 +76,55 @@ public WorkflowModelCollection createCollection() {
 
   @Override
   public WorkflowModel from(boolean value) {
-    this.scopeRegistryAssessor.getAgenticScope().writeState(DEFAULT_AGENTIC_SCOPE_STATE_KEY, value);
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), value);
+    this.updateAgenticScope(value);
+    return asAgenticModel(value);
   }
 
   @Override
   public WorkflowModel from(Number value) {
-    this.scopeRegistryAssessor.getAgenticScope().writeState(DEFAULT_AGENTIC_SCOPE_STATE_KEY, value);
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), value);
+    this.updateAgenticScope(value);
+    return asAgenticModel(value);
   }
 
   @Override
   public WorkflowModel from(String value) {
-    this.scopeRegistryAssessor.getAgenticScope().writeState(DEFAULT_AGENTIC_SCOPE_STATE_KEY, value);
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), value);
+    this.updateAgenticScope(value);
+    return asAgenticModel(value);
   }
 
   @Override
   public WorkflowModel from(CloudEvent ce) {
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), ce);
+    return asAgenticModel(ce);
   }
 
   @Override
   public WorkflowModel from(CloudEventData ce) {
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), ce);
+    return asAgenticModel(ce);
   }
 
   @Override
   public WorkflowModel from(OffsetDateTime value) {
-    this.scopeRegistryAssessor.getAgenticScope().writeState(DEFAULT_AGENTIC_SCOPE_STATE_KEY, value);
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), value);
+    this.updateAgenticScope(value);
+    return asAgenticModel(value);
   }
 
   @Override
   public WorkflowModel from(Map<String, Object> map) {
-    this.scopeRegistryAssessor.getAgenticScope().writeStates(map);
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), map);
+    this.updateAgenticScope(map);
+    return asAgenticModel(map);
   }
 
   @Override
   public WorkflowModel fromNull() {
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), null);
+    return asAgenticModel(null);
   }
 
   @Override
   public WorkflowModel fromOther(Object value) {
     if (value instanceof AgenticScope scope) {
       return new AgenticModel(scope, scope.state());
     }
-    this.scopeRegistryAssessor.getAgenticScope().writeState(DEFAULT_AGENTIC_SCOPE_STATE_KEY, value);
-    return new AgenticModel(this.scopeRegistryAssessor.getAgenticScope(), value);
+    this.updateAgenticScope(value);
+    return asAgenticModel(value);
   }
 }

experimental/agentic/src/main/java/io/serverlessworkflow/impl/expressions/agentic/langchain4j/AgenticScopeRegistryAssessor.java

@@ -59,12 +59,12 @@ public AgenticScope getAgenticScope() {
   }
 
   public void setAgenticScope(AgenticScope agenticScope) {
-    this.agenticScope = agenticScope;
+    this.agenticScope = Objects.requireNonNull(agenticScope, "AgenticScope cannot be null");
   }
 
   @Override
   public AgenticScopeOwner withAgenticScope(DefaultAgenticScope agenticScope) {
-    this.agenticScope = agenticScope;
+    this.setAgenticScope(agenticScope);
     return this;
   }