From 769bb8c4da2ff84a9052923f71cd34a56438be96 Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Tue, 12 Apr 2011 16:35:20 +0200 Subject: [PATCH] cyclic dependencies and remove dependency on DirectGraphRepositoryFactory in TraversalFieldAccessor --- .../data/graph/neo4j/config/Neo4jConfiguration.java | 1 - .../data/graph/neo4j/support/node/Neo4jNodeBacking.aj | 3 ++- .../graph/neo4j/support/path/ConvertingEntityPath.java | 1 - .../{relationship => path}/DefaultRelationshipBacked.java | 2 +- .../graph/neo4j/support/{ => path}/EntityEvaluator.java | 3 ++- .../{node => path}/EntityPathPathIterableWrapper.java | 3 +-- .../relationship/RelationshipEntityStateFactory.java | 8 +------- .../partial/Neo4jGraphRecommendationTest-context.xml | 1 - .../neo4j/support/Neo4jGraphPersistenceTest-context.xml | 1 - 9 files changed, 7 insertions(+), 16 deletions(-) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{relationship => path}/DefaultRelationshipBacked.java (93%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{ => path}/EntityEvaluator.java (90%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{node => path}/EntityPathPathIterableWrapper.java (91%) diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java index ed1cacf4c..421b1a59a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java @@ -148,7 +148,6 @@ public class Neo4jConfiguration { public RelationshipEntityStateFactory relationshipEntityStateFactory() throws Exception { RelationshipEntityStateFactory entityStateFactory = new RelationshipEntityStateFactory(); entityStateFactory.setGraphDatabaseContext(graphDatabaseContext()); - entityStateFactory.setGraphRepositoryFactory(directGraphRepositoryFactory()); return entityStateFactory; } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jNodeBacking.aj b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jNodeBacking.aj index a1b73b764..13835707b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jNodeBacking.aj +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jNodeBacking.aj @@ -25,7 +25,6 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.graphdb.traversal.Traverser; -import org.springframework.data.graph.core.GraphBacked; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.core.RelationshipBacked; import org.springframework.data.graph.neo4j.support.DoReturn; @@ -37,6 +36,8 @@ import org.springframework.data.graph.annotation.*; import javax.persistence.Transient; import javax.persistence.Entity; +import org.springframework.data.graph.neo4j.support.path.EntityPathPathIterableWrapper; + import java.lang.reflect.Field; import static org.springframework.data.graph.neo4j.support.DoReturn.unwrap; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/ConvertingEntityPath.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/ConvertingEntityPath.java index 0fe8c0ad2..bb560a131 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/ConvertingEntityPath.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/ConvertingEntityPath.java @@ -26,7 +26,6 @@ import org.springframework.data.graph.core.GraphBacked; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.core.RelationshipBacked; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.relationship.DefaultRelationshipBacked; import java.util.Iterator; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/DefaultRelationshipBacked.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/DefaultRelationshipBacked.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/DefaultRelationshipBacked.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/DefaultRelationshipBacked.java index 57a4a1c59..56011f8be 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/DefaultRelationshipBacked.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/DefaultRelationshipBacked.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.relationship; +package org.springframework.data.graph.neo4j.support.path; import org.springframework.data.graph.annotation.EndNode; import org.springframework.data.graph.annotation.RelationshipEntity; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/EntityEvaluator.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityEvaluator.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/EntityEvaluator.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityEvaluator.java index 35b128f5d..3267c0007 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/EntityEvaluator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityEvaluator.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support.path; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.traversal.Evaluation; import org.neo4j.graphdb.traversal.Evaluator; import org.springframework.data.graph.core.NodeBacked; +import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.data.graph.neo4j.support.path.ConvertingEntityPath; /** diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/EntityPathPathIterableWrapper.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityPathPathIterableWrapper.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/EntityPathPathIterableWrapper.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityPathPathIterableWrapper.java index b7e9585d3..57d5d72fa 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/EntityPathPathIterableWrapper.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityPathPathIterableWrapper.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.node; +package org.springframework.data.graph.neo4j.support.path; import org.neo4j.graphdb.Path; import org.neo4j.helpers.collection.IterableWrapper; import org.springframework.data.graph.core.EntityPath; import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.path.ConvertingEntityPath; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; /** diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java index 2c7b9549d..e7d6666f0 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java @@ -17,9 +17,8 @@ package org.springframework.data.graph.neo4j.support.relationship; import org.neo4j.graphdb.Relationship; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.graph.core.EntityState; +import org.springframework.data.graph.core.RelationshipBacked; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import javax.annotation.PostConstruct; @@ -28,7 +27,6 @@ public class RelationshipEntityStateFactory { private GraphDatabaseContext graphDatabaseContext; - private DirectGraphRepositoryFactory graphRepositoryFactory; private RelationshipEntityState.RelationshipStateDelegatingFieldAccessorFactory delegatingFieldAccessorFactory; public EntityState getEntityState(final RelationshipBacked entity) { @@ -39,10 +37,6 @@ public class RelationshipEntityStateFactory { this.graphDatabaseContext = graphDatabaseContext; } - public void setGraphRepositoryFactory(DirectGraphRepositoryFactory graphRepositoryFactory) { - this.graphRepositoryFactory = graphRepositoryFactory; - } - @PostConstruct private void setUp() { this.delegatingFieldAccessorFactory = new RelationshipEntityState.RelationshipStateDelegatingFieldAccessorFactory(graphDatabaseContext); diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml index 3eab00d26..f8e214502 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml @@ -124,7 +124,6 @@ - diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml index aee08ad07..d2e588f98 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml @@ -120,7 +120,6 @@ -