DATACMNS-1101 - Use dedicated type to cache custom conversion targets without requested target type.

We now use a marker interface to store cache hits for conversion targets without requesting a conversion target in the conversion query. The dedicated marker type has an individual cache view and does not interfere with other types.

Previously we used Object as cache key which caused false positives due to assignability checks. If an earlier conversion query with a requested target type yielded a hit (e.g. negative hit), subsequent queries without a target type received the same answer. This might happen although the non-cached answer would return a different result.

Author: mp911de

src/main/java/org/springframework/data/convert/CustomConversions.java

@@ -372,7 +372,7 @@ static class ConversionTargetsCache {
 		 */
 		public Optional<Class<?>> computeIfAbsent(Class<?> sourceType,
 				Function<ConvertiblePair, Optional<Class<?>>> mappingFunction) {
-			return computeIfAbsent(sourceType, Object.class, mappingFunction);
+			return computeIfAbsent(sourceType, AbsentTargetTypeMarker.class, mappingFunction);
 		}
 
 		/**
@@ -391,6 +391,11 @@ public Optional<Class<?>> computeIfAbsent(Class<?> sourceType, Class<?> targetTy
 			TargetTypes targetTypes = customReadTargetTypes.computeIfAbsent(sourceType, TargetTypes::new);
 			return targetTypes.computeIfAbsent(targetType, mappingFunction);
 		}
+
+		/**
+		 * Marker type for absent target type caching.
+		 */
+		interface AbsentTargetTypeMarker {}
 	}
 
 	/**

src/test/java/org/springframework/data/convert/CustomConversionsUnitTests.java

@@ -44,6 +44,7 @@
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 2.0
  */
 public class CustomConversionsUnitTests {
@@ -71,6 +72,17 @@ public void considersSubtypesCorrectly() {
 		assertThat(conversions.hasCustomReadTarget(String.class, Long.class)).isTrue();
 	}
 
+	@Test // DATACMNS-1101
+	public void considersSubtypeCachingCorrectly() {
+
+		CustomConversions conversions = new CustomConversions(StoreConversions.NONE,
+				Arrays.asList(NumberToStringConverter.INSTANCE, StringToNumberConverter.INSTANCE));
+
+		assertThat(conversions.getCustomWriteTarget(Long.class, Object.class)).isEmpty();
+		assertThat(conversions.getCustomWriteTarget(Long.class)).hasValue(String.class);
+		assertThat(conversions.getCustomWriteTarget(Long.class, Object.class)).isEmpty();
+	}
+
 	@Test // DATACMNS-1035
 	public void populatesConversionServiceCorrectly() {