From c31f0984581ec6b005013f762babe4f38f40445e Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 13 Dec 2024 08:23:38 +0100 Subject: [PATCH 1/2] Provide test case for #33968 --- .../standalone/GenericReturnTests.java | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/GenericReturnTests.java diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/GenericReturnTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/GenericReturnTests.java new file mode 100644 index 000000000000..a10a56157bc7 --- /dev/null +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/GenericReturnTests.java @@ -0,0 +1,81 @@ +/* + * Copyright 2002-2024 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.test.web.servlet.samples.standalone; + +import java.util.ArrayList; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.junit.jupiter.api.Test; + +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup; + +/** + * Demonstrates, if returning a List>? extends SomeType< can be correctly serialized. + * + * @author Roland Praml + */ +public class GenericReturnTests { + @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") + @JsonSubTypes({ + @JsonSubTypes.Type(value = SubType1.class, name = "one"), + @JsonSubTypes.Type(value = SubType2.class, name = "two") + }) + public static class BaseType { + + } + + public static class SubType1 extends BaseType { + } + + public static class SubType2 extends BaseType { + } + + @Test + public void genericReturnTest() throws Exception { + + standaloneSetup(new Controller()).build() + .perform(get("/genericReturnList").accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().contentType("application/json")) + .andExpect(jsonPath("$[0].type").value("one")) + .andExpect(jsonPath("$[1].type").value("two")); + } + + @RestController + @SuppressWarnings("unchecked") + public static class Controller { + + @GetMapping(value = "/genericReturnList", produces = MediaType.APPLICATION_JSON_VALUE) + public List get() { + List list = new ArrayList<>(); + list.add((T) new SubType1()); + list.add((T) new SubType2()); + return list; + } + + } +} From f60d747ea68a0f35c91d40acc30110d0c2e36197 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 13 Dec 2024 08:23:51 +0100 Subject: [PATCH 2/2] Possible fix for #33968 --- .../main/java/org/springframework/core/GenericTypeResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java index a5e0d74c65bd..d13acdbe26f2 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java @@ -180,7 +180,7 @@ else if (genericType instanceof ParameterizedType parameterizedType) { generics[i] = resolvedTypeArgument; } else { - generics[i] = ResolvableType.forType(typeArgument); + generics[i] = ResolvableType.forType(typeArgument).resolveType(); } } else if (typeArgument instanceof ParameterizedType) {