Skip to content

Upgrade LangChain4j 1.5.0; Fix deprecated warnings #816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

Upgrade LangChain4j 1.5.0; Fix deprecated warnings #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b98d601
Upgrade LangChain4j 1.5.0; Fix deprecated warnings
ricardozanini Sep 25, 2025
1897129
Fix maven-compiler-plugin-s
ricardozanini Sep 25, 2025
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
6 changes: 3 additions & 3 deletions api/src/main/java/io/serverlessworkflow/api/ObjectMapperFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowModelFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
}
Expand Down
4 changes: 3 additions & 1 deletion impl/jackson/src/main/java/io/serverlessworkflow/impl/jackson/JsonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
5 changes: 1 addition & 4 deletions impl/jackson/src/main/java/io/serverlessworkflow/impl/jackson/MergeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion ...test/src/test/java/io/serverlessworkflow/impl/test/OpenIDCHTTPWorkflowDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 3 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<properties>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.release>${java.version}</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.maven>3.9.11</version.maven>

Expand Down Expand Up @@ -94,9 +94,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>
Expand Down Expand Up @@ -309,10 +309,6 @@
<configuration>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<testSource>${maven.compiler.source}</testSource>
<testTarget>${maven.compiler.target}</testTarget>
<parameters>true</parameters>
<compilerArgs>
<arg>-Xlint:unchecked</arg>
Expand Down