Fix PersistentEntity lookup in AbstractMappingContext.hasPersistentEntity(…)

Looking up a PersistentEntity via ….getPersistentEntity(…) applies some massaging of the given type as it could be a proxy type created for a user type. That wrangling was not applied in ….hasPersistentEntity(…) which resulted in a call to that method with a proxy type yielding false although it shouldn't if we already have a PersistentEntity available for the corresponding user type.

We now explicitly lookup the entity by original type and, if it's not the user type itself, try to look up the entity for the latter.

Fixes #2589.

Author: odrotbohm

src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java

@@ -218,9 +218,34 @@ public boolean hasPersistentEntityFor(Class<?> type) {
 
 		Assert.notNull(type, "Type must not be null!");
 
-		Optional<E> entity = persistentEntities.get(ClassTypeInformation.from(type));
+		TypeInformation<?> typeInformation = ClassTypeInformation.from(type);
 
-		return entity == null ? false : entity.isPresent();
+		try {
+
+			read.lock();
+
+			// Try the original type first
+			Optional<E> entity = persistentEntities.get(typeInformation);
+
+			if (entity != null) {
+				return entity.isPresent();
+			}
+
+			// User type is the same?
+			TypeInformation<?> userTypeInformation = typeInformation.getUserTypeInformation();
+
+			if (userTypeInformation.equals(typeInformation)) {
+				return false;
+			}
+
+			// Try the user type
+			entity = persistentEntities.get(typeInformation.getUserTypeInformation());
+
+			return entity == null ? false : entity.isPresent();
+
+		} finally {
+			read.unlock();
+		}
 	}
 
 	/*
@@ -760,7 +785,8 @@ static class PropertyMatch {
 			 */
 			public PropertyMatch(@Nullable String namePattern, @Nullable String typeName) {
 
-				Assert.isTrue(!(namePattern == null && typeName == null), "Either name pattern or type name must be given!");
+				Assert.isTrue(!((namePattern == null) && (typeName == null)),
+						"Either name pattern or type name must be given!");
 
 				this.namePattern = namePattern;
 				this.typeName = typeName;
@@ -778,11 +804,11 @@ public boolean matches(String name, Class<?> type) {
 				Assert.notNull(name, "Name must not be null!");
 				Assert.notNull(type, "Type must not be null!");
 
-				if (namePattern != null && !name.matches(namePattern)) {
+				if ((namePattern != null) && !name.matches(namePattern)) {
 					return false;
 				}
 
-				if (typeName != null && !type.getName().equals(typeName)) {
+				if ((typeName != null) && !type.getName().equals(typeName)) {
 					return false;
 				}
 

src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java

@@ -334,7 +334,7 @@ void contextSeesUserTypeBeforeProxy() {
 		persistentEntity.getTypeInformation().getType().equals(Base.class);
 
 		assertThat(context.hasPersistentEntityFor(Base.class)).isTrue();
-		assertThat(context.hasPersistentEntityFor(Base$$SpringProxy$873fa2e.class)).isFalse();
+		assertThat(context.hasPersistentEntityFor(Base$$SpringProxy$873fa2e.class)).isTrue();
 
 		BasicPersistentEntity<Object, SamplePersistentProperty> persistentEntityForProxy = context
 				.getRequiredPersistentEntity(Base$$SpringProxy$873fa2e.class);