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

removing properties on set null, constructor

Browse Source
This commit is contained in:
Michael Hunger
2010-09-06 10:22:56 +02:00
parent c99dd661cf
commit c92390388d
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/datastore/graph/neo4j/spi/node/Neo4jNodeBacking.aj
View File

@@ -1,6 +1,8 @@
package org.springframework.datastore.graph.neo4j.spi.node;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
import java.util.*;
@@ -159,13 +161,19 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
private static RelationshipBacked createRelationshipEntity(Class<? extends RelationshipBacked> relationshipType, Relationship rel) {
try {
final RelationshipBacked relationshipEntity = relationshipType.newInstance();
final Constructor<? extends RelationshipBacked> constructor = relationshipType.getDeclaredConstructor();
constructor.setAccessible(true);
final RelationshipBacked relationshipEntity = constructor.newInstance();
relationshipEntity.setUnderlyingRelationship(rel);
return relationshipEntity;
} catch (InstantiationException e) {
throw new RuntimeException(e);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
} catch (NoSuchMethodException e) {
throw new RuntimeException(e);
} catch (InvocationTargetException e) {
throw new RuntimeException(e.getTargetException());
}
}

7
src/main/java/org/springframework/datastore/graph/neo4j/spi/relationship/Neo4jRelationshipBacking.aj
View File

@@ -121,7 +121,12 @@ public aspect Neo4jRelationshipBacking extends AbstractTypeAnnotatingMixinFields
throw new InvalidDataAccessApiUsageException("Please set start node and end node before assigning to other fields.");
}
String propName = FieldAccessorFactory.getNeo4jPropertyName(f);
entity.getUnderlyingRelationship().setProperty(propName, newVal);
if (newVal==null) {
entity.getUnderlyingRelationship().removeProperty(propName);
}
else {
entity.getUnderlyingRelationship().setProperty(propName, newVal);
}
log.info("SET " + f + " -> Neo4J simple relationship property [" + propName + "] with value=[" + newVal + "]");
return proceed(entity, newVal);
}