Hacking.

Author: odrotbohm

pom.xml

@@ -34,6 +34,7 @@
 		<xmlbeam>1.4.26</xmlbeam>
 		<java-module-name>spring.data.commons</java-module-name>
 		<kotlin.api.target>1.8</kotlin.api.target>
+		<spring-hateoas>3.0.0-GH-2357-SNAPSHOT</spring-hateoas>
 	</properties>
 
 	<dependencies>

src/main/java/org/springframework/data/web/ProjectingJacksonHttpMessageConverter.java

@@ -18,6 +18,7 @@
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.ObjectReader;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,7 +31,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.jspecify.annotations.Nullable;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
@@ -40,7 +40,6 @@
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.util.Assert;
@@ -72,15 +71,15 @@ public class ProjectingJacksonHttpMessageConverter extends JacksonJsonHttpMessag
 	 * Creates a new {@link ProjectingJacksonHttpMessageConverter} using a default {@link ObjectMapper}.
 	 */
 	public ProjectingJacksonHttpMessageConverter() {
-		this.projectionFactory = initProjectionFactory(getObjectMapper());
+		this.projectionFactory = initProjectionFactory(getMapper());
 	}
 
 	/**
 	 * Creates a new {@link ProjectingJacksonHttpMessageConverter} for the given {@link ObjectMapper}.
 	 *
 	 * @param mapper must not be {@literal null}.
 	 */
-	public ProjectingJacksonHttpMessageConverter(ObjectMapper mapper) {
+	public ProjectingJacksonHttpMessageConverter(JsonMapper mapper) {
 
 		super(mapper);
 

src/main/java/org/springframework/data/web/config/SpringDataJackson3Configuration.java

@@ -28,12 +28,11 @@
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
-import org.springframework.data.geo.GeoModule;
+import org.springframework.data.geo.GeoJacksonModule;
 import org.springframework.data.web.PagedModel;
 import org.springframework.data.web.config.EnableSpringDataWebSupport.PageSerializationMode;
 import org.springframework.util.ClassUtils;
@@ -47,12 +46,11 @@
  */
 public class SpringDataJackson3Configuration implements SpringDataJackson3Modules {
 
-	@Nullable
-	@Autowired(required = false) SpringDataWebSettings settings;
+	@Nullable @Autowired(required = false) SpringDataWebSettings settings;
 
 	@Bean
-	public GeoModule jackson3GeoModule() {
-		return new GeoModule();
+	public GeoJacksonModule jackson3GeoModule() {
+		return new GeoJacksonModule();
 	}
 
 	@Bean

src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java

@@ -15,11 +15,12 @@
  */
 package org.springframework.data.web.config;
 
+import tools.jackson.databind.json.JsonMapper;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.jspecify.annotations.Nullable;
-
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -47,11 +48,10 @@
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-
 /**
  * Configuration class to register {@link PageableHandlerMethodArgumentResolver},
- * {@link SortHandlerMethodArgumentResolver}, {@link OffsetScrollPositionHandlerMethodArgumentResolver}
- * and {@link DomainClassConverter}.
+ * {@link SortHandlerMethodArgumentResolver}, {@link OffsetScrollPositionHandlerMethodArgumentResolver} and
+ * {@link DomainClassConverter}.
  *
  * @since 1.6
  * @author Oliver Gierke
@@ -91,7 +91,8 @@ public SpringDataWebConfiguration(ApplicationContext context,
 		this.sortResolverCustomizer = Lazy.of( //
 				() -> context.getBeanProvider(SortHandlerMethodArgumentResolverCustomizer.class).getIfAvailable());
 		this.offsetResolverCustomizer = Lazy.of( //
-				() -> context.getBeanProvider(OffsetScrollPositionHandlerMethodArgumentResolverCustomizer.class).getIfAvailable());
+				() -> context.getBeanProvider(OffsetScrollPositionHandlerMethodArgumentResolverCustomizer.class)
+						.getIfAvailable());
 	}
 
 	@Override
@@ -170,8 +171,7 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> converters)
 
 			if (ClassUtils.isPresent("tools.jackson.databind.ObjectReader", context.getClassLoader())) {
 
-				tools.jackson.databind.ObjectMapper mapper = context.getBeanProvider(tools.jackson.databind.ObjectMapper.class)
-						.getIfUnique(tools.jackson.databind.ObjectMapper::new);
+				JsonMapper mapper = context.getBeanProvider(JsonMapper.class).getIfUnique(JsonMapper::new);
 
 				ProjectingJacksonHttpMessageConverter converter = new ProjectingJacksonHttpMessageConverter(mapper);
 				converter.setBeanFactory(context);

src/test/java/org/springframework/data/web/config/SpringDataWebConfigurationIntegrationTests.java

@@ -16,9 +16,11 @@
 package org.springframework.data.web.config;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,7 +29,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
-
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,7 +39,6 @@
 import org.springframework.http.converter.HttpMessageConverters;
 import org.springframework.instrument.classloading.ShadowingClassLoader;
 import org.springframework.util.ReflectionUtils;
-
 import org.xmlbeam.XBProjector;
 
 import com.jayway.jsonpath.DocumentContext;
@@ -114,7 +114,7 @@ void usesCustomObjectMapper() {
 
 			assertThat(captor.getAllValues()).anySatisfy(converter -> {
 				assertThat(converter).isInstanceOfSatisfying(ProjectingJacksonHttpMessageConverter.class, __ -> {
-					assertThat(__.getObjectMapper()).isSameAs(SomeConfiguration.MAPPER);
+					assertThat(__.getMapper()).isSameAs(SomeConfiguration.MAPPER);
 				});
 			});
 		}, SomeConfiguration.class);
@@ -152,10 +152,10 @@ private static Class<?> loadWithout(Class<?> configurationClass, Class<?>... typ
 	@Configuration
 	static class SomeConfiguration {
 
-		static ObjectMapper MAPPER = new ObjectMapper();
+		static JsonMapper MAPPER = new JsonMapper();
 
 		@Bean
-		ObjectMapper mapper() {
+		JsonMapper mapper() {
 			return MAPPER;
 		}
 	}