Skip to content

Use Jackson's type factory to retrieve the concrete Collection implementation to be created for any given raw type #53559

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

Open
mariofusco wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −24
Open

Use Jackson's type factory to retrieve the concrete Collection implementation to be created for any given raw type #53559

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
37 changes: 13 additions & 24 deletions ...io/quarkus/resteasy/reactive/jackson/deployment/processor/JacksonDeserializerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import java.io.IOException;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
Expand Down Expand Up @@ -38,8 +37,6 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
import com.fasterxml.jackson.databind.type.CollectionType;
import com.fasterxml.jackson.databind.type.MapType;
import com.fasterxml.jackson.databind.type.TypeFactory;

import io.quarkus.deployment.annotations.BuildProducer;
Expand Down Expand Up @@ -453,23 +450,26 @@ private ResultHandle readValueFromJson(ClassCreator classCreator, BytecodeCreato
MethodDescriptor getTypeFactory = ofMethod(DeserializationContext.class, "getTypeFactory",
TypeFactory.class);
ResultHandle typeFactory = bytecode.invokeVirtualMethod(getTypeFactory, deserializationContext);
MethodDescriptor constructCollectionType = ofMethod(TypeFactory.class,
"constructCollectionType", CollectionType.class, Class.class, Class.class);
Class<?> concreteCollectionType = concreteCollectionType(fieldTypeName, fieldKind);
yield bytecode.invokeVirtualMethod(constructCollectionType, typeFactory,
bytecode.loadClass(concreteCollectionType),
bytecode.loadClass(listType.name().toString()));
MethodDescriptor constructParametricType = ofMethod(TypeFactory.class,
"constructParametricType", JavaType.class, Class.class, Class[].class);
ResultHandle paramTypes = bytecode.newArray(Class.class, 1);
bytecode.writeArrayValue(paramTypes, 0, bytecode.loadClass(listType.name().toString()));
yield bytecode.invokeVirtualMethod(constructParametricType, typeFactory,
bytecode.loadClass(fieldTypeName), paramTypes);
}
case MAP -> {
Type keyType = ((ParameterizedType) fieldType).arguments().get(0);
Type valueType = ((ParameterizedType) fieldType).arguments().get(1);
MethodDescriptor getTypeFactory = ofMethod(DeserializationContext.class, "getTypeFactory",
TypeFactory.class);
ResultHandle typeFactory = bytecode.invokeVirtualMethod(getTypeFactory, deserializationContext);
MethodDescriptor constructMapType = ofMethod(TypeFactory.class, "constructMapType",
MapType.class, Class.class, Class.class, Class.class);
yield bytecode.invokeVirtualMethod(constructMapType, typeFactory, bytecode.loadClass(HashMap.class),
bytecode.loadClass(keyType.name().toString()), bytecode.loadClass(valueType.name().toString()));
MethodDescriptor constructParametricType = ofMethod(TypeFactory.class,
"constructParametricType", JavaType.class, Class.class, Class[].class);
ResultHandle paramTypes = bytecode.newArray(Class.class, 2);
bytecode.writeArrayValue(paramTypes, 0, bytecode.loadClass(keyType.name().toString()));
bytecode.writeArrayValue(paramTypes, 1, bytecode.loadClass(valueType.name().toString()));
yield bytecode.invokeVirtualMethod(constructParametricType, typeFactory,
bytecode.loadClass(fieldTypeName), paramTypes);
}
default -> bytecode.loadClass(fieldTypeName);
};
Expand All @@ -483,17 +483,6 @@ private ResultHandle readValueFromJson(ClassCreator classCreator, BytecodeCreato
return bytecode.invokeVirtualMethod(readTreeAsValue, deserializationContext, valueNode, typeHandle);
}

private static Class<?> concreteCollectionType(String fieldTypeName, FieldKind fieldKind) {
try {
Class<?> declared = Class.forName(fieldTypeName);
if (!declared.isInterface() && !Modifier.isAbstract(declared.getModifiers())) {
return declared;
}
} catch (ClassNotFoundException ignored) {
}
return fieldKind == FieldKind.SET ? HashSet.class : ArrayList.class;
}

private void writeValueToObject(ClassInfo classInfo, ResultHandle objHandle, FieldSpecs fieldSpecs,
BytecodeCreator bytecode, ResultHandle valueHandle) {
if (fieldSpecs.isPublicField()) {
Expand Down
13 changes: 13 additions & 0 deletions ...est/java/io/quarkus/resteasy/reactive/jackson/deployment/test/AbstractSimpleJsonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,19 @@ void testShouldDeserializePolymorphicItems() {
.body("values", CoreMatchers.is("world"));
}

@Test
void testShouldDeserializeAbstractList() {
RestAssured
.with()
.body("{\"items\": [{\"name\": \"world\"}]}")
.contentType("application/json; charset=utf-8")
.post("/simple/deque-batch")
.then()
.statusCode(200)
.contentType("application/json")
.body("values", CoreMatchers.is("world"));
}

@Test
void testShouldRejectUnknownFields() {
RestAssured
Expand Down
14 changes: 14 additions & 0 deletions ...rc/test/java/io/quarkus/resteasy/reactive/jackson/deployment/test/SimpleJsonResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down Expand Up @@ -606,6 +607,9 @@ public record GreetingRequest(@JsonProperty("name") String name) {
public record LinkedListBatchRequest(@JsonProperty("items") LinkedList<GreetingRequest> items) {
}

public record DequeBatchRequest(@JsonProperty("items") Deque<GreetingRequest> items) {
}

@POST
@Path("/linkedlist-batch")
@Produces(MediaType.APPLICATION_JSON)
Expand All @@ -616,6 +620,16 @@ public String linkedListBatch(LinkedListBatchRequest request) {
return "{\"values\":\"" + values + "\"}";
}

@POST
@Path("/deque-batch")
@Produces(MediaType.APPLICATION_JSON)
public String dequeBatch(DequeBatchRequest request) {
String values = request.items().stream()
.map(GreetingRequest::name)
.collect(Collectors.joining(","));
return "{\"values\":\"" + values + "\"}";
}

@POST
@Path("/greeting")
public String greeting(GreetingRequest request) {
Expand Down
Loading