Upgrade LangChain4j 1.5.0; Fix deprecated warnings

Signed-off-by: Ricardo Zanini <ricardozanini@gmail.com>

Author: ricardozanini

api/src/main/java/io/serverlessworkflow/api/ObjectMapperFactory.java

@@ -34,11 +34,11 @@ class ObjectMapperFactory {
   private static final ObjectMapper yamlMapper =
       configure(new ObjectMapper(new YAMLFactory().enable(Feature.MINIMIZE_QUOTES)));
 
-  public static final ObjectMapper jsonMapper() {
+  public static ObjectMapper jsonMapper() {
     return jsonMapper;
   }
 
-  public static final ObjectMapper yamlMapper() {
+  public static ObjectMapper yamlMapper() {
     return yamlMapper;
   }
 
@@ -49,7 +49,7 @@ private static ObjectMapper configure(ObjectMapper mapper) {
     validationModule.setDeserializerModifier(new BeanDeserializerModifierWithValidation());
 
     return mapper
-        .setSerializationInclusion(Include.NON_NULL)
+        .setDefaultPropertyInclusion(Include.NON_NULL)
         .configure(SerializationFeature.INDENT_OUTPUT, true)
         .configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false)
         .configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false)

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowModelFactory.java

@@ -51,6 +51,7 @@ default WorkflowModel fromAny(WorkflowModel prev, Object obj) {
     return fromAny(obj);
   }
 
+  @SuppressWarnings("unchecked")
   default WorkflowModel fromAny(Object obj) {
     if (obj == null) {
       return fromNull();
@@ -70,10 +71,6 @@ default WorkflowModel fromAny(Object obj) {
       return from((Map<String, Object>) obj);
     } else if (obj instanceof WorkflowModel model) {
       return model;
-    } else if (obj instanceof CloudEventData ce) {
-      return from(ce);
-    } else if (obj instanceof CloudEvent ce) {
-      return from(ce);
     } else {
       return fromOther(obj);
     }

impl/jackson/src/main/java/io/serverlessworkflow/impl/jackson/JsonUtils.java

@@ -162,7 +162,9 @@ public static JsonNode fromString(String value) {
 
   private static Object toJavaValue(ObjectNode node) {
     Map<String, Object> result = new HashMap<>();
-    node.fields().forEachRemaining(iter -> result.put(iter.getKey(), toJavaValue(iter.getValue())));
+    node.properties()
+        .iterator()
+        .forEachRemaining(iter -> result.put(iter.getKey(), toJavaValue(iter.getValue())));
     return result;
   }
 

impl/jackson/src/main/java/io/serverlessworkflow/impl/jackson/MergeUtils.java

@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -56,9 +55,7 @@ public static JsonNode merge(JsonNode src, JsonNode target, boolean mergeArray)
 
   private static ObjectNode mergeObject(JsonNode src, ObjectNode target, boolean mergeArray) {
     if (src.isObject()) {
-      Iterator<Map.Entry<String, JsonNode>> mergedIterator = src.fields();
-      while (mergedIterator.hasNext()) {
-        Map.Entry<String, JsonNode> entry = mergedIterator.next();
+      for (Map.Entry<String, JsonNode> entry : src.properties()) {
         JsonNode found = target.get(entry.getKey());
         target.set(
             entry.getKey(),

impl/test/src/test/java/io/serverlessworkflow/impl/test/OpenIDCHTTPWorkflowDefinitionTest.java

@@ -17,7 +17,7 @@
 
 import static io.serverlessworkflow.api.WorkflowReader.readWorkflowFromClasspath;
 import static io.serverlessworkflow.impl.test.OAuthHTTPWorkflowDefinitionTest.fakeAccessToken;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -30,6 +30,7 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -502,8 +503,9 @@ public void testOpenIDCJSONWithArgsNoEndPointWorkflowExecution() throws Exceptio
 
     RecordedRequest tokenRequest = authServer.takeRequest();
     assertEquals("POST", tokenRequest.getMethod());
-    assertEquals("/realms/test-realm/protocol/openid-connect/token", tokenRequest.getPath());
-    assertEquals("application/json", tokenRequest.getHeader("Content-Type"));
+    Assertions.assertEquals(
+        "/realms/test-realm/protocol/openid-connect/token", tokenRequest.getPath());
+    Assertions.assertEquals("application/json", tokenRequest.getHeader("Content-Type"));
 
     String tokenRequestBody = tokenRequest.getBody().readUtf8();
     Map<String, Object> asJson = MAPPER.readValue(tokenRequestBody, Map.class);

pom.xml

@@ -52,7 +52,6 @@
     <properties>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.maven>3.9.11</version.maven>
 
@@ -94,9 +93,9 @@
         <version.org.hibernate.validator>9.0.1.Final</version.org.hibernate.validator>
         <version.org.glassfish.expressly>6.0.0</version.org.glassfish.expressly>
         <!-- Experimental modules from langchain4j -->
-        <version.dev.langchain4j.beta>1.4.1-beta10</version.dev.langchain4j.beta>
+        <version.dev.langchain4j.beta>1.5.0-beta11</version.dev.langchain4j.beta>
         <!-- Base langchain4j version -->
-        <version.dev.langchain4j>1.4.0</version.dev.langchain4j>
+        <version.dev.langchain4j>1.5.0</version.dev.langchain4j>
 
         <!-- Checkstyle props -->
         <checkstyle.failOnViolation>true</checkstyle.failOnViolation>