Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,11 @@ public BiFunction<Class<?>, Class<?>, String> createGetterFunction() {
Field field = ReflectionUtils.findField(targetBeanType, name);
boolean hasGeneric = false;
if (field != null) {
String[] arr = Arrays.stream(ResolvableType.forField(field)
.getGenerics())
.map(ResolvableType::getRawClass)
ResolvableType fieldType = ResolvableType.forField(
field,
ResolvableType.forClass(targetBeanType).as(field.getDeclaringClass()));
String[] arr = Arrays.stream(fieldType.getGenerics())
.map(ResolvableType::resolve)
.filter(Objects::nonNull)
.map(t -> t.getName().concat(".class"))
.toArray(String[]::new);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package org.hswebframework.web.bean;

import lombok.Getter;
import lombok.Setter;
import org.junit.Assert;
import org.junit.Test;

import java.util.List;
import java.util.Map;

public class FastBeanCopierBeanTest {

@Test
public void testCopyDirectGenericListField() {
Map<String, Object> source = Map.of(
"fileData",
List.of(Map.of("name", "image.jpg"))
);

DirectOutput output = FastBeanCopier.copy(source, new DirectOutput());

Assert.assertNotNull(output.getFileData());
Assert.assertEquals(1, output.getFileData().size());
Assert.assertTrue(output.getFileData().get(0) instanceof FileItem);
Assert.assertEquals("image.jpg", output.getFileData().get(0).getName());
}

@Test
public void testCopyGenericSuperclassListField() {
Map<String, Object> source = Map.of(
"fileData",
List.of(Map.of("name", "image.jpg"))
);

GenericOutput output = FastBeanCopier.copy(source, new GenericOutput());

Assert.assertNotNull(output.getFileData());
Assert.assertEquals(1, output.getFileData().size());
Assert.assertTrue(output.getFileData().get(0) instanceof FileItem);
Assert.assertEquals("image.jpg", output.getFileData().get(0).getName());
}

@Getter
@Setter
public static class DirectOutput {
private List<FileItem> fileData;
}

@Getter
@Setter
public static class GenericBase<T> {
private List<T> fileData;
}

public static class GenericOutput extends GenericBase<FileItem> {
}

@Getter
@Setter
public static class FileItem {
private String name;
}
}
Loading