Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAGRAPH-356 Handle transient fields consistently with Spring Data & SD Rest

Browse Source
This commit is contained in:
Michael Hunger
2013-06-03 01:31:13 +02:00
parent b765195062
commit 2d2ba2334f
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java
View File

@@ -78,7 +78,10 @@ public class DetachedEntityState<STATE> implements EntityState<STATE> {
@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);

2
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TransientFieldAccessorFactory.java
View File

@@ -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

2
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java
View File

@@ -84,8 +84,6 @@ public interface Neo4jPersistentProperty extends PersistentProperty<Neo4jPersist
MappingPolicy getMappingPolicy();
boolean isReallyTransient();
Object getValueFromEntity(Object entity, MappingPolicy mappingPolicy);
<T> T getDefaultValue(ConversionService conversionService, final Class<T> targetType);

13
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/mapping/Neo4JPersistentPropertyImpl.java
View File

@@ -348,12 +348,8 @@ class Neo4jPersistentPropertyImpl extends AnnotationBasedPersistentProperty<Neo4
return MappingPolicy.DEFAULT_POLICY;
}
/**
* @deprecated todo remove when SD-Commons handles transient properties differently
*/
@Deprecated
public boolean isReallyTransient() {
return Modifier.isTransient(field.getModifiers()) || isAnnotationPresent(Transient.class) || isAnnotationPresent("javax.persistence.Transient");
public boolean isTransient() {
return super.isTransient() || Modifier.isTransient(field.getModifiers()); // || isAnnotationPresent(Transient.class) || isAnnotationPresent("javax.persistence.Transient");
}
private boolean isAnnotationPresent(String className) {
@@ -363,11 +359,6 @@ class Neo4jPersistentPropertyImpl extends AnnotationBasedPersistentProperty<Neo4
return false;
}
@Override
public boolean isTransient() {
return false;
}
@Override
public Iterable<? extends TypeInformation<?>> getPersistentEntityType() {
final Iterable<? extends TypeInformation<?>> result = super.getPersistentEntityType();