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

relationships via relateTo are now restricted to one per type,direction and target

Browse Source
This commit is contained in:
Michael Hunger
2011-03-07 12:56:29 +01:00
parent 6659760201
commit 5d5f5dd2fe
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java
View File

@@ -105,7 +105,8 @@ public abstract class AbstractNodeRelationshipFieldAccessor<ENTITY extends Graph
protected void createSingleRelationship(STATE start, TSTATE end) {
if (end==null) return;
switch(direction) {
case OUTGOING : {
case OUTGOING :
case BOTH : { // TODO both should actually check in both directions, perhaps have the obtain method get the direction instead and figure out what to do itself
obtainSingleRelationship(start, end);
break;
}

25
spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jNodeBacking.aj
View File

@@ -20,10 +20,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.reflect.FieldSignature;
import org.neo4j.graphdb.DynamicRelationshipType;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Relationship;
import org.neo4j.graphdb.RelationshipType;
import org.neo4j.graphdb.*;
import org.neo4j.graphdb.traversal.TraversalDescription;
import org.neo4j.graphdb.traversal.Traverser;
import org.springframework.beans.factory.annotation.Configurable;
@@ -33,6 +30,8 @@ import org.springframework.data.graph.core.RelationshipBacked;
import org.springframework.data.graph.neo4j.fieldaccess.*;
import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
import org.springframework.data.graph.annotation.*;
import javax.management.relation.Relation;
import java.lang.reflect.Field;
import static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.unwrap;
@@ -145,9 +144,22 @@ public aspect Neo4jNodeBacking { // extends AbstractTypeAnnotatingMixinFields<No
* @return the newly created relationship to the target node
*/
public Relationship NodeBacked.relateTo(NodeBacked target, RelationshipType type) {
return this.getPersistentState().createRelationshipTo(target.getPersistentState(), type);
Relationship relationship=getRelationshipTo(target,type);
if (relationship!=null) return relationship;
return this.getPersistentState().createRelationshipTo(target.getPersistentState(), type);
}
public Relationship NodeBacked.getRelationshipTo(NodeBacked target, RelationshipType type) {
Node node = this.getPersistentState();
Node targetNode = target.getPersistentState();
if (node==null || targetNode==null) return null;
Iterable<Relationship> relationships = node.getRelationships(type, org.neo4j.graphdb.Direction.OUTGOING);
for (Relationship relationship : relationships) {
if (relationship.getOtherNode(node).equals(targetNode)) return relationship;
}
return null;
}
/**
* @return node id or null if there is no underlying state
*/
@@ -184,7 +196,8 @@ public aspect Neo4jNodeBacking { // extends AbstractTypeAnnotatingMixinFields<No
* @return relationship entity, instance of the provided relationshipClass
*/
public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N target, Class<R> relationshipClass, String relationshipType) {
Relationship rel = this.getPersistentState().createRelationshipTo( target.getPersistentState(), DynamicRelationshipType.withName(relationshipType));
DynamicRelationshipType type = DynamicRelationshipType.withName(relationshipType);
Relationship rel = this.relateTo(target,type);
return (R)Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipClass);
}

12
spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/RelationshipEntityTest.java
View File

@@ -6,6 +6,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.neo4j.graphdb.*;
import org.neo4j.helpers.collection.IteratorUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.graph.neo4j.Friendship;
import org.springframework.data.graph.neo4j.Person;
@@ -49,6 +50,17 @@ public class RelationshipEntityTest {
assertEquals(p2.getPersistentState(), rel.getEndNode());
}
@Test
@Transactional
public void shouldNotCreateSameRelationshipTwice() {
Person p = persistedPerson("Michael", 35);
Person p2 = persistedPerson("David", 25);
Friendship f = p.knows(p2);
Friendship f2 = p.knows(p2);
assertEquals(f, f2);
assertEquals(1, IteratorUtil.count(p.getFriendships()));
}
@Test
@Transactional
public void testRelationshipSetProperty() {