Skip to content

fix: When parameter "value" is json string, JsonParser should convert json string to Object directly. #4003

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 1 commit into from
Aug 6, 2025
Merged

fix: When parameter "value" is json string, JsonParser should convert json string to Object directly. #4003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions spring-ai-model/src/main/java/org/springframework/ai/util/json/JsonParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,22 @@ else if (javaType.isEnum()) {
return Enum.valueOf((Class<Enum>) javaType, value.toString());
}

String json = JsonParser.toJson(value);
return JsonParser.fromJson(json, javaType);
Object result = null;
if (value instanceof String jsonString) {
try {
result = JsonParser.fromJson(jsonString, javaType);
}
catch (Exception e) {
// ignore
}
}

if (result == null) {
String json = JsonParser.toJson(value);
result = JsonParser.fromJson(json, javaType);
}

return result;
}

}
28 changes: 26 additions & 2 deletions spring-ai-model/src/test/java/org/springframework/ai/util/json/JsonParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package org.springframework.ai.util.json;

import java.lang.reflect.Type;

import com.fasterxml.jackson.core.type.TypeReference;
import org.junit.jupiter.api.Test;

import java.lang.reflect.Type;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

Expand Down Expand Up @@ -241,6 +241,22 @@ var record = new TestRecord("John", 30);
assertThat(value).isEqualTo(new TestRecord("John", 30));
}

@Test
void fromStringToObject() {
String jsonString = """
{
"name": "foo",
"age": 7
}
""";
var value = JsonParser.toTypedObject(jsonString, TestSimpleObject.class);
assertThat(value).isOfAnyClassIn(TestSimpleObject.class);

TestSimpleObject testSimpleObject = (TestSimpleObject) value;
assertThat(testSimpleObject.name).isEqualTo("foo");
assertThat(testSimpleObject.age).isEqualTo(7);
}

@Test
void fromScientificNotationToInteger() {
var value = JsonParser.toTypedObject("1.5E7", Integer.class);
Expand All @@ -265,6 +281,14 @@ void doesNotDoubleSerializeValidJsonString() {
record TestRecord(String name, Integer age) {
}

static class TestSimpleObject {

public String name;

public int age;

}

enum TestEnum {

VALUE
Expand Down