From ffcbd758c0a0300992dda50f4092149c742903b2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 17 Nov 2022 10:06:28 +0000 Subject: [PATCH] Update Jackson-based decoders to reflect 2.14 baseline --- .../http/codec/json/AbstractJackson2Decoder.java | 4 ++-- .../springframework/http/codec/json/Jackson2JsonDecoder.java | 4 ++-- .../springframework/http/codec/json/Jackson2SmileDecoder.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java index 287dd8ce687d..85ede15b4d98 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java @@ -52,9 +52,9 @@ import org.springframework.util.MimeType; /** - * Abstract base class for Jackson 2.9 decoding, leveraging non-blocking parsing. + * Abstract base class for Jackson 2.14 decoding, leveraging non-blocking parsing. * - *

Compatible with Jackson 2.9.7 and higher. + *

Compatible with Jackson 2.14, as of Spring 6.0. * * @author Sebastien Deleuze * @author Rossen Stoyanchev diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java index ffc1df149a0b..e65aab696c74 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 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. @@ -35,7 +35,7 @@ import org.springframework.util.MimeTypeUtils; /** - * Decode a byte stream into JSON and convert to Object's with Jackson 2.9, + * Decode a byte stream into JSON and convert to Object's with Jackson 2.14, * leveraging non-blocking parsing. * * @author Sebastien Deleuze diff --git a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileDecoder.java index 4fc6095f2e04..32967665b89b 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileDecoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/json/Jackson2SmileDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 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. @@ -24,7 +24,7 @@ import org.springframework.util.MimeType; /** - * Decode a byte stream into Smile and convert to Object's with Jackson 2.9, + * Decode a byte stream into Smile and convert to Object's with Jackson 2.14, * leveraging non-blocking parsing. * * @author Sebastien Deleuze