minor code change

Author: gavinking

hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java

@@ -4,14 +4,10 @@
  */
 package org.hibernate.metamodel.internal;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiFunction;
-
+import jakarta.persistence.metamodel.Attribute;
+import jakarta.persistence.metamodel.IdentifiableType;
+import jakarta.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.metamodel.Type;
 import org.hibernate.AssertionFailure;
 import org.hibernate.Internal;
 import org.hibernate.MappingException;
@@ -50,10 +46,13 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import jakarta.persistence.metamodel.Attribute;
-import jakarta.persistence.metamodel.IdentifiableType;
-import jakarta.persistence.metamodel.SingularAttribute;
-import jakarta.persistence.metamodel.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiFunction;
 
 import static java.util.Collections.unmodifiableMap;
 import static org.hibernate.metamodel.internal.InjectionHelper.injectField;
@@ -809,10 +808,8 @@ public void popEntityWorkedOn(PersistentClass persistentClass) {
 				stackOfPersistentClassesBeingProcessed.size() - 1
 		);
 		if ( stackTop != persistentClass ) {
-			throw new AssertionFailure(
-					"Inconsistent popping: "
-							+ persistentClass.getEntityName() + " instead of " + stackTop.getEntityName()
-			);
+			throw new AssertionFailure( "Inconsistent popping: "
+					+ persistentClass.getEntityName() + " instead of " + stackTop.getEntityName() );
 		}
 	}
 
@@ -833,20 +830,25 @@ public Set<MappedSuperclass> getUnusedMappedSuperclasses() {
 	private final Map<Class<?>,BasicDomainType<?>> basicDomainTypeMap = new HashMap<>();
 
 	public <J> BasicDomainType<J> resolveBasicType(Class<J> javaType) {
-		//noinspection unchecked
-		return (BasicDomainType<J>) basicDomainTypeMap.computeIfAbsent(
-				javaType,
-				jt -> {
-					// we cannot use getTypeConfiguration().standardBasicTypeForJavaType(javaType)
-					// because that doesn't return the right thing for primitive types
-					final JavaTypeRegistry registry = getTypeConfiguration().getJavaTypeRegistry();
-					JavaType<J> javaTypeDescriptor = registry.resolveDescriptor( javaType );
-					JdbcType jdbcType = javaTypeDescriptor.getRecommendedJdbcType( typeConfiguration.getCurrentBaseSqlTypeIndicators() );
-					return javaType.isPrimitive()
-							? new PrimitiveBasicTypeImpl<>( javaTypeDescriptor, jdbcType , javaType )
+		@SuppressWarnings("unchecked")
+		final BasicDomainType<J> domainType = (BasicDomainType<J>) basicDomainTypeMap.get( javaType );
+		if ( domainType == null ) {
+			// we cannot use getTypeConfiguration().standardBasicTypeForJavaType(javaType)
+			// because that doesn't return the right thing for primitive types
+			final JavaType<J> javaTypeDescriptor =
+					getTypeConfiguration().getJavaTypeRegistry().resolveDescriptor( javaType );
+			final JdbcType jdbcType =
+					javaTypeDescriptor.getRecommendedJdbcType( typeConfiguration.getCurrentBaseSqlTypeIndicators() );
+			final BasicDomainType<J> type =
+					javaType.isPrimitive()
+							? new PrimitiveBasicTypeImpl<>( javaTypeDescriptor, jdbcType, javaType )
 							: new BasicTypeImpl<>( javaTypeDescriptor, jdbcType );
-				}
-		);
+			basicDomainTypeMap.put( javaType, type );
+			return type;
+		}
+		else {
+			return domainType;
+		}
 	}
 
 	public <J> EmbeddableDomainType<J> locateEmbeddable(Class<J> embeddableClass, Component component) {