From 153999d141d5ce07485ac7a2998995b84a4e850a Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Thu, 25 Jul 2013 10:34:21 +0200
Subject: [PATCH] DATAJPA-376 - PersistentProperty now considers JPA
 @Transient.

JpaPersistentPropertyImpl is now considered persistent if it carries a @javax.persistence.Transient annotation. This should allow persistence providers to safely generate additional fields and not cause trouble in the mapping framework this way.
---
 .../jpa/mapping/JpaPersistentPropertyImpl.java   | 10 ++++++++++
 .../JpaPersistentPropertyImplUnitTests.java      | 16 ++++++++++++----
 2 files changed, 22 insertions(+), 4 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 a9dc06c89..cf0864bda 100644
--- a/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
+++ b/src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java
@@ -29,6 +29,7 @@ import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
+import javax.persistence.Transient;
 import javax.persistence.metamodel.EmbeddableType;
 import javax.persistence.metamodel.ManagedType;
 import javax.persistence.metamodel.Metamodel;
@@ -132,6 +133,15 @@ class JpaPersistentPropertyImpl extends AnnotationBasedPersistentProperty<JpaPer
 		return false;
 	}
 
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#isTransient()
+	 */
+	@Override
+	public boolean isTransient() {
+		return isAnnotationPresent(Transient.class) || super.isTransient();
+	}
+
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation()
diff --git a/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java b/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java
index e9f459569..b99493ed9 100644
--- a/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java
@@ -19,6 +19,7 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import javax.persistence.OneToOne;
+import javax.persistence.Transient;
 import javax.persistence.metamodel.Metamodel;
 
 import org.junit.Before;
@@ -35,8 +36,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 @RunWith(MockitoJUnitRunner.class)
 public class JpaPersistentPropertyImplUnitTests {
 
-	@Mock
-	Metamodel model;
+	@Mock Metamodel model;
 
 	JpaMetamodelMappingContext context;
 	JpaPersistentEntity<?> entity;
@@ -58,9 +58,17 @@ public class JpaPersistentPropertyImplUnitTests {
 		assertThat(property.isAssociation(), is(true));
 	}
 
+	/**
+	 * @see DATAJPA-376
+	 */
+	@Test
+	public void considersJpaTransientFieldsAsTransient() {
+		assertThat(entity.getPersistentProperty("transientProp"), is(nullValue()));
+	}
+
 	static class Sample {
 
-		@OneToOne
-		Sample other;
+		@OneToOne Sample other;
+		@Transient String transientProp;
 	}
 }