From 8dbfb9a6ab340b74dce511f0be21a2875b664626 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 7 Mar 2024 16:07:24 +0100 Subject: [PATCH] Revert workaround for Java 8 `ConcurrentHashMap` bug. Closes #3060 --- .../springframework/data/convert/CustomConversions.java | 6 +----- .../springframework/data/convert/DefaultTypeMapper.java | 9 +-------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/springframework/data/convert/CustomConversions.java b/src/main/java/org/springframework/data/convert/CustomConversions.java index f6d7bd3dd..45d70fe81 100644 --- a/src/main/java/org/springframework/data/convert/CustomConversions.java +++ b/src/main/java/org/springframework/data/convert/CustomConversions.java @@ -536,11 +536,7 @@ public class CustomConversions { public Class computeIfAbsent(Class sourceType, Class targetType, Function> mappingFunction) { - TargetTypes targetTypes = customReadTargetTypes.get(sourceType); - - if (targetTypes == null) { - targetTypes = customReadTargetTypes.computeIfAbsent(sourceType, TargetTypes::new); - } + TargetTypes targetTypes = customReadTargetTypes.computeIfAbsent(sourceType, TargetTypes::new); return targetTypes.computeIfAbsent(targetType, mappingFunction); } diff --git a/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java b/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java index 847701e04..35dec3f55 100644 --- a/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java +++ b/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java @@ -124,14 +124,7 @@ public class DefaultTypeMapper implements TypeMapper, BeanClassLoaderAware */ @Nullable private TypeInformation getFromCacheOrCreate(Alias alias) { - - Optional> typeInformation = typeCache.get(alias); - - if (typeInformation == null) { - typeInformation = typeCache.computeIfAbsent(alias, getAlias); - } - - return typeInformation.orElse(null); + return typeCache.computeIfAbsent(alias, getAlias).orElse(null); } @Override