hjikp p

Author: christophstrobl

src/main/java/org/springframework/data/redis/hash/Jackson3HashMapper.java

@@ -160,6 +160,7 @@ public class Jackson3HashMapper implements HashMapper<Object, String, Object> {
 			Jackson3HashMapper.class.getClassLoader());
 
 	private final ObjectMapper typingMapper;
+	private final ObjectMapper untypedMapper;
 	private final boolean flatten;
 
 	public Jackson3HashMapper(
@@ -178,6 +179,7 @@ public static void preconfigure(MapperBuilder<? extends ObjectMapper, ? extends
 						.allowIfSubType((ctx, clazz) -> true).build(), DefaultTyping.NON_FINAL_AND_ENUMS, "@class")
 				.configure(DeserializationFeature.FAIL_ON_MISSING_EXTERNAL_TYPE_ID_PROPERTY, false)
 				.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+			//.configure(DeserializationFeature., false)
 				.changeDefaultPropertyInclusion(value -> value.withValueInclusion(Include.NON_NULL));
 	}
 
@@ -195,14 +197,15 @@ public Jackson3HashMapper(ObjectMapper mapper, boolean flatten) {
 
 		this.flatten = flatten;
 		this.typingMapper = mapper;
+		this.untypedMapper = mapper.rebuild().deactivateDefaultTyping().build();
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public Map<String, Object> toHash(Object source) {
 
 		JsonNode tree = this.typingMapper.valueToTree(source);
-		return this.flatten ? flattenMap(tree.properties()) : JsonMapper.shared().convertValue(tree, Map.class);
+		return this.flatten ? flattenMap(tree.properties()) : this.untypedMapper.convertValue(tree, Map.class);
 	}
 
 	@Override
@@ -213,13 +216,14 @@ public Object fromHash(Map<String, Object> hash) {
 			if (this.flatten) {
 
 				Map<String, Object> unflattenedHash = doUnflatten(hash);
-				byte[] unflattenedHashedBytes = JsonMapper.shared().writeValueAsBytes(unflattenedHash);
+				System.out.println("unflat: " + unflattenedHash);
+				byte[] unflattenedHashedBytes = this.untypedMapper.writeValueAsBytes(unflattenedHash);
 				Object hashedObject = this.typingMapper.reader().forType(Object.class).readValue(unflattenedHashedBytes);
 
 				return hashedObject;
 			}
 
-			return this.typingMapper.treeToValue(JsonMapper.shared().valueToTree(hash), Object.class);
+			return this.typingMapper.treeToValue(this.untypedMapper.valueToTree(hash), Object.class);
 
 		} catch (Exception ex) {
 			throw new MappingException(ex.getMessage(), ex);

src/test/java/org/springframework/data/redis/mapping/AbstractHashMapperTests.java

@@ -39,6 +39,7 @@ protected void assertBackAndForwardMapping(Object o) {
 
 		HashMapper mapper = mapperFor(o.getClass());
 		Map hash = mapper.toHash(o);
+		System.out.println("hash: " + hash);
 		assertThat(mapper.fromHash(hash)).isEqualTo(o);
 	}
 

src/test/java/org/springframework/data/redis/mapping/Jackson3HashMapperFlatteningUnitTests.java

@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.data.redis.hash.Jackson2HashMapper;
 import org.springframework.data.redis.hash.Jackson3HashMapper;
 
 /**
@@ -33,7 +32,7 @@
 public class Jackson3HashMapperFlatteningUnitTests extends Jackson3HashMapperUnitTests {
 
 	Jackson3HashMapperFlatteningUnitTests() {
-		super(new Jackson3HashMapper(Jackson3HashMapper::preconfigure, true), new Jackson2HashMapper(true));
+		super(new Jackson3HashMapper(Jackson3HashMapper::preconfigure,true));
 	}
 
 	@Test // GH-2593

src/test/java/org/springframework/data/redis/mapping/Jackson3HashMapperNonFlatteningUnitTests.java

@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.data.redis.hash.Jackson2HashMapper;
 import org.springframework.data.redis.hash.Jackson3HashMapper;
 
 /**
@@ -33,7 +32,7 @@
 public class Jackson3HashMapperNonFlatteningUnitTests extends Jackson3HashMapperUnitTests {
 
 	Jackson3HashMapperNonFlatteningUnitTests() {
-		super(new Jackson3HashMapper(Jackson3HashMapper::preconfigure, false),  new Jackson2HashMapper(false));
+		super(new Jackson3HashMapper(Jackson3HashMapper::preconfigure, false));
 	}
 
 	@Test // GH-2593

src/test/java/org/springframework/data/redis/mapping/Jackson3HashMapperUnitTests.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.redis.mapping;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDate;
@@ -48,12 +46,10 @@
 public abstract class Jackson3HashMapperUnitTests extends AbstractHashMapperTests {
 
 	private final Jackson3HashMapper mapper;
-	private final Jackson2HashMapper legacyMapper;
 
-	public Jackson3HashMapperUnitTests(Jackson3HashMapper mapper, Jackson2HashMapper legacyMapper) {
+	public Jackson3HashMapperUnitTests(Jackson3HashMapper mapper) {
 
 		this.mapper = mapper;
-		this.legacyMapper = legacyMapper;
 	}
 
 	protected Jackson3HashMapper getMapper() {
@@ -66,21 +62,6 @@ protected <T> HashMapper mapperFor(Class<T> t) {
 		return getMapper();
 	}
 
-	protected void assertBackAndForwardMapping(Object o) {
-
-		super.assertBackAndForwardMapping(o);
-		assertLegacyMapperCompatibility(o);
-	}
-
-	protected void assertLegacyMapperCompatibility(Object o) {
-
-		Map hash1 = legacyMapper.toHash(o);
-		assertThat(mapper.fromHash(hash1)).isEqualTo(o);
-
-		Map hash2 = mapper.toHash(o);
-		assertThat(legacyMapper.fromHash(hash2)).isEqualTo(o);
-	}
-
 	@Test // DATAREDIS-423
 	void shouldMapTypedListOfSimpleType() {