diff --git a/spring-data-graph-core/.classpath b/spring-data-graph-core/.classpath deleted file mode 100644 index 5d96226ab..000000000 --- a/spring-data-graph-core/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/spring-data-graph-core/.project b/spring-data-graph-core/.project deleted file mode 100644 index 6d08c86f8..000000000 --- a/spring-data-graph-core/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - spring-data-graph-core - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/spring-data-graph-core/.settings/org.eclipse.jdt.core.prefs b/spring-data-graph-core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f2ae200db..000000000 --- a/spring-data-graph-core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Oct 11 15:28:26 EDT 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/spring-data-graph-core/.settings/org.eclipse.wst.common.component b/spring-data-graph-core/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 8c5dd60e9..000000000 --- a/spring-data-graph-core/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/spring-data-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-data-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index c78d9323f..000000000 --- a/spring-data-graph-core/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/spring-data-graph-core/.settings/org.maven.ide.eclipse.prefs b/spring-data-graph-core/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 9fbe3f09c..000000000 --- a/spring-data-graph-core/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Thu Oct 07 14:11:15 EDT 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spring-data-graph-core/pom.xml b/spring-data-graph-core/pom.xml deleted file mode 100644 index 9f8b90cea..000000000 --- a/spring-data-graph-core/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - 4.0.0 - - org.springframework.data - spring-data-graph-parent - 1.1.0.BUILD-SNAPSHOT - ../spring-data-graph-parent/pom.xml - - spring-data-graph-core - jar - Spring Data Graph Support - - - - - org.springframework - spring-beans - - - org.springframework - spring-tx - - - - - org.springframework.data - spring-data-commons-core - - - - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - compile - - - org.slf4j - slf4j-log4j12 - runtime - - - log4j - log4j - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - - javax.annotation - jsr250-api - true - - - - org.mockito - mockito-all - test - - - - junit - junit - - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - - - - diff --git a/spring-data-graph-core/template.mf b/spring-data-graph-core/template.mf deleted file mode 100644 index 1f7b0b6c1..000000000 --- a/spring-data-graph-core/template.mf +++ /dev/null @@ -1,17 +0,0 @@ -Bundle-SymbolicName: org.springframework.data.graph -Bundle-Name: Spring Data Graph -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Package: - sun.reflect;version="0";resolution:=optional -Import-Template: - org.springframework.beans.*;version="[3.0.0, 4.0.0)", - org.springframework.core.*;version="[3.0.0, 4.0.0)", - org.springframework.dao.*;version="[3.0.0, 4.0.0)", - org.springframework.util.*;version="[3.0.0, 4.0.0)", - org.springframework.data.core.*;version="[1.0.0, 2.0.0)", - org.springframework.data.core.*;version="[1.0.0, 2.0.0)", - org.springframework.data.persistence.*;version="[1.0.0, 2.0.0)", - org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", - org.w3c.dom.*;version="0" \ No newline at end of file diff --git a/spring-data-graph-core/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java similarity index 100% rename from spring-data-graph-core/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/annotation/Indexed.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Indexed.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/annotation/Indexed.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Indexed.java index 0791ff463..62ff42e49 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/annotation/Indexed.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Indexed.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.annotation; +package org.springframework.data.graph.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphQuery.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Query.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphQuery.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Query.java index 94e12bcc5..9061cba33 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphQuery.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Query.java @@ -34,7 +34,7 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD,ElementType.METHOD}) -public @interface GraphQuery { +public @interface Query { /** * @return Query to be executed %d will be replaced by the node-id of the current entity other placeholders by the given params */ diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java index 62aa179f8..5399546bd 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java @@ -21,8 +21,8 @@ import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.index.Index; import org.neo4j.index.lucene.ValueContext; +import org.springframework.data.graph.annotation.Indexed; import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.neo4j.annotation.Indexed; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; import java.lang.reflect.AnnotatedElement; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/QueryFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/QueryFieldAccessorFactory.java index 473a75000..b1ecb7fc1 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/QueryFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/QueryFieldAccessorFactory.java @@ -16,9 +16,8 @@ package org.springframework.data.graph.neo4j.fieldaccess; -import org.springframework.core.GenericCollectionTypeResolver; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.annotation.GraphQuery; +import org.springframework.data.graph.annotation.Query; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.neo4j.support.GenericTypeExtractor; @@ -30,9 +29,9 @@ import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; public class QueryFieldAccessorFactory implements FieldAccessorFactory { @Override public boolean accept(final Field f) { - final GraphQuery graphQuery = f.getAnnotation(GraphQuery.class); - return graphQuery != null - && !graphQuery.value().isEmpty(); + final Query query = f.getAnnotation(Query.class); + return query != null + && !query.value().isEmpty(); } @@ -54,15 +53,15 @@ public class QueryFieldAccessorFactory implements FieldAccessorFactory resolveTarget(GraphQuery graphQuery, Field field) { - if (!graphQuery.elementClass().equals(Object.class)) return graphQuery.elementClass(); + private Class resolveTarget(Query query, Field field) { + if (!query.elementClass().equals(Object.class)) return query.elementClass(); return GenericTypeExtractor.resolveFieldType(field); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactory.java index 0817ca594..319869601 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactory.java @@ -20,7 +20,7 @@ import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.graph.annotation.GraphQuery; +import org.springframework.data.graph.annotation.Query; import org.springframework.data.graph.annotation.NodeEntity; import org.springframework.data.graph.annotation.RelationshipEntity; import org.springframework.data.graph.core.NodeBacked; @@ -121,13 +121,13 @@ public class GraphRepositoryFactory extends RepositoryFactorySupport { static class GraphQueryMethod extends QueryMethod { private final Method method; - private final GraphQuery queryAnnotation; + private final Query queryAnnotation; private final String query; public GraphQueryMethod(Method method, RepositoryMetadata metadata, NamedQueries namedQueries) { super(method, metadata); this.method = method; - queryAnnotation = method.getAnnotation(GraphQuery.class); + queryAnnotation = method.getAnnotation(Query.class); this.query = queryAnnotation != null ? queryAnnotation.value() : getNamedQuery(namedQueries); if (this.query==null) throw new IllegalArgumentException("Could not extract a query from "+method); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java index 22f07954c..2f4d3b226 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java @@ -25,8 +25,8 @@ import org.neo4j.helpers.collection.ClosableIterable; import org.neo4j.index.impl.lucene.LuceneIndexImplementation; import org.neo4j.kernel.AbstractGraphDatabase; import org.springframework.core.convert.ConversionService; +import org.springframework.data.graph.annotation.Indexed; import org.springframework.data.graph.core.*; -import org.springframework.data.graph.neo4j.annotation.Indexed; import javax.transaction.Status; import javax.transaction.SystemException; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Attribute.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Attribute.java index c69ac3b85..08baceb3f 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Attribute.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Attribute.java @@ -16,8 +16,8 @@ package org.springframework.data.graph.neo4j; +import org.springframework.data.graph.annotation.Indexed; import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.neo4j.annotation.Indexed; /** * @author mh diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java index b44beab42..a1b2b7966 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java @@ -18,9 +18,9 @@ package org.springframework.data.graph.neo4j; import org.springframework.data.graph.annotation.EndNode; +import org.springframework.data.graph.annotation.Indexed; import org.springframework.data.graph.annotation.RelationshipEntity; import org.springframework.data.graph.annotation.StartNode; -import org.springframework.data.graph.neo4j.annotation.Indexed; import java.util.Date; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java index f33a766d1..c19cfb242 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java @@ -20,19 +20,11 @@ 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.graph.*; -import org.springframework.data.graph.annotation.GraphProperty; -import org.springframework.data.graph.annotation.GraphTraversal; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.graph.annotation.*; import org.springframework.data.graph.core.Direction; import org.springframework.data.graph.core.FieldTraversalDescriptionBuilder; import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.annotation.Indexed; - -import static org.springframework.data.graph.neo4j.Person.persistedPerson; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import org.springframework.data.graph.annotation.Indexed; import java.lang.reflect.Field; import java.util.Collection; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java index e7d498d70..4700512e7 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java @@ -18,7 +18,7 @@ package org.springframework.data.graph.neo4j; import org.springframework.data.graph.annotation.*; import org.springframework.data.graph.core.Direction; -import org.springframework.data.graph.neo4j.annotation.Indexed; +import org.springframework.data.graph.annotation.Indexed; import javax.validation.constraints.Max; import javax.validation.constraints.Min; @@ -67,16 +67,16 @@ public class Person { @RelatedToVia(type = "knows", elementClass = Friendship.class) private Iterable friendships; - @GraphQuery(value = "start person=(%d) match (person)<-[:boss]-(boss) return boss") + @Query(value = "start person=(%d) match (person)<-[:boss]-(boss) return boss") private Person bossByQuery; - @GraphQuery(value = "start person=(%d) match (person)<-[:boss]-(boss) return boss.%s",params = "name") + @Query(value = "start person=(%d) match (person)<-[:boss]-(boss) return boss.%s",params = "name") private String bossName; - @GraphQuery(value = "start person=(%d) match (person)<-[:persons]-(team)-[:persons]->(member) return member",elementClass = Person.class) + @Query(value = "start person=(%d) match (person)<-[:persons]-(team)-[:persons]->(member) return member",elementClass = Person.class) private Iterable otherTeamMembers; - @GraphQuery(value = "start person=(%d) match (person)<-[:persons]-(team)-[:persons]->(member) return member.name, member.age") + @Query(value = "start person=(%d) match (person)<-[:persons]-(team)-[:persons]->(member) return member.name, member.age") private Iterable> otherTeamMemberData; public String getBossName() { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonRepository.java index 88f03c7de..8a5e032ad 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonRepository.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonRepository.java @@ -19,7 +19,7 @@ package org.springframework.data.graph.neo4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.graph.annotation.GraphQuery; +import org.springframework.data.graph.annotation.Query; import org.springframework.data.graph.neo4j.repository.GraphRepository; import org.springframework.data.graph.neo4j.repository.NamedIndexRepository; @@ -31,19 +31,19 @@ import java.util.Map; */ public interface PersonRepository extends GraphRepository, NamedIndexRepository { - @GraphQuery("start team=(%d) match (team)-[:persons]->(member) return member") + @Query("start team=(%d) match (team)-[:persons]->(member) return member") Iterable findAllTeamMembers(Group team); - @GraphQuery("start team=(%d) match (team)-[:persons]->(member) return member.name,member.age") + @Query("start team=(%d) match (team)-[:persons]->(member) return member.name,member.age") Iterable> findAllTeamMemberData(Group team); - @GraphQuery("start person=(%d) match (boss)-[:boss]->(person) return boss") + @Query("start person=(%d) match (boss)-[:boss]->(person) return boss") Person findBoss(Person person); Group findTeam(Person person); - @GraphQuery("start team=(%d) match (team)-[:persons]->(member) return member") + @Query("start team=(%d) match (team)-[:persons]->(member) return member") Page findAllTeamMembersPaged(Pageable page, Group team); - @GraphQuery("start team=(%d) match (team)-[:persons]->(member) return member") + @Query("start team=(%d) match (team)-[:persons]->(member) return member") Iterable findAllTeamMembersSorted(Group team, Sort sort); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java index f3a06f8e5..09ffeb0c3 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java @@ -17,8 +17,8 @@ package org.springframework.data.graph.neo4j.partial; import org.springframework.data.graph.annotation.GraphProperty; +import org.springframework.data.graph.annotation.Indexed; import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.neo4j.annotation.Indexed; import javax.persistence.*; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java index fb53fe5dd..c1d38f0e2 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java @@ -16,13 +16,8 @@ package org.springframework.data.graph.neo4j.partial; -import org.neo4j.graphdb.DynamicRelationshipType; -import org.springframework.data.graph.*; -import org.springframework.data.graph.annotation.GraphProperty; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelatedTo; -import org.springframework.data.graph.annotation.RelatedToVia; -import org.springframework.data.graph.neo4j.annotation.Indexed; +import org.springframework.data.graph.annotation.*; +import org.springframework.data.graph.annotation.Indexed; import javax.persistence.*; import java.util.Set; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/repository/query/MatchClauseUnitTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/repository/query/MatchClauseUnitTest.java index b3230ade0..330d452f7 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/repository/query/MatchClauseUnitTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/repository/query/MatchClauseUnitTest.java @@ -24,10 +24,10 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; +import org.springframework.data.graph.annotation.Indexed; import org.springframework.data.graph.annotation.NodeEntity; import org.springframework.data.graph.annotation.RelatedTo; import org.springframework.data.graph.core.Direction; -import org.springframework.data.graph.neo4j.annotation.Indexed; import org.springframework.data.graph.neo4j.mapping.Neo4JMappingContext; import org.springframework.data.repository.query.parser.Property; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java index cf10c1068..4a065bee2 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java @@ -29,9 +29,9 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.Index; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.graph.annotation.Indexed; import org.springframework.data.graph.annotation.NodeEntity; import org.springframework.data.graph.neo4j.*; -import org.springframework.data.graph.neo4j.annotation.Indexed; import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.data.graph.neo4j.repository.GraphRepository; import org.springframework.data.graph.neo4j.support.node.Neo4jHelper;