diff --git a/.gitignore b/.gitignore index b82f0abfb..e8008d6b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ ajcore* +.project +.classpath +.settings .idea *.log .DS_Store diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/config/Neo4jAspectConfiguration.java b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/config/Neo4jAspectConfiguration.java similarity index 83% rename from spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/config/Neo4jAspectConfiguration.java rename to spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/config/Neo4jAspectConfiguration.java index 8f494bbd3..389eed2bd 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/config/Neo4jAspectConfiguration.java +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/config/Neo4jAspectConfiguration.java @@ -13,18 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.neo4j.config; +package org.springframework.data.neo4j.aspects.config; import org.springframework.context.annotation.Bean; -import org.springframework.data.neo4j.support.node.Neo4jNodeBacking; +import org.springframework.data.neo4j.aspects.support.node.Neo4jNodeBacking; +import org.springframework.data.neo4j.aspects.support.relationship.Neo4jRelationshipBacking; +import org.springframework.data.neo4j.config.Neo4jConfiguration; import org.springframework.data.neo4j.support.node.NodeEntityStateFactory; -import org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking; /** * @author mh * @since 30.09.11 */ -public class Neo4jAspectConfiguration extends Neo4jConfiguration { +public class Neo4jAspectConfiguration extends Neo4jConfiguration +{ @Bean public Neo4jRelationshipBacking neo4jRelationshipBacking() throws Exception { Neo4jRelationshipBacking aspect = Neo4jRelationshipBacking.aspectOf(); diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/GraphBacked.java b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/GraphBacked.java similarity index 97% rename from spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/GraphBacked.java rename to spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/GraphBacked.java index ac2e42519..df1e70a3d 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/GraphBacked.java +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/GraphBacked.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.core; +package org.springframework.data.neo4j.aspects.core; import org.springframework.data.neo4j.support.ManagedEntity; diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/NodeBacked.java b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/NodeBacked.java similarity index 96% rename from spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/NodeBacked.java rename to spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/NodeBacked.java index a7b091056..3b388013d 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/NodeBacked.java +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/NodeBacked.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.springframework.data.neo4j.core; +package org.springframework.data.neo4j.aspects.core; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; +import org.springframework.data.neo4j.core.EntityPath; import java.util.Map; /** - * Interface introduced to objects annotated with @NodeEntity by the {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} aspect. + * Interface introduced to objects annotated with @NodeEntity by the {@link org.springframework.data.neo4j.aspects.support.node.Neo4jNodeBacking} aspect. * annotation, to hold underlying Neo4j Node state. * * @author Rod Johnson diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/RelationshipBacked.java b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/RelationshipBacked.java similarity index 96% rename from spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/RelationshipBacked.java rename to spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/RelationshipBacked.java index c040ff7a7..67d8f4a33 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/core/RelationshipBacked.java +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/core/RelationshipBacked.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.core; +package org.springframework.data.neo4j.aspects.core; import org.neo4j.graphdb.Relationship; diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/fieldaccess/JpaIdFieldAccessListenerFactory.java similarity index 88% rename from spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java rename to spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/fieldaccess/JpaIdFieldAccessListenerFactory.java index e2e4d8f0f..cbf115a14 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/fieldaccess/JpaIdFieldAccessListenerFactory.java @@ -14,10 +14,12 @@ * limitations under the License. */ -package org.springframework.data.neo4j.fieldaccess; +package org.springframework.data.neo4j.aspects.fieldaccess; import org.springframework.data.neo4j.core.EntityState; -import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.aspects.core.NodeBacked; +import org.springframework.data.neo4j.fieldaccess.FieldAccessListener; +import org.springframework.data.neo4j.fieldaccess.FieldAccessorListenerFactory; import org.springframework.data.neo4j.mapping.Neo4jPersistentProperty; import org.springframework.data.neo4j.support.GraphDatabaseContext; @@ -27,7 +29,8 @@ import javax.persistence.Id; * @author Michael Hunger * @since 12.09.2010 */ -public class JpaIdFieldAccessListenerFactory implements FieldAccessorListenerFactory { +public class JpaIdFieldAccessListenerFactory implements FieldAccessorListenerFactory +{ private final GraphDatabaseContext graphDatabaseContext; public JpaIdFieldAccessListenerFactory(GraphDatabaseContext graphDatabaseContext) { diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/support/node/Neo4jNodeBacking.aj b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/node/Neo4jNodeBacking.aj similarity index 97% rename from spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/support/node/Neo4jNodeBacking.aj rename to spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/node/Neo4jNodeBacking.aj index 35aedffc6..9b33b52b9 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/support/node/Neo4jNodeBacking.aj +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/node/Neo4jNodeBacking.aj @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support.node; +package org.springframework.data.neo4j.aspects.support.node; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,6 +27,7 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.graphdb.traversal.Traverser; +import org.springframework.data.neo4j.annotation.NodeEntity; import org.springframework.data.neo4j.annotation.NodeEntity; import org.springframework.data.neo4j.annotation.RelationshipEntity; import org.springframework.data.neo4j.annotation.RelatedTo; @@ -36,9 +37,10 @@ import org.springframework.data.neo4j.annotation.Query; import org.springframework.data.neo4j.annotation.RelatedToVia; import org.springframework.data.neo4j.annotation.GraphTraversal; -import org.springframework.data.neo4j.core.NodeBacked; -import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.aspects.core.NodeBacked; +import org.springframework.data.neo4j.aspects.core.RelationshipBacked; import org.springframework.data.neo4j.fieldaccess.GraphBackedEntityIterableWrapper; +import org.springframework.data.neo4j.support.node.NodeEntityStateFactory; import org.springframework.data.neo4j.support.DoReturn; import org.springframework.data.neo4j.core.EntityPath; import org.springframework.data.neo4j.core.EntityState; diff --git a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/support/relationship/Neo4jRelationshipBacking.aj b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/relationship/Neo4jRelationshipBacking.aj similarity index 94% rename from spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/support/relationship/Neo4jRelationshipBacking.aj rename to spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/relationship/Neo4jRelationshipBacking.aj index 08db3ee1f..1b16a1ed1 100644 --- a/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/support/relationship/Neo4jRelationshipBacking.aj +++ b/spring-data-neo4j-aspects/src/main/java/org/springframework/data/neo4j/aspects/support/relationship/Neo4jRelationshipBacking.aj @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support.relationship; +package org.springframework.data.neo4j.aspects.support.relationship; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,11 +22,12 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.FieldSignature; import org.neo4j.graphdb.Relationship; import org.springframework.data.neo4j.annotation.RelationshipEntity; -import org.springframework.data.neo4j.core.NodeBacked; -import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.aspects.core.NodeBacked; +import org.springframework.data.neo4j.aspects.core.RelationshipBacked; import org.springframework.data.neo4j.support.DoReturn; import org.springframework.data.neo4j.core.EntityState; import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.relationship.RelationshipEntityStateFactory; import java.lang.reflect.Field; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Attribute.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Attribute.java similarity index 95% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Attribute.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Attribute.java index e90f699d9..9a5cccdba 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Attribute.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Attribute.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import org.springframework.data.neo4j.annotation.Indexed; import org.springframework.data.neo4j.annotation.NodeEntity; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Car.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Car.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Car.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Car.java index 505742632..9bace2144 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Car.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Car.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import org.neo4j.graphdb.Node; import org.springframework.data.neo4j.annotation.NodeEntity; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Developer.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Developer.java similarity index 91% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Developer.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Developer.java index 3ceb00edf..8163e73ab 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Developer.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Developer.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.annotation.NodeEntity; /** diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Friendship.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Friendship.java similarity index 95% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Friendship.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Friendship.java index c77f3bd12..ebcf683d9 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Friendship.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Friendship.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import java.util.Date; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.annotation.EndNode; import org.springframework.data.neo4j.annotation.Indexed; import org.springframework.data.neo4j.annotation.RelationshipEntity; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/FriendshipRepository.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/FriendshipRepository.java similarity index 87% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/FriendshipRepository.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/FriendshipRepository.java index a13ce8d8a..526e1a560 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/FriendshipRepository.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/FriendshipRepository.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; +import org.springframework.data.neo4j.aspects.Friendship; import org.springframework.data.neo4j.repository.GraphRepository; public interface FriendshipRepository extends GraphRepository { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Group.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Group.java similarity index 97% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Group.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Group.java index 5fb46b4a9..ff6837abe 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Group.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Group.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.kernel.Traversal; import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.annotation.*; import org.springframework.data.neo4j.core.FieldTraversalDescriptionBuilder; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/GroupRepository.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/GroupRepository.java similarity index 89% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/GroupRepository.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/GroupRepository.java index ca58ecde9..6dea1b65a 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/GroupRepository.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/GroupRepository.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; +import org.springframework.data.neo4j.aspects.Group; import org.springframework.data.neo4j.repository.NamedIndexRepository; import org.springframework.data.neo4j.repository.GraphRepository; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/InvalidOneToNEntity.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/InvalidOneToNEntity.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/InvalidOneToNEntity.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/InvalidOneToNEntity.java index 1fbe45eeb..1ae922a09 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/InvalidOneToNEntity.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/InvalidOneToNEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import org.springframework.data.neo4j.annotation.NodeEntity; import org.springframework.data.neo4j.annotation.RelatedTo; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/InvalidReadOnlyOneToNEntity.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/InvalidReadOnlyOneToNEntity.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/InvalidReadOnlyOneToNEntity.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/InvalidReadOnlyOneToNEntity.java index cd257c05f..ce3ccb87d 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/InvalidReadOnlyOneToNEntity.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/InvalidReadOnlyOneToNEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import org.springframework.data.neo4j.annotation.NodeEntity; import org.springframework.data.neo4j.annotation.RelatedTo; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Named.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Named.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Named.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Named.java index 247f2bfae..d979c8c7f 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Named.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Named.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import org.springframework.data.neo4j.annotation.NodeEntity; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Person.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Person.java similarity index 99% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Person.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Person.java index 876892545..f548972e4 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Person.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Person.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import java.util.Date; import java.util.Map; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/PersonCreator.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/PersonCreator.java similarity index 90% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/PersonCreator.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/PersonCreator.java index 9e3a214b8..55a8b6ea0 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/PersonCreator.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/PersonCreator.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import org.neo4j.graphdb.Node; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.persistence.StateBackedCreator; /** diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/PersonRepository.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/PersonRepository.java similarity index 93% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/PersonRepository.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/PersonRepository.java index 8f8cc7e1b..2d4d484a3 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/PersonRepository.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/PersonRepository.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; +import org.springframework.data.neo4j.aspects.Group; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.annotation.Query; import org.springframework.data.neo4j.annotation.QueryType; import org.springframework.data.neo4j.repository.GraphRepository; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Personality.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Personality.java similarity index 93% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Personality.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Personality.java index 74893c299..b17dc9c34 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Personality.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Personality.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; public enum Personality { EXTROVERT, INTROVERT diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/SubGroup.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/SubGroup.java similarity index 87% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/SubGroup.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/SubGroup.java index 2675382d9..1dc17d1f0 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/SubGroup.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/SubGroup.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; +import org.springframework.data.neo4j.aspects.Group; import org.springframework.data.neo4j.annotation.*; @NodeEntity diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Toyota.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Toyota.java similarity index 87% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Toyota.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Toyota.java index 49a1983a7..099a6d285 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Toyota.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Toyota.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; + +import org.springframework.data.neo4j.aspects.Car; public class Toyota extends Car { public Toyota() { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Volvo.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Volvo.java similarity index 88% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Volvo.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Volvo.java index 81ed1912f..dc3c3ac71 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/Volvo.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/Volvo.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package org.springframework.data.neo4j; +package org.springframework.data.neo4j.aspects; +import org.springframework.data.neo4j.aspects.Car; import org.springframework.data.neo4j.annotation.NodeEntity; public class Volvo extends Car { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/AttachEntityTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTest.java similarity index 88% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/AttachEntityTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTest.java index 973d0fc63..c5dc045a5 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/AttachEntityTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,9 +22,8 @@ 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.neo4j.Developer; -import org.springframework.data.neo4j.core.NodeBacked; -import org.springframework.data.neo4j.Developer; +import org.springframework.data.neo4j.aspects.Developer; +import org.springframework.data.neo4j.aspects.core.NodeBacked; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.test.context.ContextConfiguration; @@ -35,7 +34,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class AttachEntityTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/DynamicPropertiesTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTest.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/DynamicPropertiesTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTest.java index 1e519328e..300fca0a1 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/DynamicPropertiesTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; import java.util.HashMap; import java.util.Map; @@ -32,10 +32,11 @@ import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Relationship; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.Friendship; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.aspects.Friendship; +import org.springframework.data.neo4j.aspects.Person; +import org.springframework.data.neo4j.aspects.PersonRepository; import org.springframework.data.neo4j.fieldaccess.DynamicProperties; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -43,7 +44,7 @@ import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.transaction.annotation.Transactional; @RunWith( SpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"} ) +@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"} ) public class DynamicPropertiesTest { @Autowired diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/EntityPropertyValidationTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java similarity index 88% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/EntityPropertyValidationTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java index 018f1c646..f9b7c1646 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/EntityPropertyValidationTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,7 +22,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; + +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; @@ -35,7 +37,7 @@ import javax.validation.ValidationException; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class EntityPropertyValidationTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/FinderTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTest.java similarity index 92% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/FinderTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTest.java index 0df2fdb57..9bb55b0d0 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/FinderTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,7 +26,14 @@ import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.aspects.Friendship; +import org.springframework.data.neo4j.aspects.FriendshipRepository; +import org.springframework.data.neo4j.aspects.Group; +import org.springframework.data.neo4j.aspects.GroupRepository; +import org.springframework.data.neo4j.aspects.Person; +import org.springframework.data.neo4j.aspects.PersonRepository; +import org.springframework.data.neo4j.aspects.*; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -38,14 +45,13 @@ import java.util.*; import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; import static org.junit.internal.matchers.IsCollectionContaining.hasItems; import static org.neo4j.helpers.collection.IteratorUtil.asCollection; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) //@ContextConfiguration(locations = {"classpath:repository-namespace-config-context.xml"}) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class FinderTest { protected final Log log = LogFactory.getLog(getClass()); diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphDatabaseFactoryTest.java similarity index 91% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphDatabaseFactoryTest.java index 699b71eea..1a27f3b7d 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphDatabaseFactoryTest.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.support.DelegatingGraphDatabase; +import org.springframework.data.neo4j.support.GraphDatabaseFactory; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/GraphRepositoryTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTest.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/GraphRepositoryTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTest.java index 784e5be50..e0d90ff30 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/GraphRepositoryTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,10 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import org.springframework.data.neo4j.Group; -import org.springframework.data.neo4j.*; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.aspects.*; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -50,7 +48,7 @@ import static org.junit.internal.matchers.IsCollectionContaining.hasItems; import static org.neo4j.helpers.collection.IteratorUtil.asCollection; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:repository-namespace-config-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/repository-namespace-config-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class GraphRepositoryTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/HasRelationshipMatcher.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/HasRelationshipMatcher.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/HasRelationshipMatcher.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/HasRelationshipMatcher.java index ad7ff6e60..ed9f7769a 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/HasRelationshipMatcher.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/HasRelationshipMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.hamcrest.CoreMatchers; import org.hamcrest.Description; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java index a075dbd9b..61a3fd852 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,11 +27,18 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.IndexHits; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.aspects.Friendship; +import org.springframework.data.neo4j.aspects.Group; +import org.springframework.data.neo4j.aspects.GroupRepository; +import org.springframework.data.neo4j.aspects.Person; +import org.springframework.data.neo4j.aspects.PersonRepository; +import org.springframework.data.neo4j.aspects.SubGroup; import org.springframework.data.neo4j.annotation.Indexed; import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.aspects.*; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -43,11 +50,11 @@ import java.util.Collection; import java.util.HashSet; import static org.junit.Assert.*; -import static org.springframework.data.neo4j.Person.NAME_INDEX; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.NAME_INDEX; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class IndexTest { private static final String NAME = "name"; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexingNodeTypeRepresentationStrategyTest.java similarity index 96% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexingNodeTypeRepresentationStrategyTest.java index 69694178e..afa765ae7 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexingNodeTypeRepresentationStrategyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.junit.Before; import org.junit.Test; @@ -46,8 +46,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/aspects/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class IndexingNodeTypeRepresentationStrategyTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexingRelationshipTypeRepresentationStrategyTest.java similarity index 96% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexingRelationshipTypeRepresentationStrategyTest.java index a0317c3ce..ebfd6c2f0 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexingRelationshipTypeRepresentationStrategyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.junit.Before; import org.junit.Test; @@ -46,8 +46,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/aspects/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class IndexingRelationshipTypeRepresentationStrategyTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/ModificationOutsideOfTransactionTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTest.java similarity index 93% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/ModificationOutsideOfTransactionTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTest.java index 9190b2b7c..47758bad9 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/ModificationOutsideOfTransactionTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,12 +25,10 @@ import org.junit.runner.RunWith; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotInTransactionException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.Friendship; -import org.springframework.data.neo4j.*; -import org.springframework.data.neo4j.Group; -import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.aspects.*; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -40,12 +38,12 @@ import java.util.Collections; import java.util.HashSet; import static org.junit.Assert.*; -import static org.springframework.data.neo4j.Person.persistedPerson; -import static org.springframework.data.neo4j.support.HasRelationshipMatcher.hasNoRelationship; -import static org.springframework.data.neo4j.support.HasRelationshipMatcher.hasRelationship; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.support.HasRelationshipMatcher.hasNoRelationship; +import static org.springframework.data.neo4j.aspects.support.HasRelationshipMatcher.hasRelationship; @RunWith( SpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"} ) +@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"} ) public class ModificationOutsideOfTransactionTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityInstantiationTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTest.java similarity index 86% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityInstantiationTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTest.java index 1f4327850..ec013ddbd 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityInstantiationTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,10 +22,10 @@ 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.neo4j.Person; -import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -37,12 +37,12 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { - "classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/neo4j/support/PersonDirectCreator-context.xml" }) + "classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/aspects/support/PersonDirectCreator-context.xml" }) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class NodeEntityInstantiationTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityQueryTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTest.java similarity index 91% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityQueryTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTest.java index e6c03e6b1..070236f50 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityQueryTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.aspects.Person; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -39,7 +39,7 @@ import static org.junit.internal.matchers.IsCollectionContaining.hasItems; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) @Transactional public class NodeEntityQueryTest { @Autowired diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityRelationshipTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTest.java similarity index 96% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityRelationshipTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTest.java index 573755f10..9858372e7 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityRelationshipTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,14 +25,12 @@ import org.neo4j.graphdb.*; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.neo4j.Friendship; -import org.springframework.data.neo4j.*; -import org.springframework.data.neo4j.Group; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; -import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.aspects.*; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; @@ -45,7 +43,7 @@ import java.util.*; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class NodeEntityRelationshipTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java similarity index 92% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java index 83f44998e..c7f9d1d39 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NodeEntityTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,13 +24,10 @@ import org.junit.runner.RunWith; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Transaction; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.Attribute; -import org.springframework.data.neo4j.Group; -import org.springframework.data.neo4j.*; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.aspects.*; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -38,10 +35,10 @@ import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class NodeEntityTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NoopTypeRepresentationStrategyTest.java similarity index 93% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NoopTypeRepresentationStrategyTest.java index 200fdab6f..a1b235f07 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NoopTypeRepresentationStrategyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.junit.Before; import org.junit.Test; @@ -26,6 +26,7 @@ import org.neo4j.graphdb.Transaction; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.neo4j.annotation.NodeEntity; import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.typerepresentation.NoopNodeTypeRepresentationStrategy; import org.springframework.data.neo4j.support.typerepresentation.NoopRelationshipTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; @@ -36,8 +37,8 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution import org.springframework.test.context.transaction.TransactionalTestExecutionListener; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/aspects/support/NoopTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class NoopTypeRepresentationStrategyTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/ProjectionTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTest.java similarity index 87% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/ProjectionTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTest.java index 3b3cb819e..443a70236 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/ProjectionTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTest.java @@ -14,18 +14,17 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.Group; -import org.springframework.data.neo4j.Group; -import org.springframework.data.neo4j.Named; -import org.springframework.data.neo4j.Named; +import org.springframework.data.neo4j.aspects.Group; +import org.springframework.data.neo4j.aspects.Named; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; @@ -36,7 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class ProjectionTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/PropertyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTest.java similarity index 92% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/PropertyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTest.java index 74ca718fe..b6d875f37 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/PropertyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,10 +22,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.graphdb.NotFoundException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.Friendship; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.Personality; +import org.springframework.data.neo4j.aspects.Friendship; +import org.springframework.data.neo4j.aspects.Person; +import org.springframework.data.neo4j.aspects.Personality; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; @@ -36,10 +37,10 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import static org.junit.Assert.assertEquals; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class PropertyTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/RelationshipEntityTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTest.java similarity index 93% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/RelationshipEntityTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTest.java index 9e73bf519..cdf2478f1 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/RelationshipEntityTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,15 +23,13 @@ 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.neo4j.Friendship; -import org.springframework.data.neo4j.*; -import org.springframework.data.neo4j.FriendshipRepository; import static org.junit.Assert.assertFalse; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; -import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.aspects.*; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; @@ -42,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class RelationshipEntityTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/SubReferenceNodeTypeRepresentationStrategyTest.java similarity index 95% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/SubReferenceNodeTypeRepresentationStrategyTest.java index a6d7143bf..c0b7ebd48 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/SubReferenceNodeTypeRepresentationStrategyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,14 +27,11 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.*; import org.springframework.data.neo4j.annotation.NodeEntity; -import org.springframework.data.neo4j.Car; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.Toyota; -import org.springframework.data.neo4j.Volvo; +import org.springframework.data.neo4j.aspects.*; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.data.neo4j.support.typerepresentation.SubReferenceNodeTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; @@ -51,15 +48,15 @@ import java.util.Collections; import java.util.HashSet; import static org.junit.Assert.*; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; /** * @author mh * @since 20.01.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/aspects/support/SubReferenceTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class SubReferenceNodeTypeRepresentationStrategyTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/TestTeam.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TestTeam.java similarity index 87% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/TestTeam.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TestTeam.java index 0de50ff45..ebedb2d83 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/TestTeam.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TestTeam.java @@ -14,13 +14,10 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.neo4j.helpers.collection.MapUtil; -import org.springframework.data.neo4j.Group; -import org.springframework.data.neo4j.*; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.Personality; +import org.springframework.data.neo4j.aspects.*; import java.util.Map; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/TraversalTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTest.java similarity index 93% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/TraversalTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTest.java index 11367b41c..be2931fff 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/TraversalTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support; +package org.springframework.data.neo4j.aspects.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,15 +27,15 @@ 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.neo4j.Group; -import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.aspects.Group; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.core.EntityPath; -import org.springframework.data.neo4j.Group; -import org.springframework.data.neo4j.Person; -import static org.springframework.data.neo4j.Person.persistedPerson; + +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.annotation.Rollback; @@ -50,7 +50,7 @@ import java.util.HashSet; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class TraversalTest { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/EntityMapperTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTest.java similarity index 86% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/EntityMapperTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTest.java index 0f1d58cdf..1876ac9c7 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/EntityMapperTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTest.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support.path; +package org.springframework.data.neo4j.aspects.support.path; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.core.EntityPath; -import org.springframework.data.neo4j.Person; import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.path.EntityMapper; +import org.springframework.data.neo4j.support.path.NodePath; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -33,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; * @since 26.02.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class EntityMapperTest { @Autowired diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/EntityPathTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTest.java similarity index 87% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/EntityPathTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTest.java index 704b8876b..b840497dc 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/EntityPathTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTest.java @@ -14,17 +14,18 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support.path; +package org.springframework.data.neo4j.aspects.support.path; import org.junit.Assert; 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.neo4j.Person; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.core.EntityPath; -import org.springframework.data.neo4j.Person; import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.path.ConvertingEntityPath; +import org.springframework.data.neo4j.support.path.NodePath; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -34,7 +35,7 @@ import org.springframework.transaction.annotation.Transactional; * @since 26.02.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) public class EntityPathTest { @Autowired diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/PathMappingIteratorTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTest.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/PathMappingIteratorTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTest.java index 70e9a1318..7e8000dcf 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/path/PathMappingIteratorTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTest.java @@ -14,10 +14,13 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support.path; +package org.springframework.data.neo4j.aspects.support.path; import org.junit.Test; import org.neo4j.graphdb.Path; +import org.springframework.data.neo4j.support.path.IterationController; +import org.springframework.data.neo4j.support.path.PathMapper; +import org.springframework.data.neo4j.support.path.PathMappingIterator; import java.util.Arrays; import java.util.List; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/query/GremlinQueryEngineTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTest.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/query/GremlinQueryEngineTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTest.java index 0424dee03..4589ecd6d 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/query/GremlinQueryEngineTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support.query; +package org.springframework.data.neo4j.aspects.support.query; import org.junit.Before; import org.junit.Test; @@ -24,14 +24,15 @@ import org.neo4j.helpers.collection.IteratorUtil; import org.neo4j.helpers.collection.MapUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; -import org.springframework.data.neo4j.Person; import org.springframework.data.neo4j.annotation.QueryType; +import org.springframework.data.neo4j.aspects.Person; +import org.springframework.data.neo4j.aspects.core.NodeBacked; +import org.springframework.data.neo4j.aspects.support.TestTeam; import org.springframework.data.neo4j.core.GraphDatabase; -import org.springframework.data.neo4j.core.NodeBacked; import org.springframework.data.neo4j.support.DelegatingGraphDatabase; import org.springframework.data.neo4j.support.GraphDatabaseContext; -import org.springframework.data.neo4j.support.TestTeam; import org.springframework.data.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.support.query.QueryEngine; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; @@ -49,7 +50,7 @@ import static org.junit.Assert.assertEquals; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) @Transactional public class GremlinQueryEngineTest { @Autowired diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/query/QueryEngineTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTest.java similarity index 93% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/query/QueryEngineTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTest.java index 634e7be39..7cd85ac65 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/support/query/QueryEngineTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.neo4j.support.query; +package org.springframework.data.neo4j.aspects.support.query; import org.junit.Before; import org.junit.Test; @@ -24,18 +24,19 @@ import org.neo4j.helpers.collection.IteratorUtil; import org.neo4j.helpers.collection.MapUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.Personality; import org.springframework.data.neo4j.annotation.QueryType; +import org.springframework.data.neo4j.aspects.Person; +import org.springframework.data.neo4j.aspects.Personality; +import org.springframework.data.neo4j.aspects.core.NodeBacked; +import org.springframework.data.neo4j.aspects.support.TestTeam; import org.springframework.data.neo4j.conversion.QueryResult; import org.springframework.data.neo4j.conversion.ResultConverter; import org.springframework.data.neo4j.core.GraphDatabase; -import org.springframework.data.neo4j.core.NodeBacked; import org.springframework.data.neo4j.support.DelegatingGraphDatabase; import org.springframework.data.neo4j.support.GraphDatabaseContext; -import org.springframework.data.neo4j.support.TestTeam; import org.springframework.data.neo4j.support.conversion.EntityResultConverter; import org.springframework.data.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.support.query.QueryEngine; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; @@ -53,7 +54,7 @@ import static org.junit.Assert.assertEquals; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) @Transactional public class QueryEngineTest { @Autowired diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/IndexingTypeRepresentationStrategyOverride-context.xml similarity index 100% rename from spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml rename to spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/IndexingTypeRepresentationStrategyOverride-context.xml diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml similarity index 96% rename from spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml rename to spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml index f01f44fb0..16a328dbb 100644 --- a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml +++ b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml @@ -60,19 +60,19 @@ The most commonly used annotation is @Autowired, which instructs Spring to dependency inject an object into your class. --> - + - + - + @@ -167,7 +167,7 @@ - + @@ -178,11 +178,11 @@ - + - + diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/NoopTypeRepresentationStrategyOverride-context.xml similarity index 100% rename from spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml rename to spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/NoopTypeRepresentationStrategyOverride-context.xml diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/PersonDirectCreator-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/PersonDirectCreator-context.xml similarity index 93% rename from spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/PersonDirectCreator-context.xml rename to spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/PersonDirectCreator-context.xml index 84bbc9392..20d94d3d2 100644 --- a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/PersonDirectCreator-context.xml +++ b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/PersonDirectCreator-context.xml @@ -19,8 +19,8 @@ - - + + diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/SubReferenceTypeRepresentationStrategyOverride-context.xml similarity index 100% rename from spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml rename to spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/SubReferenceTypeRepresentationStrategyOverride-context.xml diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/repository-namespace-config-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/repository-namespace-config-context.xml new file mode 100644 index 000000000..5e256f0aa --- /dev/null +++ b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/repository-namespace-config-context.xml @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/config/CrossStoreNeo4jConfiguration.java b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/config/CrossStoreNeo4jConfiguration.java index cead29db3..6399d9026 100644 --- a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/config/CrossStoreNeo4jConfiguration.java +++ b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/config/CrossStoreNeo4jConfiguration.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.neo4j.aspects.config.Neo4jAspectConfiguration; import org.springframework.data.neo4j.support.EntityInstantiator; import org.springframework.data.neo4j.support.node.CrossStoreNodeEntityStateFactory; import org.springframework.data.neo4j.support.node.NodeEntityInstantiator; diff --git a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityInstantiator.java b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityInstantiator.java index 2f6f89a60..e0b12df97 100644 --- a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityInstantiator.java +++ b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityInstantiator.java @@ -17,7 +17,7 @@ package org.springframework.data.neo4j.support.node; import org.neo4j.graphdb.Node; -import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.aspects.core.NodeBacked; import org.springframework.data.neo4j.support.EntityInstantiator; import org.springframework.orm.jpa.EntityManagerFactoryUtils; diff --git a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityState.java b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityState.java index 68ca6bd00..5dc105b18 100644 --- a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityState.java +++ b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityState.java @@ -23,7 +23,8 @@ import org.neo4j.graphdb.index.IndexHits; import org.springframework.dao.InvalidDataAccessResourceUsageException; import org.springframework.data.neo4j.annotation.GraphProperty; import org.springframework.data.neo4j.annotation.RelatedTo; -import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.aspects.core.NodeBacked; +import org.springframework.data.neo4j.aspects.fieldaccess.JpaIdFieldAccessListenerFactory; import org.springframework.data.neo4j.fieldaccess.*; import org.springframework.data.neo4j.mapping.Neo4jPersistentEntity; import org.springframework.data.neo4j.mapping.Neo4jPersistentProperty; diff --git a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityStateFactory.java b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityStateFactory.java index 4b0e0e3f4..d691c98b2 100644 --- a/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityStateFactory.java +++ b/spring-data-neo4j-cross-store/src/main/java/org/springframework/data/neo4j/support/node/CrossStoreNodeEntityStateFactory.java @@ -17,8 +17,8 @@ package org.springframework.data.neo4j.support.node; import org.neo4j.graphdb.Node; import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.aspects.core.NodeBacked; import org.springframework.data.neo4j.core.EntityState; -import org.springframework.data.neo4j.core.NodeBacked; import org.springframework.data.neo4j.fieldaccess.DetachedEntityState; import org.springframework.data.neo4j.mapping.Neo4jPersistentEntity; diff --git a/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml b/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml index d0a089295..337120376 100644 --- a/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml +++ b/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml @@ -70,12 +70,12 @@ Start datastore config --> - + - + diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml index b387470a7..c46f6721c 100644 --- a/spring-data-neo4j-parent/pom.xml +++ b/spring-data-neo4j-parent/pom.xml @@ -606,7 +606,7 @@ http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html for more info --> - + diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java index 59db401f8..8032cde67 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java @@ -20,8 +20,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.EntityPropertyValidationTest; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.EntityPropertyValidationTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestEntityPropertyValidationTest extends EntityPropertyValidationTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java index cac5bce36..5b5ce9309 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java @@ -20,8 +20,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.FinderTest; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.FinderTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestFinderTest extends FinderTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java index dce78c3e5..df6f8cf79 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java @@ -20,9 +20,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.IndexTest; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.IndexTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestIndexTest extends IndexTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java index f069b3fb7..04a87982a 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java @@ -20,9 +20,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.NodeEntityRelationshipTest; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.NodeEntityRelationshipTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestNodeEntityRelationshipTest extends NodeEntityRelationshipTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java index d9d1ae863..00dee08e7 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java @@ -21,9 +21,9 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.NodeEntityTest; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.NodeEntityTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -36,7 +36,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestNodeEntityTest extends NodeEntityTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java index 57cd4ccf2..b13662f03 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java @@ -20,9 +20,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.ProjectionTest; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.ProjectionTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestProjectionTest extends ProjectionTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java index 7673c9f2e..994da6b57 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java @@ -20,9 +20,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.PropertyTest; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.PropertyTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestPropertyTest extends PropertyTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java index 2c821bd6c..c8c6de04f 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java @@ -20,9 +20,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.RelationshipEntityTest; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.RelationshipEntityTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestRelationshipEntityTest extends RelationshipEntityTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java index ec2703424..1aa243db8 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java @@ -20,9 +20,9 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; +import org.springframework.data.neo4j.aspects.support.TraversalTest; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.support.TraversalTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith( SpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"} ) @TestExecutionListeners( {CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class} ) public class RestTraversalTest extends TraversalTest diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTest.java index 79bc9064a..b774dd194 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTest.java @@ -20,10 +20,10 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.neo4j.aspects.support.query.GremlinQueryEngineTest; +import org.springframework.data.neo4j.aspects.support.query.QueryEngineTest; import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.rest.RestGraphDatabase; -import org.springframework.data.neo4j.support.query.GremlinQueryEngineTest; -import org.springframework.data.neo4j.support.query.QueryEngineTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -37,7 +37,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 23.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestGremlinQueryEngineTest extends GremlinQueryEngineTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java index 771a09131..56fe69628 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java @@ -20,9 +20,9 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.neo4j.aspects.support.query.QueryEngineTest; import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.rest.RestGraphDatabase; -import org.springframework.data.neo4j.support.query.QueryEngineTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -36,7 +36,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 23.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestQueryEngineTest extends QueryEngineTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java index c636daaab..771225c3e 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java @@ -23,7 +23,7 @@ import com.sun.jersey.api.client.WebResource; import org.codehaus.jackson.map.ObjectMapper; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.aspects.Person; import org.springframework.data.neo4j.rest.RequestResult; import org.springframework.data.neo4j.server.ProvidedClassPathXmlApplicationContext; @@ -32,7 +32,7 @@ import java.io.IOException; import java.util.Map; import static org.junit.Assert.assertEquals; -import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.aspects.Person.persistedPerson; /** * @author mh diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestServerPlugin.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestServerPlugin.java index 103e512f6..3e71e9e5d 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestServerPlugin.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestServerPlugin.java @@ -21,10 +21,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.server.plugins.*; import org.springframework.context.ApplicationContext; -import org.springframework.data.neo4j.Friendship; -import org.springframework.data.neo4j.*; -import org.springframework.data.neo4j.Person; -import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.aspects.*; import org.springframework.data.neo4j.server.ProvidedClassPathXmlApplicationContext; import org.springframework.data.neo4j.support.GraphDatabaseContext; diff --git a/spring-data-neo4j-rest/src/test/resources/Plugin-context.xml b/spring-data-neo4j-rest/src/test/resources/Plugin-context.xml index e7169fc53..cbb2846a9 100644 --- a/spring-data-neo4j-rest/src/test/resources/Plugin-context.xml +++ b/spring-data-neo4j-rest/src/test/resources/Plugin-context.xml @@ -10,6 +10,6 @@ - + diff --git a/spring-data-neo4j/.classpath b/spring-data-neo4j/.classpath index f9464afc9..6d3cf14ca 100644 --- a/spring-data-neo4j/.classpath +++ b/spring-data-neo4j/.classpath @@ -1,6 +1,6 @@ - + diff --git a/spring-data-neo4j/.project b/spring-data-neo4j/.project index b0634f61e..dfbd81bfd 100644 --- a/spring-data-neo4j/.project +++ b/spring-data-neo4j/.project @@ -6,7 +6,7 @@ - org.eclipse.ajdt.core.ajbuilder + org.eclipse.jdt.core.javabuilder @@ -17,7 +17,6 @@ - org.eclipse.ajdt.ui.ajnature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf index ab4e5fc82..9252af0ce 100644 --- a/spring-data-neo4j/template.mf +++ b/spring-data-neo4j/template.mf @@ -33,9 +33,10 @@ Import-Template: javax.persistence.spi.*;version="[1.0.0, 3.0.0)";resolution:=optional, javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional, com.tinkerpop.blueprints.*;version="[0.8,1.0)";resolution:=optional, - com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional + com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional, + com.tinkerpop.pipes.util.*;version="[0.8,1.0)";resolution:=optional Import-Package: net.sf.cglib.proxy;version="[2.2.0,3.0.0)", net.sf.cglib.core;version="[2.2.0,3.0.0)", net.sf.cglib.reflect;version="[2.2.0,3.0.0)" -DynamicImport-Package: * \ No newline at end of file +DynamicImport-Package: *