Compatibility with Jackson 2.12 (tested against 2.12.0-rc1)

jhoeller · jhoeller · commit a6e48811c0fd · 2020-10-13T11:04:55.000+02:00
Closes gh-25907
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
@@ -55,7 +55,7 @@
  * <li>{@link DeserializationFeature#FAIL_ON_UNKNOWN_PROPERTIES} is disabled</li>
  * </ul>
  *
- * <p>Compatible with Jackson 2.6 and higher, as of Spring 4.3.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Mark Pollack
  * @author Dave Syer
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java b/spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java
@@ -52,7 +52,7 @@
  * <li>{@link DeserializationFeature#FAIL_ON_UNKNOWN_PROPERTIES} is disabled</li>
  * </ul>
  *
- * <p>Compatible with Jackson 2.9 and higher, as of Spring 5.1.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/cbor/MappingJackson2CborHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -37,7 +37,7 @@
  * <p>The default constructor uses the default configuration provided by
  * {@link Jackson2ObjectMapperBuilder}.
  *
- * <p>Compatible with Jackson 2.9 and higher.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Sebastien Deleuze
  * @since 5.0
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
@@ -61,7 +61,7 @@
  * Abstract base class for Jackson based and content type independent
  * {@link HttpMessageConverter} implementations.
  *
- * <p>Compatible with Jackson 2.9 and higher, as of Spring 5.0.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Arjen Poutsma
  * @author Keith Donald
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -92,7 +92,7 @@
  * support for Kotlin classes and data classes</li>
  * </ul>
  *
- * <p>Compatible with Jackson 2.6 and higher, as of Spring 4.3.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Sebastien Deleuze
  * @author Juergen Hoeller
@@ -649,8 +649,8 @@ public Jackson2ObjectMapperBuilder applicationContext(ApplicationContext applica
 	 * An option to apply additional customizations directly to the
 	 * {@code ObjectMapper} instances at the end, after all other config
 	 * properties of the builder have been applied.
-	 * @param configurer a configurer to apply; if invoked multiple times, all
-	 * configurers are applied in the same order.
+	 * @param configurer a configurer to apply. If several configurers are
+	 * registered, they will get applied in their registration order.
 	 * @since 5.3
 	 */
 	public Jackson2ObjectMapperBuilder postConfigurer(Consumer<ObjectMapper> configurer) {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java b/spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -135,7 +135,7 @@
  * &lt;/bean
  * </pre>
  *
- * <p>Compatible with Jackson 2.6 and higher, as of Spring 4.3.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author <a href="mailto:dmitry.katsubo@gmail.com">Dmitry Katsubo</a>
  * @author Rossen Stoyanchev
diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -36,7 +36,7 @@
  *
  * <p>The default constructor uses the default configuration provided by {@link Jackson2ObjectMapperBuilder}.
  *
- * <p>Compatible with Jackson 2.9 and higher, as of Spring 5.0.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Arjen Poutsma
  * @author Keith Donald
diff --git a/spring-web/src/main/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/smile/MappingJackson2SmileHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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 @@
  *
  * <p>The default constructor uses the default configuration provided by {@link Jackson2ObjectMapperBuilder}.
  *
- * <p>Compatible with Jackson 2.9 and higher.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Sebastien Deleuze
  * @since 5.0
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -37,7 +37,7 @@
  *
  * <p>The default constructor uses the default configuration provided by {@link Jackson2ObjectMapperBuilder}.
  *
- * <p>Compatible with Jackson 2.9 and higher, as of Spring 5.0.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Sebastien Deleuze
  * @since 4.1
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
@@ -354,7 +354,7 @@ private static DeserializerFactoryConfig getDeserializerFactoryConfig(ObjectMapp
 
 	@Test
 	void propertyNamingStrategy() {
-		PropertyNamingStrategy strategy = new PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy();
+		PropertyNamingStrategy strategy = new PropertyNamingStrategy.SnakeCaseStrategy();
 		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().propertyNamingStrategy(strategy).build();
 		assertThat(objectMapper.getSerializationConfig().getPropertyNamingStrategy()).isSameAs(strategy);
 		assertThat(objectMapper.getDeserializationConfig().getPropertyNamingStrategy()).isSameAs(strategy);
@@ -430,9 +430,8 @@ void filters() throws JsonProcessingException {
 		assertThat(output).doesNotContain("value2");
 	}
 
-	@Test // gh-23017
+	@Test  // gh-23017
 	void postConfigurer() {
-
 		JacksonAnnotationIntrospector introspector1 = new JacksonAnnotationIntrospector();
 		JacksonAnnotationIntrospector introspector2 = new JacksonAnnotationIntrospector();
 
@@ -456,7 +455,7 @@ void completeSetup() throws JsonMappingException {
 		JsonSerializer<Number> serializer2 = new NumberSerializer(Integer.class);
 
 		Jackson2ObjectMapperBuilder builder = Jackson2ObjectMapperBuilder.json()
-				.modules(new ArrayList<>()) // Disable well-known modules detection
+				.modules(new ArrayList<>())  // Disable well-known modules detection
 				.serializers(serializer1)
 				.serializersByType(Collections.singletonMap(Boolean.class, serializer2))
 				.deserializersByType(deserializerMap)
@@ -564,7 +563,6 @@ void factory() {
 		assertThat(objectMapper.getFactory().getClass()).isEqualTo(SmileFactory.class);
 	}
 
-
 	@Test
 	void visibility() throws JsonProcessingException {
 		ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
@@ -578,6 +576,7 @@ void visibility() throws JsonProcessingException {
 		assertThat(json).doesNotContain("property3");
 	}
 
+
 	static class CustomIntegerModule extends Module {
 
 		@Override
@@ -664,6 +663,7 @@ public void setList(List<T> list) {
 		}
 	}
 
+
 	static class JacksonVisibilityBean {
 
 		@SuppressWarnings("unused")
@@ -674,9 +674,9 @@ static class JacksonVisibilityBean {
 		public String getProperty3() {
 			return null;
 		}
-
 	}
 
+
 	static class OffsetDateTimeDeserializer extends JsonDeserializer<OffsetDateTime> {
 
 		private static final String CURRENT_ZONE_OFFSET = OffsetDateTime.now().getOffset().toString();
@@ -697,6 +697,7 @@ public OffsetDateTime deserialize(JsonParser jsonParser, DeserializationContext
 		}
 	}
 
+
 	@JsonDeserialize
 	static class DemoPojo {
 
@@ -709,7 +710,6 @@ public OffsetDateTime getOffsetDateTime() {
 		public void setOffsetDateTime(OffsetDateTime offsetDateTime) {
 			this.offsetDateTime = offsetDateTime;
 		}
-
 	}
 
 	@SuppressWarnings("serial")
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
@@ -261,7 +261,7 @@ private static DeserializerFactoryConfig getDeserializerFactoryConfig(ObjectMapp
 
 	@Test
 	public void propertyNamingStrategy() {
-		PropertyNamingStrategy strategy = new PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy();
+		PropertyNamingStrategy strategy = new PropertyNamingStrategy.SnakeCaseStrategy();
 		this.factory.setPropertyNamingStrategy(strategy);
 		this.factory.afterPropertiesSet();
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -46,7 +46,6 @@
 import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -202,11 +201,6 @@ public JsonTypeInfo.Id getMechanism() {
 			return JsonTypeInfo.Id.CUSTOM;
 		}
 
-		// Only needed when compiling against Jackson 2.7; gone in 2.8
-		public JavaType typeFromId(String s) {
-			return TypeFactory.defaultInstance().constructFromCanonical(s);
-		}
-
 		@Override
 		public String idFromValue(Object value) {
 			isAutowiredFiledInitialized = (this.capitalizer != null);
@@ -227,7 +221,6 @@ public JavaType typeFromId(DatabindContext context, String id) {
 			return null;
 		}
 
-		// New in Jackson 2.7
 		@Override
 		public String getDescForKnownTypeIds() {
 			return null;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -41,7 +41,7 @@
  * Abstract base class for Jackson based and content type independent
  * {@link AbstractView} implementations.
  *
- * <p>Compatible with Jackson 2.6 and higher, as of Spring 4.3.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Jeremy Grelle
  * @author Arjen Poutsma
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
@@ -42,7 +42,7 @@
  *
  * <p>The default constructor uses the default configuration provided by {@link Jackson2ObjectMapperBuilder}.
  *
- * <p>Compatible with Jackson 2.6 and higher, as of Spring 4.3.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Jeremy Grelle
  * @author Arjen Poutsma
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -38,7 +38,7 @@
  *
  * <p>The default constructor uses the default configuration provided by {@link Jackson2ObjectMapperBuilder}.
  *
- * <p>Compatible with Jackson 2.6 and higher, as of Spring 4.3.
+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.
  *
  * @author Sebastien Deleuze
  * @since 4.1

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`* <li>{@link DeserializationFeature#FAIL_ON_UNKNOWN_PROPERTIES} is disabled</li>`
`56`	`56`	`* </ul>`
`57`	`57`	`*`
`58`		`- * <p>Compatible with Jackson 2.6 and higher, as of Spring 4.3.`
	`58`	`+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.`
`59`	`59`	`*`
`60`	`60`	`* @author Mark Pollack`
`61`	`61`	`* @author Dave Syer`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`* <li>{@link DeserializationFeature#FAIL_ON_UNKNOWN_PROPERTIES} is disabled</li>`
`53`	`53`	`* </ul>`
`54`	`54`	`*`
`55`		`- * <p>Compatible with Jackson 2.9 and higher, as of Spring 5.1.`
	`55`	`+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.`
`56`	`56`	`*`
`57`	`57`	`* @author Rossen Stoyanchev`
`58`	`58`	`* @author Juergen Hoeller`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2019 the original author or authors.`
	`2`	`+ * Copyright 2002-2020 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -37,7 +37,7 @@`
`37`	`37`	`* <p>The default constructor uses the default configuration provided by`
`38`	`38`	`* {@link Jackson2ObjectMapperBuilder}.`
`39`	`39`	`*`
`40`		`- * <p>Compatible with Jackson 2.9 and higher.`
	`40`	`+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.`
`41`	`41`	`*`
`42`	`42`	`* @author Sebastien Deleuze`
`43`	`43`	`* @since 5.0`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`* Abstract base class for Jackson based and content type independent`
`62`	`62`	`* {@link HttpMessageConverter} implementations.`
`63`	`63`	`*`
`64`		`- * <p>Compatible with Jackson 2.9 and higher, as of Spring 5.0.`
	`64`	`+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.`
`65`	`65`	`*`
`66`	`66`	`* @author Arjen Poutsma`
`67`	`67`	`* @author Keith Donald`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2018 the original author or authors.`
	`2`	`+ * Copyright 2002-2020 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -135,7 +135,7 @@`
`135`	`135`	`* </bean`
`136`	`136`	`* </pre>`
`137`	`137`	`*`
`138`		`- * <p>Compatible with Jackson 2.6 and higher, as of Spring 4.3.`
	`138`	`+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.`
`139`	`139`	`*`
`140`	`140`	`* @author <a href="mailto:[email protected]">Dmitry Katsubo</a>`
`141`	`141`	`* @author Rossen Stoyanchev`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2017 the original author or authors.`
	`2`	`+ * Copyright 2002-2020 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -35,7 +35,7 @@`
`35`	`35`	`*`
`36`	`36`	`* <p>The default constructor uses the default configuration provided by {@link Jackson2ObjectMapperBuilder}.`
`37`	`37`	`*`
`38`		`- * <p>Compatible with Jackson 2.9 and higher.`
	`38`	`+ * <p>Compatible with Jackson 2.9 to 2.12, as of Spring 5.3.`
`39`	`39`	`*`
`40`	`40`	`* @author Sebastien Deleuze`
`41`	`41`	`* @since 5.0`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ private static DeserializerFactoryConfig getDeserializerFactoryConfig(ObjectMapp`
`354`	`354`
`355`	`355`	`@Test`
`356`	`356`	`void propertyNamingStrategy() {`
`357`		`- PropertyNamingStrategy strategy = new PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy();`
	`357`	`+ PropertyNamingStrategy strategy = new PropertyNamingStrategy.SnakeCaseStrategy();`
`358`	`358`	`ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().propertyNamingStrategy(strategy).build();`
`359`	`359`	`assertThat(objectMapper.getSerializationConfig().getPropertyNamingStrategy()).isSameAs(strategy);`
`360`	`360`	`assertThat(objectMapper.getDeserializationConfig().getPropertyNamingStrategy()).isSameAs(strategy);`
`@@ -430,9 +430,8 @@ void filters() throws JsonProcessingException {`
`430`	`430`	`assertThat(output).doesNotContain("value2");`
`431`	`431`	`}`
`432`	`432`
`433`		`- @Test // gh-23017`
	`433`	`+ @Test // gh-23017`
`434`	`434`	`void postConfigurer() {`
`435`		`-`
`436`	`435`	`JacksonAnnotationIntrospector introspector1 = new JacksonAnnotationIntrospector();`
`437`	`436`	`JacksonAnnotationIntrospector introspector2 = new JacksonAnnotationIntrospector();`
`438`	`437`
`@@ -456,7 +455,7 @@ void completeSetup() throws JsonMappingException {`
`456`	`455`	`JsonSerializer<Number> serializer2 = new NumberSerializer(Integer.class);`
`457`	`456`
`458`	`457`	`Jackson2ObjectMapperBuilder builder = Jackson2ObjectMapperBuilder.json()`
`459`		`- .modules(new ArrayList<>()) // Disable well-known modules detection`
	`458`	`+ .modules(new ArrayList<>()) // Disable well-known modules detection`
`460`	`459`	`.serializers(serializer1)`
`461`	`460`	`.serializersByType(Collections.singletonMap(Boolean.class, serializer2))`
`462`	`461`	`.deserializersByType(deserializerMap)`
`@@ -564,7 +563,6 @@ void factory() {`
`564`	`563`	`assertThat(objectMapper.getFactory().getClass()).isEqualTo(SmileFactory.class);`
`565`	`564`	`}`
`566`	`565`
`567`		`-`
`568`	`566`	`@Test`
`569`	`567`	`void visibility() throws JsonProcessingException {`
`570`	`568`	`ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()`
`@@ -578,6 +576,7 @@ void visibility() throws JsonProcessingException {`
`578`	`576`	`assertThat(json).doesNotContain("property3");`
`579`	`577`	`}`
`580`	`578`
	`579`	`+`
`581`	`580`	`static class CustomIntegerModule extends Module {`
`582`	`581`
`583`	`582`	`@Override`
`@@ -664,6 +663,7 @@ public void setList(List<T> list) {`
`664`	`663`	`}`
`665`	`664`	`}`
`666`	`665`
	`666`	`+`
`667`	`667`	`static class JacksonVisibilityBean {`
`668`	`668`
`669`	`669`	`@SuppressWarnings("unused")`
`@@ -674,9 +674,9 @@ static class JacksonVisibilityBean {`
`674`	`674`	`public String getProperty3() {`
`675`	`675`	`return null;`
`676`	`676`	`}`
`677`		`-`
`678`	`677`	`}`
`679`	`678`
	`679`	`+`
`680`	`680`	`static class OffsetDateTimeDeserializer extends JsonDeserializer<OffsetDateTime> {`
`681`	`681`
`682`	`682`	`private static final String CURRENT_ZONE_OFFSET = OffsetDateTime.now().getOffset().toString();`
`@@ -697,6 +697,7 @@ public OffsetDateTime deserialize(JsonParser jsonParser, DeserializationContext`
`697`	`697`	`}`
`698`	`698`	`}`
`699`	`699`
	`700`	`+`
`700`	`701`	`@JsonDeserialize`
`701`	`702`	`static class DemoPojo {`
`702`	`703`
`@@ -709,7 +710,6 @@ public OffsetDateTime getOffsetDateTime() {`
`709`	`710`	`public void setOffsetDateTime(OffsetDateTime offsetDateTime) {`
`710`	`711`	`this.offsetDateTime = offsetDateTime;`
`711`	`712`	`}`
`712`		`-`
`713`	`713`	`}`
`714`	`714`
`715`	`715`	`@SuppressWarnings("serial")`