root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add contextClass resolution to JacksonJsonDecoder 

Issue: SPR-14158
This commit is contained in:
Sebastien Deleuze 2016-07-21 14:56:53 +02:00
parent 610bdf1cc3
commit 9fb8a2eb2e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
View File

@ -17,6 +17,7 @@
package org.springframework.web.reactive.result.method.annotation; package org.springframework.web.reactive.result.method.annotation;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Method;
import java.net.URI; import java.net.URI;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -31,7 +32,6 @@ import java.util.concurrent.CompletableFuture;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@ -58,6 +58,7 @@ import org.springframework.http.server.reactive.MockServerHttpResponse;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.reactive.result.ResolvableMethod; import org.springframework.web.reactive.result.ResolvableMethod;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.ServerWebInputException; import org.springframework.web.server.ServerWebInputException;
@ -246,11 +247,11 @@ public class MessageReaderArgumentResolverTests {
} }
@Test // SPR-9964 @Test // SPR-9964
@Ignore
public void parameterizedMethodArgument() throws Exception { public void parameterizedMethodArgument() throws Exception {
Class<?> clazz = ConcreteParameterizedController.class; Method method = AbstractParameterizedController.class.getMethod("handleDto", Identifiable.class);
MethodParameter param = ResolvableMethod.onClass(clazz).name("handleDto").resolveParam(); HandlerMethod handlerMethod = new HandlerMethod(new ConcreteParameterizedController(), method);
SimpleBean simpleBean = resolveValue(param, "{\"name\" : \"Jad\"}"); MethodParameter methodParam = handlerMethod.getMethodParameters()[0];
SimpleBean simpleBean = resolveValue(methodParam, "{\"name\" : \"Jad\"}");
assertEquals("Jad", simpleBean.getName()); assertEquals("Jad", simpleBean.getName());
} }

4
spring-web/src/main/java/org/springframework/http/codec/json/JacksonJsonDecoder.java
View File

@ -98,8 +98,8 @@ public class JacksonJsonDecoder extends AbstractJacksonJsonCodec implements Deco
MethodParameter methodParameter = (elementType.getSource() instanceof MethodParameter ? MethodParameter methodParameter = (elementType.getSource() instanceof MethodParameter ?
(MethodParameter)elementType.getSource() : null); (MethodParameter)elementType.getSource() : null);
// TODO Find a way to pass the real concrete controller contextClass Class<?> contextClass = (methodParameter != null ? methodParameter.getContainingClass() : null);
JavaType javaType = getJavaType(elementType.getType(), null); JavaType javaType = getJavaType(elementType.getType(), contextClass);
ObjectReader reader; ObjectReader reader;
if (methodParameter != null && methodParameter.getParameter().getAnnotation(JsonView.class) != null) { if (methodParameter != null && methodParameter.getParameter().getAnnotation(JsonView.class) != null) {