Skip to content
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

Jump to bottom

fixed pojoutils string class issue #14102

Open
wants to merge 6 commits into
base: 3.2
Choose a base branch
from
+21 −2
Open

fixed pojoutils string class issue #14102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7364d8a
fixed pojoutils string class issue
Apr 19, 2024
3f222e5
formatting test case code
May 8, 2024
ab6b3ba
Only process the dest class if string
May 8, 2024
f4b40c7
field set access ignore jdk classes
May 8, 2024
c11db23
refine unit test case
May 8, 2024
120a29f
refind unit test case
May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,11 @@ private static Object realize1(
} else if (field != null) {
value = realize1(value, field.getType(), field.getGenericType(), mapGeneric, history);
try {
field.set(dest, value);
if (value.getClass() == String.class && dest.getClass() == String.class) {
return value;
} else {
field.set(dest, value);
}
} catch (IllegalAccessException e) {
throw new RuntimeException(
"Failed to set field " + name + " of pojo "
Expand Down Expand Up @@ -774,7 +778,8 @@ private static Field getField(Class<?> cls, String fieldName) {
for (Class<?> acls = cls; acls != null; acls = acls.getSuperclass()) {
try {
result = acls.getDeclaredField(fieldName);
if (!Modifier.isPublic(result.getModifiers())) {
// the field is not public and it not jdk class, we will setAccessible to true
if (!Modifier.isPublic(result.getModifiers()) && acls.getClassLoader() != null) {
result.setAccessible(true);
}
} catch (NoSuchFieldException e) {
Expand Down
14 changes: 14 additions & 0 deletions dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,20 @@ public int hashCode() {
}
}

@Test
void testPojoWithPrimitivesStringClass() {
String expect = "abc123";
JSONObject jsonObject = new JSONObject();
jsonObject.put("value", expect);
jsonObject.put("class", "java.lang.String");
Object[] objects = new Object[] {jsonObject};
Class<?>[] types = new Class<?>[] {String.class};
Type[] gtType = new Type[] {String.class};
Object[] realize = PojoUtils.realize(objects, types, gtType);
assertEquals(1, realize.length);
assertEquals(expect, realize[0]);
}

public enum Day {
SUNDAY,
MONDAY,
Expand Down