Upgraded to Jackson 3 and Spring 7

Author: sptdevos

pom.xml

@@ -53,11 +53,10 @@
         <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring.boot.version>3.5.4</spring.boot.version>
+        <spring.boot.version>4.0.0</spring.boot.version>
         <beanmapper.version>6.0.0</beanmapper.version>
         <el.api.version>6.0.1</el.api.version>
         <el.impl.version>4.0.2</el.impl.version>
-        <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <hsqldb.version>2.7.4</hsqldb.version>
         <jakarta.servlet.version>6.1.0</jakarta.servlet.version>
         <jsonpath.version>2.10.0</jsonpath.version>
@@ -90,6 +89,11 @@
             <artifactId>beanmapper</artifactId>
             <version>${beanmapper.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
@@ -117,12 +121,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -132,6 +136,10 @@
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-webmvc-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>

src/main/java/io/beanmapper/spring/util/JsonUtil.java

@@ -1,12 +1,11 @@
 package io.beanmapper.spring.util;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
 
 /**
  * Utilities for working with JSON.
@@ -27,21 +26,18 @@ public static Set<String> getPropertyNamesFromJson(String json, ObjectMapper obj
         try {
             JsonNode tree = objectMapper.readTree(json);
             return getPropertyNames(tree, "");
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             throw new IllegalStateException("Could not retrieve property names from JSON.", e);
         }
     }
 
     private static Set<String> getPropertyNames(JsonNode node, String base) {
         Set<String> propertyNames = new HashSet<>();
-        Iterator<String> iterator = node.fieldNames();
-        while (iterator.hasNext()) {
-            String fieldName = iterator.next();
-
+        node.propertyNames().forEach(fieldName -> {
             String propertyName = isEmpty(base) ? fieldName : base + "." + fieldName;
             propertyNames.add(propertyName);
             propertyNames.addAll(getPropertyNames(node.get(fieldName), propertyName));
-        }
+        });
         return propertyNames;
     }
 

src/main/java/io/beanmapper/spring/web/converter/StructuredJsonMessageConverter.java

@@ -20,10 +20,10 @@
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 
 /**
- * Wraps the default Jackson2 message converter with read
+ * Wraps the default Jackson message converter with read
  * functionality that returns both the message and property
  * names.
  *
@@ -32,9 +32,9 @@
  */
 public class StructuredJsonMessageConverter implements HttpMessageConverter<Object> {
 
-    private final MappingJackson2HttpMessageConverter delegate;
+    private final JacksonJsonHttpMessageConverter delegate;
 
-    public StructuredJsonMessageConverter(MappingJackson2HttpMessageConverter delegate) {
+    public StructuredJsonMessageConverter(JacksonJsonHttpMessageConverter delegate) {
         this.delegate = delegate;
     }
 
@@ -69,7 +69,7 @@ public List<MediaType> getSupportedMediaTypes() {
     public Object read(Class<?> clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
         String json = new String(inputMessage.getBody().readAllBytes(), UTF_8);
         Object body = delegate.read(clazz, new StringHttpInputMessage(inputMessage.getHeaders(), json));
-        Set<String> propertyNames = JsonUtil.getPropertyNamesFromJson(json, delegate.getObjectMapper());
+        Set<String> propertyNames = JsonUtil.getPropertyNamesFromJson(json, delegate.getMapper());
         return new StructuredBody(body, propertyNames);
     }
 

src/test/java/io/beanmapper/spring/ApplicationConfig.java

@@ -3,7 +3,15 @@
  */
 package io.beanmapper.spring;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import static org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType.HSQL;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
+import jakarta.persistence.EntityManagerFactory;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.jpa.HibernatePersistenceProvider;
@@ -22,13 +30,6 @@
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.RestController;
 
-import jakarta.persistence.EntityManagerFactory;
-import javax.sql.DataSource;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType.HSQL;
-
 @ComponentScan(
     basePackageClasses = ApplicationConfig.class,
     excludeFilters = {
@@ -83,10 +84,9 @@ public JpaTransactionManager transactionManager(@Autowired LocalContainerEntityM
     }
 
     @Bean
-    public ObjectMapper objectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.findAndRegisterModules();
-        return mapper;
+    public JsonMapper objectMapper() {
+        return JsonMapper.builder()
+                .build();
     }
 
     @Configuration

src/test/java/io/beanmapper/spring/web/PersonControllerTest.java

@@ -13,8 +13,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jakarta.persistence.EntityManager;
-
 import io.beanmapper.BeanMapper;
 import io.beanmapper.config.BeanMapperBuilder;
 import io.beanmapper.spring.ApplicationConfig;
@@ -24,36 +22,31 @@
 import io.beanmapper.spring.model.Tag;
 import io.beanmapper.spring.web.converter.StructuredJsonMessageConverter;
 import io.beanmapper.spring.web.mockmvc.AbstractControllerTest;
+import jakarta.persistence.EntityManager;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 @ExtendWith(MockitoExtension.class)
 public class PersonControllerTest extends AbstractControllerTest {
 
+    private HttpMessageConverter converter = new StructuredJsonMessageConverter(new JacksonJsonHttpMessageConverter());
     private BeanMapper beanMapper;
 
-    private MappingJackson2HttpMessageConverter converter;
-
-    @InjectMocks
-    private ObjectMapper objectMapper;
-
     @Autowired
     private ApplicationContext applicationContext;
 
@@ -65,9 +58,6 @@ public class PersonControllerTest extends AbstractControllerTest {
 
     @BeforeEach
     public void setUp() {
-        converter = new MappingJackson2HttpMessageConverter();
-        converter.setObjectMapper(objectMapper);
-
         beanMapper = new BeanMapperBuilder()
                 .addPackagePrefix(ApplicationConfig.class)
                 .build();
@@ -78,7 +68,7 @@ public void setUp() {
     private MockMvc createWebClient(BeanMapper beanMapper) {
         return MockMvcBuilders.standaloneSetup(new PersonController())
                 .setCustomArgumentResolvers(new MergedFormMethodArgumentResolver(
-                        List.of(new StructuredJsonMessageConverter(converter)),
+                        List.of(converter),
                         beanMapper,
                         applicationContext,
                         entityManager))

src/test/java/io/beanmapper/spring/web/mockmvc/AbstractControllerTest.java

@@ -9,16 +9,15 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 @AutoConfigureMockMvc
-@EnableAutoConfiguration(exclude = SecurityAutoConfiguration.class)
+@EnableAutoConfiguration
 public class AbstractControllerTest extends AbstractSpringTest {
 
     private FakeWebMvcConfig config = new FakeWebMvcConfig();
@@ -32,14 +31,14 @@ protected void initWebClient(Object controller) {
 
         this.mockMvcBeanMapper = new MockMvcBeanMapper(
                 new FormattingConversionService(),
-                Collections.singletonList(config.mappingJackson2HttpMessageConverter()),
+                Collections.singletonList(config.structuredJsonMessageConverter()),
                 new FakeApplicationConfig().beanMapper()
         );
     }
 
     public void createWebClient(Object controller) {
         this.webClient = MockMvcBuilders.standaloneSetup(controller)
-                .setMessageConverters(config.mappingJackson2HttpMessageConverter())
+                .setMessageConverters(config.structuredJsonMessageConverter())
                 .setCustomArgumentResolvers(mockMvcBeanMapper.createHandlerMethodArgumentResolvers())
                 .setConversionService(mockMvcBeanMapper.getConversionService())
                 .build();

src/test/java/io/beanmapper/spring/web/mockmvc/fakedomain/ContainingFakeForm.java

@@ -5,7 +5,7 @@
 
 public class ContainingFakeForm {
 
-    @BeanProperty(name = "fake")
+    @BeanProperty("fake")
     public Long fakeId;
 
     @BeanIgnore

src/test/java/io/beanmapper/spring/web/mockmvc/fakedomain/ContainingFakeResult.java

@@ -4,7 +4,7 @@
 
 public class ContainingFakeResult {
 
-    @BeanProperty(name = "fake.name")
+    @BeanProperty("fake.name")
     public String fakeName;
 
 }

src/test/java/io/beanmapper/spring/web/mockmvc/fakedomain/FakeControllerTest.java

@@ -11,20 +11,19 @@
 import io.beanmapper.spring.ApplicationConfig;
 import io.beanmapper.spring.web.mockmvc.AbstractControllerTest;
 import io.beanmapper.spring.web.mockmvc.FakeController;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 class FakeControllerTest extends AbstractControllerTest {
 
     @InjectMocks
@@ -39,17 +38,16 @@ class FakeControllerTest extends AbstractControllerTest {
     @Autowired
     private FakeBuilder fakeBuilder;
 
-    @InjectMocks
-    private ObjectMapper objectMapper;
+    @MockitoBean
+    private JsonMapper objectMapper;
 
     private BeanMapper beanMapper;
 
-    private MappingJackson2HttpMessageConverter converter;
+    private JacksonJsonHttpMessageConverter converter;
 
     @BeforeEach
     void setup() {
-        converter = new MappingJackson2HttpMessageConverter();
-        converter.setObjectMapper(objectMapper);
+        converter = new JacksonJsonHttpMessageConverter(objectMapper);
 
         beanMapper = new BeanMapperBuilder()
                 .addPackagePrefix(ApplicationConfig.class)