Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error handling in Jackson2JsonDecoder

Browse Source 
Issue: SPR-15112
This commit is contained in:
Sebastien Deleuze
2017-01-09 14:51:16 +01:00
parent e4a599f961
commit aa43472f2e
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java
View File

@@ -118,7 +118,7 @@ public class Jackson2JsonDecoder extends AbstractJackson2Codec implements Decode
return value; return value;
} }
catch (IOException ex) { catch (IOException ex) {
return Flux.error(new CodecException("Error while reading the data", ex)); throw new CodecException("Error while reading the data", ex);
} }
}); });
} }

11
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
View File

@@ -28,6 +28,7 @@ import reactor.core.publisher.Mono;
import reactor.test.StepVerifier; import reactor.test.StepVerifier;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
import org.springframework.core.codec.CodecException;
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@@ -67,6 +68,16 @@ public class Jackson2JsonDecoderTests extends AbstractDataBufferAllocatingTestCa
.verify(); .verify();
} }
@Test
public void decodePojoWithError() throws Exception {
Flux<DataBuffer> source = Flux.just(stringBuffer("{\"foo\":}"));
ResolvableType elementType = ResolvableType.forClass(Pojo.class);
Flux<Object> flux = new Jackson2JsonDecoder().decode(source, elementType, null,
Collections.emptyMap());
StepVerifier.create(flux).verifyError(CodecException.class);
}
@Test @Test
public void decodeToList() throws Exception { public void decodeToList() throws Exception {
Flux<DataBuffer> source = Flux.just(stringBuffer( Flux<DataBuffer> source = Flux.just(stringBuffer(