natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE if name not match in PojoUtils (#12404)

This commit is contained in:
Albumen Kevin 2023-05-26 15:32:54 +08:00 committed by GitHub
parent 1697a331c3
commit 25548c345b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 83 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java
View File

@ -50,6 +50,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.TreeMap;
import java.util.WeakHashMap;
@ -539,7 +540,11 @@ public class PojoUtils {
if (!method.isAccessible()) {
method.setAccessible(true);
}
Type containType = mapGeneric.get(field.getGenericType().getTypeName());
Type containType = Optional.ofNullable(field)
.map(Field::getGenericType)
.map(Type::getTypeName)
.map(mapGeneric::get)
.orElse(null);
if (containType != null) {
//is generic
if (containType instanceof ParameterizedType) {

96
dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
View File

@ -16,6 +16,25 @@
*/
package org.apache.dubbo.common.utils;
import org.apache.dubbo.common.model.Person;
import org.apache.dubbo.common.model.SerializablePerson;
import org.apache.dubbo.common.model.User;
import org.apache.dubbo.common.model.person.Ageneric;
import org.apache.dubbo.common.model.person.Bgeneric;
import org.apache.dubbo.common.model.person.BigPerson;
import org.apache.dubbo.common.model.person.Cgeneric;
import org.apache.dubbo.common.model.person.Dgeneric;
import org.apache.dubbo.common.model.person.FullAddress;
import org.apache.dubbo.common.model.person.PersonInfo;
import org.apache.dubbo.common.model.person.PersonMap;
import org.apache.dubbo.common.model.person.PersonStatus;
import org.apache.dubbo.common.model.person.Phone;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.Serializable;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
@ -32,27 +51,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import com.alibaba.fastjson.JSON;
import org.apache.dubbo.common.model.Person;
import org.apache.dubbo.common.model.SerializablePerson;
import org.apache.dubbo.common.model.User;
import org.apache.dubbo.common.model.person.Bgeneric;
import org.apache.dubbo.common.model.person.BigPerson;
import org.apache.dubbo.common.model.person.Cgeneric;
import org.apache.dubbo.common.model.person.Dgeneric;
import org.apache.dubbo.common.model.person.FullAddress;
import org.apache.dubbo.common.model.person.Ageneric;
import org.apache.dubbo.common.model.person.PersonInfo;
import org.apache.dubbo.common.model.person.PersonMap;
import org.apache.dubbo.common.model.person.PersonStatus;
import org.apache.dubbo.common.model.person.Phone;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import com.alibaba.fastjson.JSONObject;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@ -998,6 +999,63 @@ class PojoUtilsTest {
}
}
@Test
void testNameNotMatch() {
NameNotMatch origin = new NameNotMatch();
origin.setNameA("test123");
origin.setNameB("test234");
Object generalized = PojoUtils.generalize(origin);
Assertions.assertInstanceOf(Map.class, generalized);
Assertions.assertEquals("test123", ((Map)generalized).get("nameA"));
Assertions.assertEquals("test234", ((Map)generalized).get("nameB"));
NameNotMatch target1 = (NameNotMatch) PojoUtils.realize(PojoUtils.generalize(origin), NameNotMatch.class, NameNotMatch.class);
Assertions.assertEquals(origin, target1);
Map<String, String> map = new HashMap<>();
map.put("nameA", "test123");
map.put("nameB", "test234");
NameNotMatch target2 = (NameNotMatch) PojoUtils.realize(map, NameNotMatch.class, NameNotMatch.class);
Assertions.assertEquals(origin, target2);
}
class NameNotMatch implements Serializable {
private String NameA;
private String NameAbsent;
public void setNameA(String nameA) {
this.NameA = nameA;
}
public String getNameA() {
return NameA;
}
public void setNameB(String nameB) {
this.NameAbsent = nameB;
}
public String getNameB() {
return NameAbsent;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
NameNotMatch that = (NameNotMatch) o;
return Objects.equals(NameA, that.NameA) && Objects.equals(NameAbsent, that.NameAbsent);
}
@Override
public int hashCode() {
return Objects.hash(NameA, NameAbsent);
}
}
public enum Day {
SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY
}