From 769e89251ac0554e800dfd9e86488e1efe8454fb Mon Sep 17 00:00:00 2001
From: Michael Hunger <github@jexp.de>
Date: Fri, 13 Aug 2010 01:42:09 +0200
Subject: [PATCH] added managedset for operations on 1:n

---
 .../graph/neo4j/Neo4jNodeBacking.aj           | 41 +++++++++++++++++--
 .../persistence/test/Person.java              |  5 ++-
 .../test/graph/Neo4jGraphPersistenceTest.java | 14 +++++++
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj b/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
index 1a6ea1f93..b0573853b 100644
--- a/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
+++ b/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
@@ -1,8 +1,10 @@
 package org.springframework.persistence.graph.neo4j;
 
 import java.lang.reflect.Field;
+import java.util.AbstractSet;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -142,7 +144,7 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
 				String propName = getNeo4jPropertyName(f);
 				entity.getUnderlyingNode().setProperty(propName, newVal);
 				log.info("SET " + f + " -> Neo4J simple node property [" + propName + "] with value=[" + newVal + "]");
-				return null;
+				return proceed(entity, newVal);
 			}
 			
 			RelationshipInfo relInfo = relationshipInfoFactory.forField(f);
@@ -267,6 +269,37 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
 	
 	public static class OneToNRelationshipInfo implements RelationshipInfo {
 
+		private static final class ManagedSet extends AbstractSet<NodeBacked> {
+			private final NodeBacked entity;
+			final Set<NodeBacked> delegate;
+			private final RelationshipInfo relationshipInfo;
+
+			private ManagedSet(NodeBacked entity, Object newVal, RelationshipInfo relationshipInfo) {
+				this.entity = entity;
+				this.relationshipInfo = relationshipInfo;
+				delegate = (Set<NodeBacked>) newVal;
+			}
+
+			@Override
+			public Iterator<NodeBacked> iterator() {
+				return delegate.iterator();
+			}
+
+			@Override
+			public int size() {
+				return delegate.size();
+			}
+
+			@Override
+			public boolean add(NodeBacked e) {
+				boolean res=delegate.add(e);
+				if (res) {
+					relationshipInfo.apply(entity, delegate);
+				}
+				return res;
+			}
+		}
+
 		private final RelationshipType type;
 		private final Direction direction;
 		private final Class<? extends NodeBacked> relatedType;
@@ -279,7 +312,7 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
 			this.graphEntityInstantiator = graphEntityInstantiator;
 		}
 
-		public Object apply(NodeBacked entity, Object newVal) {
+		public Object apply(final NodeBacked entity, final Object newVal) {
 			Node entityNode = entity.getUnderlyingNode();
 			
 			Set<Node> newNodes=new HashSet<Node>();
@@ -314,7 +347,7 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
 					default : throw new IllegalArgumentException("invalid direction " + direction); 
 				}
 			}
-			return newVal; // TODO managedSet that for each mutating method calls this apply (todo use AspectJ to handle that?)
+			return new ManagedSet(entity, newVal,this); // TODO managedSet that for each mutating method calls this apply (todo use AspectJ to handle that?)
 		}
 		
 		@Override
@@ -328,7 +361,7 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEn
 				NodeBacked newEntity=graphEntityInstantiator.createEntityFromState(rel.getOtherNode(entityNode), relatedType);;
 				result.add(newEntity);
 			}
-			return result; 
+			return new ManagedSet(entity, result,this); 
 		}
 		
 	}
diff --git a/src/test/java/org/springframework/persistence/test/Person.java b/src/test/java/org/springframework/persistence/test/Person.java
index 06eb3bd05..064b0fbc4 100644
--- a/src/test/java/org/springframework/persistence/test/Person.java
+++ b/src/test/java/org/springframework/persistence/test/Person.java
@@ -93,5 +93,8 @@ public class Person {
 	public void setFriend(Person friend) {
 		this.friend = friend;
 	}
-	
+	@Override
+	public String toString() {
+		return name;
+	}
 }
diff --git a/src/test/java/org/springframework/persistence/test/graph/Neo4jGraphPersistenceTest.java b/src/test/java/org/springframework/persistence/test/graph/Neo4jGraphPersistenceTest.java
index 2697e9000..4d3178ab3 100644
--- a/src/test/java/org/springframework/persistence/test/graph/Neo4jGraphPersistenceTest.java
+++ b/src/test/java/org/springframework/persistence/test/graph/Neo4jGraphPersistenceTest.java
@@ -205,6 +205,20 @@ public class Neo4jGraphPersistenceTest {
 		Assert.assertTrue(Set.class.isAssignableFrom(personsFromGet.getClass()));
 	}
 
+	@Test
+	@Transactional
+	public void testAddToOneToManyRelationship() {
+		Person michael = new Person("Michael", 35);
+		Person david = new Person("David", 25);
+		Group group = new Group();
+		group.setPersons(new HashSet<Person>());
+		group.addPerson(michael);
+		group.addPerson(david);
+		Collection<Person> personsFromGet = group.getPersons();
+		Assert.assertEquals(new HashSet<Person>(Arrays.asList(david,michael)), personsFromGet);
+		Assert.assertTrue(Set.class.isAssignableFrom(personsFromGet.getClass()));
+	}
+
 	@Test
 	@Transactional
 	public void testInstantiatedFinder() {