Spike on parsed JsonNode reuse.

Author: mp911de

src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java

@@ -51,6 +51,7 @@
 import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.node.TextNode;
+import com.fasterxml.jackson.databind.node.TreeTraversingParser;
 import com.fasterxml.jackson.databind.ser.SerializerFactory;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.databind.type.TypeFactory;
@@ -306,12 +307,21 @@ public <T> T deserialize(@Nullable byte[] source, Class<T> type) throws Serializ
 		}
 
 		try {
-			return (T) reader.read(mapper, source, resolveType(source, type));
+
+			TypeTuple typeTuple = resolveType(source, type);
+			try (JsonParser parser = createParser(source, typeTuple)) {
+				return (T) reader.read(mapper, parser, typeTuple.type());
+			}
+
 		} catch (Exception ex) {
-			throw new SerializationException("Could not read JSON:%s ".formatted(ex.getMessage()), ex);
+			throw new SerializationException("Could not read JSON: %s ".formatted(ex.getMessage()), ex);
 		}
 	}
 
+	private JsonParser createParser(byte[] source, TypeTuple typeTuple) throws IOException {
+		return typeTuple.node() == null ? mapper.createParser(source) : new TreeTraversingParser(typeTuple.node(), mapper);
+	}
+
 	/**
 	 * Builder method used to configure and customize the internal Jackson {@link ObjectMapper} created by this
 	 * {@link GenericJackson2JsonRedisSerializer} and used to de/serialize {@link Object objects} as {@literal JSON}.
@@ -332,15 +342,19 @@ public GenericJackson2JsonRedisSerializer configure(Consumer<ObjectMapper> objec
 		return this;
 	}
 
-	protected JavaType resolveType(byte[] source, Class<?> type) throws IOException {
+	protected TypeTuple resolveType(byte[] source, Class<?> type) throws IOException {
 
 		if (!type.equals(Object.class) || !defaultTypingEnabled.get()) {
-			return typeResolver.constructType(type);
+			return new TypeTuple(typeResolver.constructType(type), null);
 		}
 
 		return typeResolver.resolveType(source, type);
 	}
 
+	protected record TypeTuple(JavaType type, @Nullable JsonNode node) {
+
+	}
+
 	/**
 	 * @since 3.0
 	 */
@@ -361,16 +375,16 @@ protected JavaType constructType(Class<?> type) {
 			return typeFactory.get().constructType(type);
 		}
 
-		protected JavaType resolveType(byte[] source, Class<?> type) throws IOException {
+		protected TypeTuple resolveType(byte[] source, Class<?> type) throws IOException {
 
 			JsonNode root = readTree(source);
 			JsonNode jsonNode = root.get(hintName.get());
 
 			if (jsonNode instanceof TextNode && jsonNode.asText() != null) {
-				return typeFactory.get().constructFromCanonical(jsonNode.asText());
+				return new TypeTuple(typeFactory.get().constructFromCanonical(jsonNode.asText()), root);
 			}
 
-			return constructType(type);
+			return new TypeTuple(constructType(type), root);
 		}
 
 		/**

src/main/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializer.java

@@ -166,7 +166,7 @@ public T deserialize(@Nullable byte[] bytes) throws SerializationException {
 			return null;
 		}
 		try {
-			return (T) this.reader.read(this.mapper, bytes, javaType);
+			return (T) this.reader.read(this.mapper, this.mapper.createParser(bytes), javaType);
 		} catch (Exception ex) {
 			throw new SerializationException("Could not read JSON: " + ex.getMessage(), ex);
 		}

src/main/java/org/springframework/data/redis/serializer/JacksonObjectReader.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -43,15 +44,28 @@ public interface JacksonObjectReader {
 	 * @return the deserialized Java object.
 	 * @throws IOException if an I/O error or JSON deserialization error occurs.
 	 */
-	Object read(ObjectMapper mapper, byte[] source, JavaType type) throws IOException;
+	default Object read(ObjectMapper mapper, byte[] source, JavaType type) throws IOException {
+		return read(mapper, mapper.createParser(source), type);
+	}
+
+	/**
+	 * Read an object graph from the given root JSON into a Java object considering the {@link JavaType}.
+	 *
+	 * @param mapper the object mapper to use.
+	 * @param parser the JSON parser to use.
+	 * @param type the Java target type
+	 * @return the deserialized Java object.
+	 * @throws IOException if an I/O error or JSON deserialization error occurs.
+	 */
+	Object read(ObjectMapper mapper, JsonParser parser, JavaType type) throws IOException;
 
 	/**
 	 * Create a default {@link JacksonObjectReader} delegating to {@link ObjectMapper#readValue(InputStream, JavaType)}.
 	 *
 	 * @return the default {@link JacksonObjectReader}.
 	 */
 	static JacksonObjectReader create() {
-		return (mapper, source, type) -> mapper.readValue(source, 0, source.length, type);
+		return ObjectMapper::readValue;
 	}
 
 }