GH-2483 - Switch to Jackson 3.

Author: mp911de

pom.xml

@@ -113,6 +113,12 @@
 
 	<dependencies>
 
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<version>${springdata.commons}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>jakarta.validation</groupId>
 			<artifactId>jakarta.validation-api</artifactId>
@@ -146,6 +152,16 @@
 				<enabled>false</enabled>
 			</releases>
 		</repository>
+		<repository>
+			<id>central-snapshot</id>
+			<url>https://central.sonatype.com/repository/maven-snapshots/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
 		<repository>
 			<id>spring-milestone</id>
 			<url>https://repo.spring.io/milestone</url>

spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/AbstractWebIntegrationTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 
-import io.micrometer.observation.ObservationRegistry;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
@@ -35,7 +34,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
 import org.springframework.hateoas.Link;
@@ -132,17 +130,15 @@ protected MockHttpServletResponse putAndGet(Link link, Object payload, MediaType
 		return StringUtils.hasText(response.getContentAsString()) ? response : client.request(link);
 	}
 
-	protected MockHttpServletResponse putOnlyExpect5XXStatus(Link link, Object payload, MediaType mediaType)
+	protected MockHttpServletResponse putOnlyExpect4XXStatus(Link link, Object payload, MediaType mediaType)
 			throws Exception {
 
 		String href = link.isTemplated() ? link.expand().getHref() : link.getHref();
 
 		MvcTestResult result = mvc.perform(put(href).content(payload.toString()).contentType(mediaType));
-		assertThat(result).hasStatus5xxServerError();
-
-		MockHttpServletResponse response = result.getResponse();
+		assertThat(result).hasStatus4xxClientError();
 
-		return StringUtils.hasText(response.getContentAsString()) ? response : client.request(link);
+		return result.getResponse();
 	}
 
 	protected MockHttpServletResponse patchAndGet(Link link, Object payload, MediaType mediaType) throws Exception {
@@ -153,9 +149,7 @@ protected MockHttpServletResponse patchAndGet(Link link, Object payload, MediaTy
 				content(payload.toString()).contentType(mediaType));
 		assertThat(result).hasStatus2xxSuccessful();
 
-		MockHttpServletResponse response = result.getResponse();
-
-		return StringUtils.hasText(response.getContentAsString()) ? response : client.request(href);
+		return result.getResponse();
 	}
 
 	protected void deleteAndVerify(Link link) throws Exception {
@@ -165,8 +159,6 @@ protected void deleteAndVerify(Link link) throws Exception {
 		MvcTestResult result = mvc.perform(delete(href));
 		assertThat(result).hasStatus(HttpStatus.NO_CONTENT);
 
-		MockHttpServletResponse response = result.getResponse();
-
 		// Check that the resource is unavailable after a DELETE
 		assertThat(mvc.perform(get(href))).hasStatus(HttpStatus.NOT_FOUND);//
 	}

spring-data-rest-tests/spring-data-rest-tests-core/src/test/java/org/springframework/data/rest/tests/RepositoryTestsConfig.java

@@ -17,6 +17,11 @@
 
 import static org.mockito.Mockito.*;
 
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.module.SimpleModule;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -30,6 +35,7 @@
 import org.springframework.data.repository.support.DefaultRepositoryInvokerFactory;
 import org.springframework.data.repository.support.DomainClassConverter;
 import org.springframework.data.repository.support.Repositories;
+import org.springframework.data.repository.support.RepositoryInvokerFactory;
 import org.springframework.data.rest.core.UriToEntityConverter;
 import org.springframework.data.rest.core.config.EnumTranslationConfiguration;
 import org.springframework.data.rest.core.config.MetadataConfiguration;
@@ -40,8 +46,8 @@
 import org.springframework.data.rest.core.support.EntityLookup;
 import org.springframework.data.rest.core.support.SelfLinkProvider;
 import org.springframework.data.rest.webmvc.EmbeddedResourcesAssembler;
-import org.springframework.data.rest.webmvc.json.PersistentEntityJackson2Module;
-import org.springframework.data.rest.webmvc.json.PersistentEntityJackson2Module.LookupObjectSerializer;
+import org.springframework.data.rest.webmvc.json.PersistentEntityJackson3Module;
+import org.springframework.data.rest.webmvc.json.PersistentEntityJackson3Module.LookupObjectSerializer;
 import org.springframework.data.rest.webmvc.mapping.Associations;
 import org.springframework.data.rest.webmvc.mapping.DefaultLinkCollector;
 import org.springframework.data.rest.webmvc.mapping.LinkCollector;
@@ -53,19 +59,15 @@
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.hateoas.mediatype.MessageResolver;
 import org.springframework.hateoas.mediatype.hal.DefaultCurieProvider;
-import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.hateoas.mediatype.hal.HalJacksonModule;
+import org.springframework.hateoas.mediatype.hal.HalJacksonModule.HalHandlerInstantiator;
 import org.springframework.hateoas.server.EntityLinks;
 import org.springframework.hateoas.server.LinkRelationProvider;
 import org.springframework.hateoas.server.RepresentationModelProcessor;
 import org.springframework.hateoas.server.core.EvoInflectorLinkRelationProvider;
 import org.springframework.hateoas.server.mvc.RepresentationModelProcessorInvoker;
 import org.springframework.plugin.core.PluginRegistry;
 
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * @author Jon Brisbin
  * @author Greg Turnquist
@@ -107,7 +109,7 @@ public PersistentEntities persistentEntities() {
 	}
 
 	@Bean
-	public Module persistentEntityModule() {
+	public SimpleModule persistentEntityModule() {
 
 		var conversionService = new DefaultConversionService();
 
@@ -118,14 +120,14 @@ public Module persistentEntityModule() {
 		SelfLinkProvider selfLinkProvider = new DefaultSelfLinkProvider(persistentEntities(), entityLinks,
 				Collections.<EntityLookup<?>> emptyList(), conversionService);
 
-		DefaultRepositoryInvokerFactory invokerFactory = new DefaultRepositoryInvokerFactory(repositories());
+		RepositoryInvokerFactory invokerFactory = new DefaultRepositoryInvokerFactory(repositories());
 		UriToEntityConverter uriToEntityConverter = new UriToEntityConverter(persistentEntities(), invokerFactory,
 				() -> conversionService);
 
 		Associations associations = new Associations(mappings, config());
 		LinkCollector collector = new DefaultLinkCollector(persistentEntities(), selfLinkProvider, associations);
 
-		return new PersistentEntityJackson2Module(associations, persistentEntities(), uriToEntityConverter, collector,
+		return new PersistentEntityJackson3Module(associations, persistentEntities(), uriToEntityConverter, collector,
 				invokerFactory, mock(LookupObjectSerializer.class),
 				new RepresentationModelProcessorInvoker(Collections.<RepresentationModelProcessor<?>> emptyList()),
 				new EmbeddedResourcesAssembler(persistentEntities(), associations, mock(ExcerptProjector.class)));
@@ -135,15 +137,13 @@ invokerFactory, mock(LookupObjectSerializer.class),
 	public ObjectMapper objectMapper() {
 
 		LinkRelationProvider relProvider = new EvoInflectorLinkRelationProvider();
-		ObjectMapper mapper = new ObjectMapper();
-
-		mapper.registerModule(new Jackson2HalModule());
-		mapper.registerModule(persistentEntityModule());
-		mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(relProvider,
-				new DefaultCurieProvider(Collections.emptyMap()), MessageResolver.DEFAULTS_ONLY));
-		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-		mapper.setSerializationInclusion(Include.NON_EMPTY);
 
-		return mapper;
+		return JsonMapper.builder()
+				.addModule(new HalJacksonModule())
+				.addModule(persistentEntityModule())
+				.handlerInstantiator(new HalHandlerInstantiator(relProvider,
+						new DefaultCurieProvider(Collections.emptyMap()), MessageResolver.DEFAULTS_ONLY))
+				.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+				.build();
 	}
 }

spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/DataRest262Tests.java

@@ -24,6 +24,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -42,7 +43,7 @@
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -51,8 +52,6 @@
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 
 /**
@@ -67,25 +66,23 @@ class DataRest262Tests {
 	@Configuration
 	@Import({ RepositoryRestMvcConfiguration.class, JpaInfrastructureConfig.class })
 	@EnableJpaRepositories(considerNestedRepositories = true)
-	static class Config {
-
-	}
+	static class Config {}
 
 	@Autowired ApplicationContext beanFactory;
 	@Autowired JpaMetamodelMappingContext mappingContext;
 	@Autowired AirportRepository repository;
 
-	ObjectMapper mapper;
+	JsonMapper mapper;
 
 	@BeforeEach
 	void setUp() {
 
 		this.mapper = beanFactory //
-				.getBean("halJacksonHttpMessageConverter", AbstractJackson2HttpMessageConverter.class) //
-				.getObjectMapper() //
-				.copy();
-
-		this.mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+				.getBean("halJacksonHttpMessageConverter", JacksonJsonHttpMessageConverter.class) //
+				.getMapper() //
+				.rebuild()
+				.changeDefaultVisibility(it -> it.withFieldVisibility(Visibility.ANY))
+				.build();
 	}
 
 	@Test // DATAREST-262

spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/jpa/JpaWebTests.java

@@ -374,9 +374,9 @@ void associateTwoCreatorsToOrderWithSinglePut() throws Exception {
 		Link secondCreatorLink = preparePersonResource(new Person("Pippin", "Baggins"));
 		Link orderLinkToItsCreator = prepareOrderResource(new Order());
 
-		MockHttpServletResponse response = putOnlyExpect5XXStatus(orderLinkToItsCreator,
+		MockHttpServletResponse response = putOnlyExpect4XXStatus(orderLinkToItsCreator,
 				toUriList(firstCreatorLink, secondCreatorLink), TEXT_URI_LIST);
-		assertThat(response.getContentAsString()).contains("send only 1 link");
+		assertThat(response.getErrorMessage()).contains("send only 1 link");
 	}
 
 	@Test // DATAREST-219
@@ -587,7 +587,7 @@ void returnConflictWhenConcurrentlyEditingVersionedEntity() throws Exception {
 
 		assertThat(mvc.perform(patch(builder.build().toUriString()).content("{ \"saleItem\" : \"SpringyTequila\" }")
 				.contentType(MediaType.APPLICATION_JSON).header(IF_MATCH, "\"falseETag\"")))
-				.hasStatus(HttpStatus.PRECONDITION_FAILED);
+						.hasStatus(HttpStatus.PRECONDITION_FAILED);
 	}
 
 	@Test // DATAREST-423

spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java

@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import jakarta.persistence.EntityManager;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -34,13 +35,11 @@
 import org.springframework.data.rest.webmvc.jpa.OrderRepository;
 import org.springframework.data.rest.webmvc.jpa.Person;
 import org.springframework.data.rest.webmvc.jpa.PersonRepository;
-import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * Integration tests for {@link Jackson2DatatypeHelper}.
  *
@@ -58,16 +57,16 @@ class Jackson2DatatypeHelperIntegrationTests {
 	@Autowired OrderRepository orders;
 	@Autowired EntityManager em;
 
-	ObjectMapper objectMapper;
+	JsonMapper objectMapper;
 
 	Order order;
 
 	@BeforeEach
 	void setUp() {
 
 		this.order = orders.save(new Order(people.save(new Person("Dave", "Matthews"))));
-		this.objectMapper = context.getBean("halJacksonHttpMessageConverter", AbstractJackson2HttpMessageConverter.class)
-				.getObjectMapper();
+		this.objectMapper = context.getBean("halJacksonHttpMessageConverter", JacksonJsonHttpMessageConverter.class)
+				.getMapper();
 
 		// Reset JPA to make sure the query returns a result with proxy references
 		em.flush();

spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntitySerializationTests.java

@@ -17,6 +17,9 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Arrays;
@@ -54,7 +57,6 @@
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.util.UriTemplate;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 
 /**
@@ -83,11 +85,11 @@ static class TestConfig extends RepositoryTestsConfig {
 
 		@Bean
 		@Override
-		public ObjectMapper objectMapper() {
+		public JsonMapper objectMapper() {
 
-			ObjectMapper objectMapper = super.objectMapper();
-			objectMapper.registerModule(new JacksonSerializers(new EnumTranslator(MessageResolver.DEFAULTS_ONLY)));
-			return objectMapper;
+			return super.objectMapper().rebuild()
+					.addModule(new Jackson3Serializers(new EnumTranslator(MessageResolver.DEFAULTS_ONLY)))
+					.build();
 		}
 	}