Jackson 3

Author: rwinch

gradle/libs.versions.toml

@@ -6,8 +6,8 @@ org-springframework-boot = "4.0.0-SNAPSHOT"
 
 [libraries]
 ch-qos-logback-logback-core = { module = "ch.qos.logback:logback-core", version = "1.5.18" }
-com-fasterxml-jackson-core-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.4"
-com-fasterxml-jackson-jackson-bom = "com.fasterxml.jackson:jackson-bom:2.17.3"
+jackson-databind = "tools.jackson.core:jackson-databind:3.0.0"
+jackson-bom = "tools.jackson:jackson-bom:3.0.0"
 com-google-code-findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2" # FIXME: Remove findbugs?
 com-h2database-h2 = "com.h2database:h2:2.3.232"
 com-ibm-db2-jcc = "com.ibm.db2:jcc:12.1.2.0"

spring-session-data-redis/spring-session-data-redis.gradle

@@ -21,6 +21,7 @@ dependencies {
 	testImplementation "org.springframework.security:spring-security-core"
 	testImplementation "org.springframework:spring-test"
 	testImplementation "org.springframework:spring-web"
+	testImplementation libs.jackson.databind
 
 	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 	testRuntimeOnly "org.junit.platform:junit-platform-launcher"

spring-session-dependencies/spring-session-dependencies.gradle

@@ -7,7 +7,7 @@ javaPlatform {
 }
 
 dependencies {
-    api platform(libs.com.fasterxml.jackson.jackson.bom)
+    api platform(libs.jackson.bom)
     api platform(libs.io.projectreactor.reactor.bom)
     api platform(libs.org.junit.junit.bom)
     api platform(libs.org.mockito.mockito.bom)

spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/spring-session-sample-boot-jdbc-json-attribute.gradle

@@ -5,8 +5,7 @@ dependencies {
 	implementation project(':spring-session-jdbc')
 	implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
 	implementation "org.springframework.boot:spring-boot-session-jdbc"
-	implementation libs.com.fasterxml.jackson.core.jackson.databind
-	implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
+	implementation libs.jackson.databind
 	implementation "org.springframework.boot:spring-boot-starter-jdbc"
 	implementation "org.springframework.boot:spring-boot-starter-security"
 	implementation "org.springframework.boot:spring-boot-starter-thymeleaf"

spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config/SessionConfig.java

@@ -4,7 +4,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.context.annotation.Bean;
@@ -14,7 +15,7 @@
 import org.springframework.core.serializer.Serializer;
 import org.springframework.core.serializer.support.DeserializingConverter;
 import org.springframework.core.serializer.support.SerializingConverter;
-import org.springframework.security.jackson2.SecurityJackson2Modules;
+import org.springframework.security.jackson.SecurityJacksonModules;
 import org.springframework.session.config.SessionRepositoryCustomizer;
 import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
 
@@ -43,23 +44,14 @@ SessionRepositoryCustomizer<JdbcIndexedSessionRepository> customizer() {
 		};
 	}
 
-	/**
-	 * Spring Boot provides auto configuration for Jackson 3 and not Jackson 2
-	 * (ObjectMapper) so we explicitly provide it here.
-	 * @return
-	 */
-	@Bean
-	ObjectMapper objectMapper() {
-		return new ObjectMapper();
-	}
-
 	@Bean("springSessionConversionService")
-	public GenericConversionService springSessionConversionService(ObjectMapper objectMapper) {
-		ObjectMapper copy = objectMapper.copy();
-		copy.registerModules(SecurityJackson2Modules.getModules(this.classLoader));
+	public GenericConversionService springSessionConversionService() {
+		JsonMapper mapper = JsonMapper.builder()
+			.addModules(SecurityJacksonModules.getModules(this.classLoader))
+			.build();
 		GenericConversionService converter = new GenericConversionService();
-		converter.addConverter(Object.class, byte[].class, new SerializingConverter(new JsonSerializer(copy)));
-		converter.addConverter(byte[].class, Object.class, new DeserializingConverter(new JsonDeserializer(copy)));
+		converter.addConverter(Object.class, byte[].class, new SerializingConverter(new JsonSerializer(mapper)));
+		converter.addConverter(byte[].class, Object.class, new DeserializingConverter(new JsonDeserializer(mapper)));
 		return converter;
 	}
 

spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/test/java/sample/JdbcJsonAttributeTests.java

@@ -18,19 +18,21 @@
 
 import java.util.Base64;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.Cookie;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureJdbc;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
 import org.springframework.boot.security.autoconfigure.SecurityProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.context.annotation.Import;
 import org.springframework.jdbc.core.simple.JdbcClient;
 import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.jackson2.SecurityJackson2Modules;
+import org.springframework.security.jackson.SecurityJacksonModules;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -45,10 +47,7 @@ class JdbcJsonAttributeTests {
 	@Autowired
 	MockMvc mvc;
 
-	@Autowired
-	ObjectMapper objectMapper;
-
-	ObjectMapper objectMapperWithModules;
+	JsonMapper mapper;
 
 	@Autowired
 	JdbcClient jdbcClient;
@@ -62,9 +61,9 @@ void setSecurityProperties(SecurityProperties securityProperties) {
 
 	@BeforeEach
 	void setup() {
-		ObjectMapper copy = this.objectMapper.copy();
-		copy.registerModules(SecurityJackson2Modules.getModules(getClass().getClassLoader()));
-		this.objectMapperWithModules = copy;
+		this.mapper = JsonMapper.builder()
+			.addModules(SecurityJacksonModules.getModules(getClass().getClassLoader()))
+			.build();
 		this.jdbcClient.sql("DELETE FROM spring_session_attributes").update();
 		this.jdbcClient.sql("DELETE FROM spring_session").update();
 	}
@@ -83,8 +82,7 @@ void loginShouldSaveSecurityContextAsJson() throws Exception {
 				WHERE attribute_name = 'SPRING_SECURITY_CONTEXT'
 				AND s.session_id = :id
 				""").param("id", sessionId).query().singleValue();
-		SecurityContext securityContext = this.objectMapperWithModules.readValue((String) attributeBytes,
-				SecurityContext.class);
+		SecurityContext securityContext = this.mapper.readValue((String) attributeBytes, SecurityContext.class);
 		assertThat(securityContext).isNotNull();
 		assertThat(securityContext.getAuthentication().getName()).isEqualTo(this.username);
 	}
@@ -96,8 +94,7 @@ void loginWhenQueryUsingJsonbOperatorThenReturns() throws Exception {
 				SELECT attribute_bytes::text FROM spring_session_attributes
 				WHERE attribute_bytes -> 'authentication' -> 'principal' ->> 'username' = '%s'
 				""".formatted(this.username)).query().singleValue();
-		SecurityContext securityContext = this.objectMapperWithModules.readValue((String) attributeBytes,
-				SecurityContext.class);
+		SecurityContext securityContext = this.mapper.readValue((String) attributeBytes, SecurityContext.class);
 		assertThat(securityContext).isNotNull();
 		assertThat(securityContext.getAuthentication().getName()).isEqualTo(this.username);
 	}

spring-session-samples/spring-session-sample-boot-redis-json/spring-session-sample-boot-redis-json.gradle

@@ -13,8 +13,7 @@ dependencies {
 	implementation  "org.webjars:bootstrap"
 	implementation  "org.webjars:html5shiv"
 	implementation  "org.webjars:webjars-locator-core"
-	implementation libs.com.fasterxml.jackson.core.jackson.databind
-	implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
+	implementation libs.jackson.databind
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"

spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java

@@ -22,10 +22,10 @@
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.context.annotation.Bean;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer;
 import org.springframework.session.data.redis.config.annotation.SpringSessionRedisOperations;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
@@ -48,8 +48,7 @@ class RedisSerializerTest {
 	void testRedisTemplate() {
 		assertThat(this.sessionRedisTemplate).isNotNull();
 		assertThat(this.sessionRedisTemplate.getDefaultSerializer()).isNotNull();
-		assertThat(this.sessionRedisTemplate.getDefaultSerializer())
-			.isInstanceOf(GenericJackson2JsonRedisSerializer.class);
+		assertThat(this.sessionRedisTemplate.getDefaultSerializer()).isInstanceOf(JacksonJsonRedisSerializer.class);
 	}
 
 	@TestConfiguration

spring-session-samples/spring-session-sample-boot-redis-json/src/main/java/sample/config/SessionConfig.java

@@ -16,14 +16,14 @@
 
 package sample.config;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.security.jackson2.SecurityJackson2Modules;
+import org.springframework.security.jackson.SecurityJacksonModules;
 
 /**
  * @author jitendra on 3/3/16.
@@ -41,18 +41,16 @@ public class SessionConfig implements BeanClassLoaderAware {
 	 */
 	@Bean
 	public RedisSerializer<Object> springSessionDefaultRedisSerializer() {
-		return new GenericJackson2JsonRedisSerializer(objectMapper());
+		return new JacksonJsonRedisSerializer<>(objectMapper(), Object.class);
 	}
 
 	/**
-	 * Customized {@link ObjectMapper} to add mix-in for class that doesn't have default
+	 * Customized {@link JsonMapper} to add mix-in for class that doesn't have default
 	 * constructors
-	 * @return the {@link ObjectMapper} to use
+	 * @return the {@link JsonMapper} to use
 	 */
-	private ObjectMapper objectMapper() {
-		ObjectMapper mapper = new ObjectMapper();
-		mapper.registerModules(SecurityJackson2Modules.getModules(this.loader));
-		return mapper;
+	private JsonMapper objectMapper() {
+		return JsonMapper.builder().addModules(SecurityJacksonModules.getModules(this.loader)).build();
 	}
 
 	/*

spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle

@@ -10,7 +10,7 @@ dependencies {
 	implementation "org.springframework:spring-webmvc"
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
-	implementation "com.fasterxml.jackson.core:jackson-databind"
+	implementation libs.jackson.databind
 	implementation "org.slf4j:slf4j-api"
 	implementation "org.slf4j:jcl-over-slf4j"
 	implementation "org.slf4j:log4j-over-slf4j"