From 9d4eab6e7781f80e465dc7d3567d1f90bea6a3c7 Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Tue, 12 Apr 2011 15:19:34 +0200 Subject: [PATCH] cyclic dependencies and remove dependency on DirectGraphRepositoryFactory in TraversalFieldAccessor --- .../support/path => core}/EntityPath.java | 2 +- .../data/graph/core/NodeBacked.java | 1 - .../neo4j/config/Neo4jConfiguration.java | 9 ++++----- .../DelegatingFieldAccessorFactory.java | 6 +----- .../NodeDelegatingFieldAccessorFactory.java | 7 +++---- .../TraversalFieldAccessorFactory.java | 20 +++---------------- .../node/EntityPathPathIterableWrapper.java | 2 +- .../neo4j/support/node/Neo4jNodeBacking.aj | 5 ++--- .../node}/NodeEntityState.java | 2 +- .../node}/NodeEntityStateFactory.java | 13 +++--------- .../node/PartialNodeEntityInstantiator.java | 1 - .../node}/PartialNodeEntityState.java | 9 ++++----- .../support/path/ConvertingEntityPath.java | 1 + .../neo4j/support/path/EntityMapper.java | 1 + .../graph/neo4j/support/path/PathMapper.java | 2 +- .../support/path/PathMappingIterator.java | 2 -- .../relationship/Neo4jRelationshipBacking.aj | 3 +-- .../RelationshipEntityState.java | 9 ++++----- .../RelationshipEntityStateFactory.java | 6 +++--- ...ndexingNodeTypeRepresentationStrategy.java | 2 +- ...elationshipTypeRepresentationStrategy.java | 2 +- .../NoopNodeTypeRepresentationStrategy.java | 2 +- ...elationshipTypeRepresentationStrategy.java | 2 +- ...ferenceNodeTypeRepresentationStrategy.java | 2 +- .../TypeRepresentationStrategyFactory.java | 3 ++- .../graph/neo4j/template/Neo4jOperations.java | 2 +- ...ingNodeTypeRepresentationStrategyTest.java | 1 + ...ionshipTypeRepresentationStrategyTest.java | 2 ++ .../NoopTypeRepresentationStrategyTest.java | 2 ++ ...nceNodeTypeRepresentationStrategyTest.java | 1 + .../graph/neo4j/support/TraversalTest.java | 2 +- .../neo4j/support/path/EntityMapperTest.java | 1 + .../neo4j/support/path/EntityPathTest.java | 1 + .../Neo4jGraphRecommendationTest-context.xml | 8 +++----- ...RepresentationStrategyOverride-context.xml | 4 ++-- .../Neo4jGraphPersistenceTest-context.xml | 8 +++----- ...RepresentationStrategyOverride-context.xml | 4 ++-- ...RepresentationStrategyOverride-context.xml | 2 +- 38 files changed, 62 insertions(+), 90 deletions(-) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/{neo4j/support/path => core}/EntityPath.java (95%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/{state => support/node}/NodeEntityState.java (98%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/{state => support/node}/NodeEntityStateFactory.java (90%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/{state => support/node}/PartialNodeEntityState.java (95%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/{state => support/relationship}/RelationshipEntityState.java (89%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/{state => support/relationship}/RelationshipEntityStateFactory.java (90%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{ => typerepresentation}/IndexingNodeTypeRepresentationStrategy.java (98%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{ => typerepresentation}/IndexingRelationshipTypeRepresentationStrategy.java (99%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{ => typerepresentation}/NoopNodeTypeRepresentationStrategy.java (96%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{ => typerepresentation}/NoopRelationshipTypeRepresentationStrategy.java (96%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{ => typerepresentation}/SubReferenceNodeTypeRepresentationStrategy.java (99%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/{ => typerepresentation}/TypeRepresentationStrategyFactory.java (97%) diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityPath.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityPath.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityPath.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityPath.java index 9696ce3cd..a0cd1c86a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityPath.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityPath.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.path; +package org.springframework.data.graph.core; import org.neo4j.graphdb.Path; import org.springframework.data.graph.core.GraphBacked; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeBacked.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeBacked.java index 50eaa7e97..ab86a1c0b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeBacked.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeBacked.java @@ -19,7 +19,6 @@ package org.springframework.data.graph.core; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; -import org.springframework.data.graph.neo4j.support.path.EntityPath; /** * Interface introduced to objects annotated with @NodeEntity by the {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} aspect. 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 612bfc62e..ed1cacf4c 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 @@ -33,10 +33,10 @@ import org.springframework.data.graph.core.RelationshipBacked; import org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean; import org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory; import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.state.NodeEntityStateFactory; -import org.springframework.data.graph.neo4j.state.RelationshipEntityStateFactory; +import org.springframework.data.graph.neo4j.support.node.NodeEntityStateFactory; +import org.springframework.data.graph.neo4j.support.relationship.RelationshipEntityStateFactory; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.TypeRepresentationStrategyFactory; +import org.springframework.data.graph.neo4j.support.typerepresentation.TypeRepresentationStrategyFactory; import org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking; import org.springframework.data.graph.neo4j.support.node.NodeEntityInstantiator; import org.springframework.data.graph.neo4j.support.node.PartialNodeEntityInstantiator; @@ -168,9 +168,8 @@ public class Neo4jConfiguration { NodeEntityStateFactory entityStateFactory = new NodeEntityStateFactory(); entityStateFactory.setGraphDatabaseContext(graphDatabaseContext); - entityStateFactory.setGraphRepositoryFactory(graphRepositoryFactory); entityStateFactory.setEntityManagerFactory(entityManagerFactory); - final NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory = new NodeDelegatingFieldAccessorFactory(graphDatabaseContext, graphRepositoryFactory); + final NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory = new NodeDelegatingFieldAccessorFactory(graphDatabaseContext); entityStateFactory.setNodeDelegatingFieldAccessorFactory(nodeDelegatingFieldAccessorFactory); return entityStateFactory; } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java index b4b009024..8b0f91afb 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java @@ -20,7 +20,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.data.graph.annotation.NodeEntity; import org.springframework.data.graph.annotation.RelationshipEntity; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.util.ReflectionUtils; @@ -34,15 +33,12 @@ public abstract class DelegatingFieldAccessorFactory implements FieldAccessor protected final GraphDatabaseContext graphDatabaseContext; - protected final DirectGraphRepositoryFactory graphRepositoryFactory; - protected abstract Collection> createListenerFactories(); protected abstract Collection> createAccessorFactories(); - public DelegatingFieldAccessorFactory(final GraphDatabaseContext graphDatabaseContext, final DirectGraphRepositoryFactory graphRepositoryFactory) { + public DelegatingFieldAccessorFactory(final GraphDatabaseContext graphDatabaseContext) { this.graphDatabaseContext = graphDatabaseContext; - this.graphRepositoryFactory = graphRepositoryFactory; this.fieldAccessorFactories.addAll(createAccessorFactories()); this.fieldAccessorListenerFactories.addAll(createListenerFactories()); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java index 8a9d79f39..5eb9fd8f0 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java @@ -17,7 +17,6 @@ package org.springframework.data.graph.neo4j.fieldaccess; import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.util.Arrays; @@ -29,8 +28,8 @@ import java.util.Collection; */ public class NodeDelegatingFieldAccessorFactory extends DelegatingFieldAccessorFactory { - public NodeDelegatingFieldAccessorFactory(GraphDatabaseContext graphDatabaseContext, DirectGraphRepositoryFactory graphRepositoryFactory) { - super(graphDatabaseContext, graphRepositoryFactory); + public NodeDelegatingFieldAccessorFactory(GraphDatabaseContext graphDatabaseContext) { + super(graphDatabaseContext); } @Override @@ -54,7 +53,7 @@ public class NodeDelegatingFieldAccessorFactory extends DelegatingFieldAccessorF new SingleRelationshipFieldAccessorFactory(graphDatabaseContext), new OneToNRelationshipFieldAccessorFactory(graphDatabaseContext), new ReadOnlyOneToNRelationshipFieldAccessorFactory(graphDatabaseContext), - new TraversalFieldAccessorFactory(graphRepositoryFactory), + new TraversalFieldAccessorFactory(), new OneToNRelationshipEntityFieldAccessorFactory(graphDatabaseContext) ); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java index 3f90a0526..4dab0f8a5 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java @@ -22,7 +22,6 @@ import org.springframework.data.graph.annotation.GraphTraversal; import org.springframework.data.graph.core.FieldTraversalDescriptionBuilder; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.repository.GraphRepository; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -30,16 +29,6 @@ import java.lang.reflect.Field; import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; public class TraversalFieldAccessorFactory implements FieldAccessorFactory { - - private DirectGraphRepositoryFactory graphRepositoryFactory; - - - public TraversalFieldAccessorFactory(DirectGraphRepositoryFactory graphRepositoryFactory) { - super(); - this.graphRepositoryFactory = graphRepositoryFactory; - } - - @Override public boolean accept(final Field f) { final GraphTraversal graphEntityTraversal = f.getAnnotation(GraphTraversal.class); @@ -51,7 +40,7 @@ public class TraversalFieldAccessorFactory implements FieldAccessorFactory forField(final Field field) { - return new TraversalFieldAccessor(field, graphRepositoryFactory); + return new TraversalFieldAccessor(field); } /** @@ -60,14 +49,12 @@ public class TraversalFieldAccessorFactory implements FieldAccessorFactory { protected final Field field; - private final DirectGraphRepositoryFactory graphRepositoryFactory; private final FieldTraversalDescriptionBuilder fieldTraversalDescriptionBuilder; private Class target; protected String[] params; - public TraversalFieldAccessor(final Field field, DirectGraphRepositoryFactory graphRepositoryFactory) { + public TraversalFieldAccessor(final Field field) { this.field = field; - this.graphRepositoryFactory = graphRepositoryFactory; final GraphTraversal graphEntityTraversal = field.getAnnotation(GraphTraversal.class); this.target = graphEntityTraversal.elementClass(); this.params = graphEntityTraversal.params(); @@ -86,9 +73,8 @@ public class TraversalFieldAccessorFactory implements FieldAccessorFactory finder = graphRepositoryFactory.createGraphRepository(target); final TraversalDescription traversalDescription = fieldTraversalDescriptionBuilder.build(nodeBacked,field,params); - return doReturn(finder.findAllByTraversal(nodeBacked, traversalDescription)); + return doReturn(nodeBacked.findAllByTraversal((Class) target, traversalDescription)); } 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/node/EntityPathPathIterableWrapper.java index 23e1ca7fc..b7e9585d3 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/node/EntityPathPathIterableWrapper.java @@ -18,9 +18,9 @@ package org.springframework.data.graph.neo4j.support.node; 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.path.EntityPath; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; /** 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 2d7675872..a1b73b764 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 @@ -28,9 +28,8 @@ 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.state.NodeEntityStateFactory; import org.springframework.data.graph.neo4j.support.DoReturn; -import org.springframework.data.graph.neo4j.support.path.EntityPath; +import org.springframework.data.graph.core.EntityPath; import org.springframework.data.graph.core.EntityState; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; @@ -45,7 +44,7 @@ import static org.springframework.data.graph.neo4j.support.DoReturn.unwrap; /** * Aspect for handling node entity creation and field access (read & write) * puts the underlying state (Node) into and delegates field access to an {@link org.springframework.data.graph.core.EntityState} instance, - * created by a configured {@link org.springframework.data.graph.neo4j.state.NodeEntityStateFactory}. + * created by a configured {@link NodeEntityStateFactory}. * * Handles constructor invocation and partial entities as well. */ diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/NodeEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/NodeEntityState.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/NodeEntityState.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/NodeEntityState.java index 24bfdd8df..fc80828a4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/NodeEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/NodeEntityState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.state; +package org.springframework.data.graph.neo4j.support.node; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotInTransactionException; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/NodeEntityStateFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/NodeEntityStateFactory.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/NodeEntityStateFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/NodeEntityStateFactory.java index ec413b02f..7f7537283 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/NodeEntityStateFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/NodeEntityStateFactory.java @@ -14,15 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.state; +package org.springframework.data.graph.neo4j.support.node; import org.neo4j.graphdb.Node; import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.graph.core.EntityState; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.neo4j.fieldaccess.DetachedEntityState; import org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.core.EntityState; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import javax.annotation.PostConstruct; @@ -33,8 +32,6 @@ public class NodeEntityStateFactory { private GraphDatabaseContext graphDatabaseContext; - private DirectGraphRepositoryFactory graphRepositoryFactory; - private EntityManagerFactory entityManagerFactory; private NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory; @@ -72,16 +69,12 @@ public class NodeEntityStateFactory { this.graphDatabaseContext = graphDatabaseContext; } - public void setGraphRepositoryFactory(DirectGraphRepositoryFactory graphRepositoryFactory) { - this.graphRepositoryFactory = graphRepositoryFactory; - } - public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) { this.entityManagerFactory = entityManagerFactory; } @PostConstruct private void setUp() { - this.delegatingFieldAccessorFactory = new PartialNodeEntityState.PartialNodeDelegatingFieldAccessorFactory(graphDatabaseContext, graphRepositoryFactory); + this.delegatingFieldAccessorFactory = new PartialNodeEntityState.PartialNodeDelegatingFieldAccessorFactory(graphDatabaseContext); } } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/PartialNodeEntityInstantiator.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/PartialNodeEntityInstantiator.java index 6127c9833..88a62918a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/PartialNodeEntityInstantiator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/PartialNodeEntityInstantiator.java @@ -18,7 +18,6 @@ package org.springframework.data.graph.neo4j.support.node; import org.neo4j.graphdb.Node; import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.state.PartialNodeEntityState; import org.springframework.orm.jpa.EntityManagerFactoryUtils; import org.springframework.data.persistence.EntityInstantiator; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/PartialNodeEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/PartialNodeEntityState.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/PartialNodeEntityState.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/PartialNodeEntityState.java index 63f3b41f7..0efd90ebb 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/PartialNodeEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/PartialNodeEntityState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.state; +package org.springframework.data.graph.neo4j.support.node; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotInTransactionException; @@ -25,7 +25,6 @@ import org.springframework.data.graph.annotation.GraphProperty; import org.springframework.data.graph.annotation.RelatedTo; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.neo4j.fieldaccess.*; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import javax.persistence.PersistenceUnitUtil; @@ -113,8 +112,8 @@ public class PartialNodeEntityState extends DefaultEn public static class PartialNodeDelegatingFieldAccessorFactory extends DelegatingFieldAccessorFactory { - public PartialNodeDelegatingFieldAccessorFactory(GraphDatabaseContext graphDatabaseContext, DirectGraphRepositoryFactory graphRepositoryFactory) { - super(graphDatabaseContext, graphRepositoryFactory); + public PartialNodeDelegatingFieldAccessorFactory(GraphDatabaseContext graphDatabaseContext) { + super(graphDatabaseContext); } @Override @@ -147,7 +146,7 @@ public class PartialNodeEntityState extends DefaultEn }, new OneToNRelationshipFieldAccessorFactory(getGraphDatabaseContext()), new ReadOnlyOneToNRelationshipFieldAccessorFactory(getGraphDatabaseContext()), - new TraversalFieldAccessorFactory(this.graphRepositoryFactory), + new TraversalFieldAccessorFactory(), new OneToNRelationshipEntityFieldAccessorFactory(getGraphDatabaseContext()) ); } 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 c02bee6e1..0fe8c0ad2 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 @@ -21,6 +21,7 @@ import org.neo4j.graphdb.Path; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Relationship; import org.neo4j.helpers.collection.IterableWrapper; +import org.springframework.data.graph.core.EntityPath; import org.springframework.data.graph.core.GraphBacked; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.core.RelationshipBacked; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityMapper.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityMapper.java index 792207a57..2bef2d214 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityMapper.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/EntityMapper.java @@ -17,6 +17,7 @@ package org.springframework.data.graph.neo4j.support.path; import org.neo4j.graphdb.Path; +import org.springframework.data.graph.core.EntityPath; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/PathMapper.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/PathMapper.java index 2315c8523..29ce45acc 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/PathMapper.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/PathMapper.java @@ -41,7 +41,7 @@ public interface PathMapper { /** * callback instead of mapping */ - public abstract class WithoutResult implements PathMapper, IterationController{ + public abstract class WithoutResult implements PathMapper, IterationController { public abstract void eachPath(Path path); @Override diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/PathMappingIterator.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/PathMappingIterator.java index f84ccccd8..858fa33f2 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/PathMappingIterator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/path/PathMappingIterator.java @@ -23,8 +23,6 @@ import org.neo4j.helpers.collection.IterableWrapper; import java.util.ArrayList; import java.util.List; -import static org.springframework.data.graph.neo4j.support.path.IterationController.IterationMode.EAGER_STOP_ON_NULL; - /** * @author mh * @since 22.02.11 diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/Neo4jRelationshipBacking.aj b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/Neo4jRelationshipBacking.aj index c329b028b..91d49774f 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/Neo4jRelationshipBacking.aj +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/Neo4jRelationshipBacking.aj @@ -22,7 +22,6 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.FieldSignature; import org.neo4j.graphdb.Relationship; import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.state.RelationshipEntityStateFactory; import org.springframework.data.graph.neo4j.support.DoReturn; import org.springframework.data.graph.core.EntityState; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; @@ -35,7 +34,7 @@ import static org.springframework.data.graph.neo4j.support.DoReturn.unwrap; /** * Aspect for handling relationship entity creation and field access (read & write) * puts the underlying state into and delegates field access to an {@link org.springframework.data.graph.core.EntityState} instance, - * created by a configured {@link org.springframework.data.graph.neo4j.state.RelationshipEntityStateFactory} + * created by a configured {@link RelationshipEntityStateFactory} */ public aspect Neo4jRelationshipBacking { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/RelationshipEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityState.java similarity index 89% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/RelationshipEntityState.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityState.java index 5c604839b..820b0cba4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/RelationshipEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityState.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.state; +package org.springframework.data.graph.neo4j.support.relationship; import org.neo4j.graphdb.NotInTransactionException; import org.neo4j.graphdb.Relationship; import org.springframework.dao.InvalidDataAccessResourceUsageException; import org.springframework.data.graph.core.RelationshipBacked; import org.springframework.data.graph.neo4j.fieldaccess.*; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.util.Arrays; @@ -35,7 +34,7 @@ public class RelationshipEntityState extends private final GraphDatabaseContext graphDatabaseContext; - public RelationshipEntityState(final Relationship underlyingState, final ENTITY entity, final Class type, final GraphDatabaseContext graphDatabaseContext, final DirectGraphRepositoryFactory graphRepositoryFactory, final RelationshipStateDelegatingFieldAccessorFactory delegatingFieldAccessorFactory) { + public RelationshipEntityState(final Relationship underlyingState, final ENTITY entity, final Class type, final GraphDatabaseContext graphDatabaseContext, final RelationshipStateDelegatingFieldAccessorFactory delegatingFieldAccessorFactory) { super(underlyingState, entity, type, delegatingFieldAccessorFactory); this.graphDatabaseContext = graphDatabaseContext; } @@ -68,8 +67,8 @@ public class RelationshipEntityState extends } public static class RelationshipStateDelegatingFieldAccessorFactory extends DelegatingFieldAccessorFactory { - public RelationshipStateDelegatingFieldAccessorFactory(GraphDatabaseContext graphDatabaseContext, DirectGraphRepositoryFactory graphRepositoryFactory) { - super(graphDatabaseContext, graphRepositoryFactory); + public RelationshipStateDelegatingFieldAccessorFactory(GraphDatabaseContext graphDatabaseContext) { + super(graphDatabaseContext); } @Override diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/RelationshipEntityStateFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/RelationshipEntityStateFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java index 66ebb255f..2c7b9549d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/state/RelationshipEntityStateFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.state; +package org.springframework.data.graph.neo4j.support.relationship; import org.neo4j.graphdb.Relationship; import org.springframework.data.graph.core.RelationshipBacked; @@ -32,7 +32,7 @@ public class RelationshipEntityStateFactory { private RelationshipEntityState.RelationshipStateDelegatingFieldAccessorFactory delegatingFieldAccessorFactory; public EntityState getEntityState(final RelationshipBacked entity) { - return new RelationshipEntityState(null,entity,entity.getClass(), graphDatabaseContext, graphRepositoryFactory, delegatingFieldAccessorFactory); + return new RelationshipEntityState(null,entity,entity.getClass(), graphDatabaseContext, delegatingFieldAccessorFactory); } public void setGraphDatabaseContext(GraphDatabaseContext graphDatabaseContext) { @@ -45,7 +45,7 @@ public class RelationshipEntityStateFactory { @PostConstruct private void setUp() { - this.delegatingFieldAccessorFactory = new RelationshipEntityState.RelationshipStateDelegatingFieldAccessorFactory(graphDatabaseContext, graphRepositoryFactory); + this.delegatingFieldAccessorFactory = new RelationshipEntityState.RelationshipStateDelegatingFieldAccessorFactory(graphDatabaseContext); } } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java index 22ed00fe7..4ac60c335 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support.typerepresentation; import org.neo4j.graphdb.*; import org.neo4j.graphdb.index.Index; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java similarity index 99% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java index f81d553f8..dc0a48b8c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support.typerepresentation; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/NoopNodeTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/NoopNodeTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java index 6b3c072d9..8a65a7a03 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/NoopNodeTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support.typerepresentation; import org.neo4j.graphdb.Node; import org.neo4j.helpers.collection.ClosableIterable; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/NoopRelationshipTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/NoopRelationshipTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java index 45eebed96..b50018000 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/NoopRelationshipTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support.typerepresentation; import org.neo4j.graphdb.Relationship; import org.neo4j.helpers.collection.ClosableIterable; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java similarity index 99% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java index 9417bb7fe..68591dbea 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support.typerepresentation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/TypeRepresentationStrategyFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/TypeRepresentationStrategyFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java index 344c35068..98efa7b5d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/TypeRepresentationStrategyFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.graph.neo4j.support.typerepresentation; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.springframework.data.graph.core.*; +import org.springframework.data.graph.neo4j.support.typerepresentation.*; import org.springframework.data.persistence.EntityInstantiator; public class TypeRepresentationStrategyFactory { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jOperations.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jOperations.java index e35b99a10..a4d857115 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jOperations.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jOperations.java @@ -19,8 +19,8 @@ package org.springframework.data.graph.neo4j.template; import org.neo4j.graphdb.*; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.helpers.collection.ClosableIterable; -import org.springframework.data.graph.core.Property; import org.springframework.data.graph.neo4j.support.path.PathMapper; +import org.springframework.data.graph.core.Property; /** * A template with convenience operations, exception translation and implicit transaction for modifying methods diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java index 91e557e79..334192386 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.graph.annotation.NodeEntity; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.graph.neo4j.support.typerepresentation.IndexingNodeTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java index 1c1f0690c..aba991322 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java @@ -29,6 +29,8 @@ import org.springframework.data.graph.annotation.NodeEntity; import org.springframework.data.graph.annotation.RelationshipEntity; import org.springframework.data.graph.annotation.StartNode; import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.graph.neo4j.support.typerepresentation.IndexingNodeTypeRepresentationStrategy; +import org.springframework.data.graph.neo4j.support.typerepresentation.IndexingRelationshipTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyTest.java index b03d342bf..35bdfad35 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyTest.java @@ -26,6 +26,8 @@ import org.neo4j.graphdb.Transaction; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.graph.annotation.NodeEntity; import org.springframework.data.graph.annotation.RelationshipEntity; +import org.springframework.data.graph.neo4j.support.typerepresentation.NoopNodeTypeRepresentationStrategy; +import org.springframework.data.graph.neo4j.support.typerepresentation.NoopRelationshipTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java index 40a6b1b21..6440656c6 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java @@ -35,6 +35,7 @@ import org.springframework.data.graph.neo4j.Volvo; import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.graph.neo4j.repository.GraphRepository; import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.graph.neo4j.support.typerepresentation.SubReferenceNodeTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java index e243a4df4..093724072 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java @@ -27,6 +27,7 @@ import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.kernel.Traversal; import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.graph.core.EntityPath; import org.springframework.data.graph.neo4j.Group; import org.springframework.data.graph.neo4j.Person; import static org.springframework.data.graph.neo4j.Person.persistedPerson; @@ -35,7 +36,6 @@ import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFact import org.springframework.data.graph.neo4j.repository.GraphRepository; import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; -import org.springframework.data.graph.neo4j.support.path.EntityPath; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityMapperTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityMapperTest.java index f201724e2..558e471f8 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityMapperTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityMapperTest.java @@ -20,6 +20,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.graph.core.EntityPath; import org.springframework.data.graph.neo4j.Person; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityPathTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityPathTest.java index 620a4b4b3..7bfef674d 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityPathTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityPathTest.java @@ -21,6 +21,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.graphdb.Node; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.graph.core.EntityPath; import org.springframework.data.graph.neo4j.Person; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import org.springframework.test.context.ContextConfiguration; 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 67642a5d3..3eab00d26 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 @@ -103,7 +103,7 @@ - + @@ -112,19 +112,17 @@ - + - - - + diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml index 3a0c867bd..1d654a4f3 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml @@ -14,11 +14,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - + 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 23f864422..aee08ad07 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 @@ -100,7 +100,7 @@ - + @@ -109,18 +109,16 @@ - + - - - + diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml index 17e8c9de6..dff60c3e5 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml @@ -14,6 +14,6 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - - + + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml index 0d5c6f643..0bc1dae1a 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml @@ -14,7 +14,7 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - +