From 6ea82fa1c5c70339002abaf58d8818d93cd511c3 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Mon, 15 Sep 2014 14:11:12 +0200
Subject: [PATCH] DATAJPA-608 - JpaPersistentPropertyImpl.isEntity() now uses
 getActualType().

---
 .../jpa/mapping/JpaPersistentPropertyImpl.java    |  2 +-
 ...paMetamodelMappingContextIntegrationTests.java | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
index e74aca615..a21c041cb 100644
--- a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
+++ b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
@@ -115,7 +115,7 @@ class JpaPersistentPropertyImpl extends AnnotationBasedPersistentProperty<JpaPer
 	public boolean isEntity() {
 
 		try {
-			metamodel.managedType(getType());
+			metamodel.managedType(getActualType());
 			return true;
 		} catch (IllegalArgumentException o_O) {
 			return false;
diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java
index fe1a62107..14feb79b9 100644
--- a/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java
@@ -40,8 +40,7 @@ public class JpaMetamodelMappingContextIntegrationTests {
 
 	JpaMetamodelMappingContext context;
 
-	@PersistenceContext
-	EntityManager em;
+	@PersistenceContext EntityManager em;
 
 	@Before
 	public void setUp() {
@@ -84,4 +83,16 @@ public class JpaMetamodelMappingContextIntegrationTests {
 		property = entity.getPersistentProperty("lastname");
 		assertThat(property.isEntity(), is(false));
 	}
+
+	/**
+	 * @see DATAJPA-608
+	 */
+	@Test
+	public void detectsEntityPropertyForCollections() {
+
+		JpaPersistentEntityImpl<?> entity = context.getPersistentEntity(User.class);
+		assertThat(entity, is(notNullValue()));
+
+		assertThat(entity.getPersistentProperty("colleagues").isEntity(), is(true));
+	}
 }