diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java index a84f83147..2e95174ab 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java @@ -78,7 +78,10 @@ public class DetachedEntityState implements EntityState { @Override public Object getValue(Neo4jPersistentProperty property, MappingPolicy mappingPolicy) { - mappingPolicy = mappingPolicy == null ? property.getMappingPolicy() : mappingPolicy; + if (mappingPolicy == null) { + if (property!=null) mappingPolicy = property.getMappingPolicy(); + else mappingPolicy = MappingPolicy.MAP_FIELD_DIRECT_POLICY; + } if (isDetached()) { if (template.getPersistentState(getEntity())==null || isDirty(property)) { if (log.isDebugEnabled()) log.debug("Outside of transaction, GET value from field " + property); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TransientFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TransientFieldAccessorFactory.java index 392a2547f..39571fe4c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TransientFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TransientFieldAccessorFactory.java @@ -22,7 +22,7 @@ import org.springframework.data.neo4j.mapping.Neo4jPersistentProperty; public class TransientFieldAccessorFactory implements FieldAccessorFactory { @Override public boolean accept(final Neo4jPersistentProperty property) { - return property.isReallyTransient(); + return property.isTransient(); } @Override diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java index a9af0667a..322329e2e 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java @@ -84,8 +84,6 @@ public interface Neo4jPersistentProperty extends PersistentProperty T getDefaultValue(ConversionService conversionService, final Class targetType); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java index 554d1698c..82323f609 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java @@ -348,12 +348,8 @@ class Neo4jPersistentPropertyImpl extends AnnotationBasedPersistentProperty> getPersistentEntityType() { final Iterable> result = super.getPersistentEntityType();