Upgrade to Jackson 3.0.0-rc9 and 2.20.0

Signed-off-by: Sébastien Deleuze <[email protected]>

Author: sdeleuze

core/src/main/java/org/springframework/security/jackson/UserDeserializer.java

@@ -60,7 +60,7 @@ public User deserialize(JsonParser jp, DeserializationContext ctxt) throws Jacks
 				ctxt.getTypeFactory().constructType(SIMPLE_GRANTED_AUTHORITY_SET));
 		JsonNode passwordNode = readJsonNode(jsonNode, "password");
 		String username = readJsonNode(jsonNode, "username").asString();
-		String password = (passwordNode.isNull() || passwordNode.isMissingNode()) ? null : passwordNode.stringValue();
+		String password = (passwordNode.isMissingNode()) ? null : passwordNode.stringValue();
 		boolean enabled = readJsonNode(jsonNode, "enabled").asBoolean();
 		boolean accountNonExpired = readJsonNode(jsonNode, "accountNonExpired").asBoolean();
 		boolean credentialsNonExpired = readJsonNode(jsonNode, "credentialsNonExpired").asBoolean();

core/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java

@@ -75,7 +75,7 @@ public UsernamePasswordAuthenticationToken deserialize(JsonParser jp, Deserializ
 			throws IOException, JsonProcessingException {
 		ObjectMapper mapper = (ObjectMapper) jp.getCodec();
 		JsonNode jsonNode = mapper.readTree(jp);
-		Boolean authenticated = readJsonNode(jsonNode, "authenticated").asBoolean();
+		boolean authenticated = readJsonNode(jsonNode, "authenticated").asBoolean();
 		JsonNode principalNode = readJsonNode(jsonNode, "principal");
 		Object principal = getPrincipal(mapper, principalNode);
 		JsonNode credentialsNode = readJsonNode(jsonNode, "credentials");

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ org-springframework = "7.0.0-M8"
 
 [libraries]
 ch-qos-logback-logback-classic = "ch.qos.logback:logback-classic:1.5.18"
-com-fasterxml-jackson-jackson-bom = "com.fasterxml.jackson:jackson-bom:2.20.0-rc1"
+com-fasterxml-jackson-jackson-bom = "com.fasterxml.jackson:jackson-bom:2.20.0"
 com-google-inject-guice = "com.google.inject:guice:3.0"
 com-netflix-nebula-nebula-project-plugin = "com.netflix.nebula:nebula-project-plugin:8.2.0"
 com-nimbusds-nimbus-jose-jwt = "com.nimbusds:nimbus-jose-jwt:10.4"
@@ -82,7 +82,7 @@ org-springframework-data-spring-data-bom = "org.springframework.data:spring-data
 org-springframework-ldap-spring-ldap-core = "org.springframework.ldap:spring-ldap-core:3.2.13"
 org-springframework-spring-framework-bom = { module = "org.springframework:spring-framework-bom", version.ref = "org-springframework" }
 org-synchronoss-cloud-nio-multipart-parser = "org.synchronoss.cloud:nio-multipart-parser:1.1.0"
-tools-jackson-jackson-bom = "tools.jackson:jackson-bom:3.0.0-rc8"
+tools-jackson-jackson-bom = "tools.jackson:jackson-bom:3.0.0-rc9"
 
 com-google-code-gson-gson = "com.google.code.gson:gson:2.13.1"
 com-thaiopensource-trag = "com.thaiopensource:trang:20091111"

web/src/main/java/org/springframework/security/web/jackson/CookieDeserializer.java

@@ -44,11 +44,11 @@ public Cookie deserialize(JsonParser jp, DeserializationContext ctxt) throws Jac
 		Cookie cookie = new Cookie(readJsonNode(jsonNode, "name").stringValue(),
 				readJsonNode(jsonNode, "value").stringValue());
 		JsonNode domainNode = readJsonNode(jsonNode, "domain");
-		cookie.setDomain((domainNode.isNull() || domainNode.isMissingNode()) ? null : domainNode.stringValue());
+		cookie.setDomain((domainNode.isMissingNode()) ? null : domainNode.stringValue());
 		cookie.setMaxAge(readJsonNode(jsonNode, "maxAge").asInt(-1));
 		cookie.setSecure(readJsonNode(jsonNode, "secure").asBoolean());
 		JsonNode pathNode = readJsonNode(jsonNode, "path");
-		cookie.setPath((pathNode.isNull() || pathNode.isMissingNode()) ? null : pathNode.stringValue());
+		cookie.setPath((pathNode.isMissingNode()) ? null : pathNode.stringValue());
 		JsonNode attributes = readJsonNode(jsonNode, "attributes");
 		cookie.setHttpOnly(readJsonNode(attributes, "HttpOnly") != null);
 		return cookie;