From b27980c2422db04b3eb91e188c1ae4db168ef25f Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Thu, 7 Apr 2011 13:08:54 +0200 Subject: [PATCH] renamed base repository interfaces --- README.md | 21 +++++++++---------- .../config/DataGraphNamespaceHandler.java | 4 ++-- .../TraversalFieldAccessorFactory.java | 2 +- .../repository/AbstractGraphRepository.java | 2 +- ...aphRepository.java => CRUDRepository.java} | 2 +- .../DirectGraphRepositoryFactory.java | 13 ++++++------ .../neo4j/repository/GraphRepository.java | 2 +- .../GraphRepositoryFactoryBean.java | 2 +- ...ueryExecutor.java => IndexRepository.java} | 2 +- ...xecutor.java => NamedIndexRepository.java} | 2 +- ...Executor.java => TraversalRepository.java} | 2 +- .../data/graph/neo4j/GroupRepository.java | 4 ++-- .../data/graph/neo4j/PersonRepository.java | 4 ++-- .../data/graph/neo4j/support/IndexTest.java | 6 +++--- .../ModificationOutsideOfTransactionTest.java | 2 +- .../support/NodeEntityInstantiationTest.java | 2 +- ...nceNodeTypeRepresentationStrategyTest.java | 10 ++++----- .../graph/neo4j/support/TraversalTest.java | 2 +- .../reference/programming-model/indexing.xml | 6 +++--- .../programming-model/repositories.xml | 14 ++++++------- src/docbkx/tutorial/indexing.xml | 5 ++--- src/docbkx/tutorial/repository.xml | 2 +- src/docbkx/tutorial/security.xml | 2 +- 23 files changed, 55 insertions(+), 58 deletions(-) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/{CRUDGraphRepository.java => CRUDRepository.java} (97%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/{IndexQueryExecutor.java => IndexRepository.java} (94%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/{NamedIndexQueryExecutor.java => NamedIndexRepository.java} (94%) rename spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/{TraversalQueryExecutor.java => TraversalRepository.java} (95%) diff --git a/README.md b/README.md index 7061d17c4..6de5f4941 100644 --- a/README.md +++ b/README.md @@ -95,11 +95,13 @@ For more detailed questions, use the [forum](http://forum.springsource.org/forum * Create a repository or service to perform typical operations on your entities. The FinderFactory and Finder helper classes make searching easy for common use cases. The complete functionality is covered in the [reference manual](http://static.springsource.org/spring-data/data-graph/docs/current/reference/html/#programming-model). + public interface WorldRepository extends GraphRepository, NamedIndexRepository {} + @Repository - public class WorldRepository { + public class WorldRepositoryImpl implements WorldRepositoryExtension { @Autowired - private FinderFactory graphRepositoryFactory; + private WorldRepository worldRepository; @Transactional public Collection makeSomeWorlds() { @@ -117,31 +119,28 @@ For more detailed questions, use the [forum](http://forum.springsource.org/forum return new World(name,moons).persist(); } - private NodeFinder graphRepository() { - return graphRepositoryFactory.createNodeEntityFinder(World.class); - } public World findWorldIdentifiedBy( long id ) { - return graphRepository().findById( id ); + return worldRepository.findById( id ); } public Iterable findAllWorlds() { - return graphRepository().findAll(); + return worldRepository.findAll(); } public long countWorlds() { - return graphRepository().count(); + return worldRepository.count(); } public World findWorldNamed( String name ) { - return graphRepository().findByPropertyValue( null, "name", name ); + return worldRepository.findByPropertyValue( "name", name ); } public World findWorldWithMoons( long moonCount ) { - return graphRepository().findByPropertyValue( "moons", "moons", moonCount ); + return worldRepository.findByPropertyValue( "moons", "moons", moonCount ); } public Iterable findWorldsWithMoons( int moonCount ) { - return graphRepository().findAllByPropertyValue( "moons", "moons", moonCount ); + return worldRepository.findAllByPropertyValue( "moons", "moons", moonCount ); } } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandler.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandler.java index 019566e9f..bedbd82f7 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandler.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandler.java @@ -24,7 +24,7 @@ package org.springframework.data.graph.neo4j.config; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -import org.springframework.data.graph.neo4j.repository.CRUDGraphRepository; +import org.springframework.data.graph.neo4j.repository.CRUDRepository; import org.springframework.data.graph.neo4j.repository.GraphRepositoryFactoryBean; import org.springframework.data.repository.config.*; import org.springframework.util.StringUtils; @@ -76,7 +76,7 @@ public class DataGraphNamespaceHandler extends NamespaceHandlerSupport { @Override public Class getRepositoryBaseInterface() { - return CRUDGraphRepository.class; + return CRUDRepository.class; } public String getGraphDatabaseContextRef() { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java index 06faac2f0..e70c162cd 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java @@ -86,7 +86,7 @@ public class TraversalFieldAccessorFactory implements FieldAccessorFactory finder = graphRepositoryFactory.createNodeEntityRepository(target); + final GraphRepository finder = graphRepositoryFactory.createGraphRepository(target); final TraversalDescription traversalDescription = fieldTraversalDescriptionBuilder.build(nodeBacked,field,params); return doReturn(finder.findAllByTraversal(nodeBacked, traversalDescription)); } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/AbstractGraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/AbstractGraphRepository.java index 67426458f..3e6956462 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/AbstractGraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/AbstractGraphRepository.java @@ -43,7 +43,7 @@ import java.util.List; * @param Type of backing state, either Node or Relationship */ @org.springframework.stereotype.Repository -public abstract class AbstractGraphRepository> implements GraphRepository, CRUDGraphRepository, NamedIndexQueryExecutor { +public abstract class AbstractGraphRepository> implements GraphRepository, NamedIndexRepository { public static final ClosableIterable EMPTY_CLOSABLE_ITERABLE = new ClosableIterable() { @Override public void close() { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDGraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDRepository.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDGraphRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDRepository.java index 01ea079cb..83837db2b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDGraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDRepository.java @@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Transactional; * CRUD interface for graph repositories, used as base repository for crud operations */ @NoRepositoryBean -public interface CRUDGraphRepository> extends PagingAndSortingRepository { +public interface CRUDRepository> extends PagingAndSortingRepository { /** * persists an entity by forwarding to entity.persist() diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/DirectGraphRepositoryFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/DirectGraphRepositoryFactory.java index ff05e4b3b..b14ff5a85 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/DirectGraphRepositoryFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/DirectGraphRepositoryFactory.java @@ -16,6 +16,7 @@ package org.springframework.data.graph.neo4j.repository; +import org.springframework.data.graph.core.GraphBacked; import org.springframework.data.graph.core.NodeBacked; import org.springframework.data.graph.core.RelationshipBacked; import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; @@ -31,12 +32,10 @@ public class DirectGraphRepositoryFactory { this.graphDatabaseContext = graphDatabaseContext; } - public GraphRepository createNodeEntityRepository(Class clazz) { - return new NodeGraphRepository(clazz, graphDatabaseContext); + @SuppressWarnings({"unchecked"}) + public > GraphRepository createGraphRepository(Class clazz) { + if (NodeBacked.class.isAssignableFrom(clazz)) return new NodeGraphRepository(clazz, graphDatabaseContext); + if (RelationshipBacked.class.isAssignableFrom(clazz)) return new RelationshipGraphRepository(clazz, graphDatabaseContext); + throw new IllegalArgumentException("Can't create graph repository for non graph entity of type "+clazz); } - - public GraphRepository createRelationshipEntityRepository(Class clazz) { - return new RelationshipGraphRepository(clazz, graphDatabaseContext); - } - } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepository.java index 60a46b646..6f503f856 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepository.java @@ -24,6 +24,6 @@ import org.springframework.data.repository.NoRepositoryBean; * @since 12.01.11 */ @NoRepositoryBean -public interface GraphRepository> extends CRUDGraphRepository, IndexQueryExecutor, TraversalQueryExecutor { +public interface GraphRepository> extends CRUDRepository, IndexRepository, TraversalRepository { } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactoryBean.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactoryBean.java index 6e1e6718b..523dca85b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactoryBean.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactoryBean.java @@ -27,7 +27,7 @@ import org.springframework.util.Assert; * @author mh * @since 28.03.11 */ -public class GraphRepositoryFactoryBean, T extends GraphBacked> +public class GraphRepositoryFactoryBean, T extends GraphBacked> extends TransactionalRepositoryFactoryBeanSupport { private GraphDatabaseContext graphDatabaseContext; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexQueryExecutor.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexRepository.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexQueryExecutor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexRepository.java index f1f6942bd..99adc41e4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexQueryExecutor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexRepository.java @@ -23,7 +23,7 @@ import org.springframework.data.graph.core.GraphBacked; * @author mh * @since 29.03.11 */ -public interface IndexQueryExecutor> { +public interface IndexRepository> { T findByPropertyValue(String property, Object value); ClosableIterable findAllByPropertyValue(String property, Object value); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexQueryExecutor.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexRepository.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexQueryExecutor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexRepository.java index 58bbfb64c..3e881ffa0 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexQueryExecutor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexRepository.java @@ -23,7 +23,7 @@ import org.springframework.data.graph.core.GraphBacked; * @author mh * @since 29.03.11 */ -public interface NamedIndexQueryExecutor> { +public interface NamedIndexRepository> { T findByPropertyValue(String indexName, String property, Object value); ClosableIterable findAllByPropertyValue(String indexName, String property, Object value); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalQueryExecutor.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalRepository.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalQueryExecutor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalRepository.java index e9565327f..8d988c9ec 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalQueryExecutor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalRepository.java @@ -24,7 +24,7 @@ import org.springframework.data.graph.core.NodeBacked; * @author mh * @since 29.03.11 */ -public interface TraversalQueryExecutor> { +public interface TraversalRepository> { /** * Traversal based finder that returns a lazy Iterable over the traversal results * diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/GroupRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/GroupRepository.java index 0f7585dc8..fb3c0f6d8 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/GroupRepository.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/GroupRepository.java @@ -16,12 +16,12 @@ package org.springframework.data.graph.neo4j; -import org.springframework.data.graph.neo4j.repository.NamedIndexQueryExecutor; +import org.springframework.data.graph.neo4j.repository.NamedIndexRepository; import org.springframework.data.graph.neo4j.repository.GraphRepository; /** * @author mh * @since 29.03.11 */ -public interface GroupRepository extends GraphRepository, NamedIndexQueryExecutor { +public interface GroupRepository extends GraphRepository, NamedIndexRepository { } 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 6a0c5916f..8fd02b922 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 @@ -16,12 +16,12 @@ package org.springframework.data.graph.neo4j; -import org.springframework.data.graph.neo4j.repository.NamedIndexQueryExecutor; +import org.springframework.data.graph.neo4j.repository.NamedIndexRepository; import org.springframework.data.graph.neo4j.repository.GraphRepository; /** * @author mh * @since 29.03.11 */ -public interface PersonRepository extends GraphRepository, NamedIndexQueryExecutor { +public interface PersonRepository extends GraphRepository, NamedIndexRepository { } 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 cf16d91ec..259adaf6f 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 @@ -69,8 +69,8 @@ public class IndexTest { @Before public void setUp() throws Exception { - groupFinder = graphRepositoryFactory.createNodeEntityRepository(Group.class); - personFinder = graphRepositoryFactory.createNodeEntityRepository(Person.class); + groupFinder = graphRepositoryFactory.createGraphRepository(Group.class); + personFinder = graphRepositoryFactory.createGraphRepository(Person.class); } @BeforeTransaction @@ -85,7 +85,7 @@ public class IndexTest { Person p2 = persistedPerson(NAME_VALUE2, 25); Friendship friendship = p.knows(p2); friendship.setYears(1); - GraphRepository friendshipFinder = graphRepositoryFactory.createRelationshipEntityRepository(Friendship.class); + GraphRepository friendshipFinder = graphRepositoryFactory.createGraphRepository(Friendship.class); assertEquals(friendship, friendshipFinder.findByPropertyValue("Friendship.years", 1)); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ModificationOutsideOfTransactionTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ModificationOutsideOfTransactionTest.java index 4207eecf9..a24a49209 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ModificationOutsideOfTransactionTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ModificationOutsideOfTransactionTest.java @@ -195,7 +195,7 @@ public class ModificationOutsideOfTransactionTest @Test public void testFindOutsideTransaction() { - final GraphRepository finder = graphRepositoryFactory.createNodeEntityRepository(Person.class); + final GraphRepository finder = graphRepositoryFactory.createGraphRepository(Person.class); assertEquals( false, finder.findAll().iterator().hasNext() ); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityInstantiationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityInstantiationTest.java index 063e06d1f..986dd7205 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityInstantiationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityInstantiationTest.java @@ -71,7 +71,7 @@ import static org.springframework.data.graph.neo4j.Person.persistedPerson; Person person2 = graphDatabaseContext.createEntityFromState(node,Person.class); assertEquals("Rod", person2.getName()); - GraphRepository finder = graphRepositoryFactory.createNodeEntityRepository(Person.class); + GraphRepository finder = graphRepositoryFactory.createGraphRepository(Person.class); Person found = finder.findOne(nodeId); assertEquals("Rod", found.getName()); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java index 051ead73a..40a6b1b21 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java @@ -187,7 +187,7 @@ public class SubReferenceNodeTypeRepresentationStrategyTest { public void testInstantiateConcreteClassWithFinder() { log.debug("testInstantiateConcreteClassWithFinder"); Volvo v=new Volvo().persist(); - GraphRepository finder = graphRepositoryFactory.createNodeEntityRepository(Car.class); + GraphRepository finder = graphRepositoryFactory.createGraphRepository(Car.class); assertEquals("Wrong concrete class.", Volvo.class, finder.findAll().iterator().next().getClass()); } @@ -199,16 +199,16 @@ public class SubReferenceNodeTypeRepresentationStrategyTest { log.warn("Created volvo"); new Toyota().persist(); log.warn("Created volvo"); - assertEquals("Wrong count for Volvo.", (Long)1L, graphRepositoryFactory.createNodeEntityRepository(Volvo.class).count()); - assertEquals("Wrong count for Toyota.", (Long)1L, graphRepositoryFactory.createNodeEntityRepository(Toyota.class).count()); - assertEquals("Wrong count for Car.", (Long)2L, graphRepositoryFactory.createNodeEntityRepository(Car.class).count()); + assertEquals("Wrong count for Volvo.", (Long)1L, graphRepositoryFactory.createGraphRepository(Volvo.class).count()); + assertEquals("Wrong count for Toyota.", (Long)1L, graphRepositoryFactory.createGraphRepository(Toyota.class).count()); + assertEquals("Wrong count for Car.", (Long)2L, graphRepositoryFactory.createGraphRepository(Car.class).count()); } @Test @Transactional public void testCountClasses() { persistedPerson("Michael", 36); persistedPerson("David", 25); - assertEquals("Wrong Person instance count.", (Long)2L, graphRepositoryFactory.createNodeEntityRepository(Person.class).count()); + assertEquals("Wrong Person instance count.", (Long)2L, graphRepositoryFactory.createGraphRepository(Person.class).count()); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java index b8686b3ea..137d3eb62 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java @@ -114,7 +114,7 @@ public class TraversalTest { @Test @Transactional public void testTraverseFromGroupToPeopleWithFinder() { - final GraphRepository finder = graphRepositoryFactory.createNodeEntityRepository(Person.class); + final GraphRepository finder = graphRepositoryFactory.createGraphRepository(Person.class); Person p = persistedPerson("Michael", 35); Group group = new Group().persist(); group.setName("dev"); diff --git a/src/docbkx/reference/programming-model/indexing.xml b/src/docbkx/reference/programming-model/indexing.xml index c8a1c3cf8..79ed0c768 100644 --- a/src/docbkx/reference/programming-model/indexing.xml +++ b/src/docbkx/reference/programming-model/indexing.xml @@ -44,13 +44,13 @@ class Person { } -GraphRepository graphRepository = graphRepositoryFactory.createNodeEntityRepository(Person.class); +GraphRepository graphRepository = graphRepositoryFactory.createGraphRepository(Person.class); // exact graphRepository Person mark = graphRepository.findByProperyValue("people","name","mark"); // numeric range queries -for (Person middleAgedDeveloper : graphRepository.findAllByRange(null, "age", 20, 40)) { +for (Person middleAgedDeveloper : graphRepository.findAllByRange( "age", 20, 40)) { Developer developer=middleAgedDeveloper.projectTo(Developer.class); } ]]> @@ -76,7 +76,7 @@ class Person { String name; } -GraphRepository graphRepository = graphRepositoryFactory.createNodeEntityRepository(Person.class); +GraphRepository graphRepository = graphRepositoryFactory.createGraphRepository(Person.class); // exact graphRepository Person mark = graphRepository.findAllByQuery("people-search","name","ma*"); diff --git a/src/docbkx/reference/programming-model/repositories.xml b/src/docbkx/reference/programming-model/repositories.xml index a54713bbb..1fb999be9 100644 --- a/src/docbkx/reference/programming-model/repositories.xml +++ b/src/docbkx/reference/programming-model/repositories.xml @@ -94,7 +94,7 @@ Using GraphRepositories graphRepository = graphRepositoryFactory.createNodeEntityRepository(Person.class); +GraphRepository graphRepository = graphRepositoryFactory.createGraphRepository(Person.class); Person michael = graphRepository.save(new Person("Michael",36)); @@ -102,13 +102,13 @@ Person dave=graphRepository.findOne(123); Long numberOfPeople = graphRepository.count(); -Person mark = graphRepository.findByPropertyValue(null,"name", "mark"); +Person mark = graphRepository.findByPropertyValue("name", "mark"); -Iterable devs = graphRepository.findAllByProperyValue(null, "occupation","developer"); +Iterable devs = graphRepository.findAllByProperyValue("occupation","developer"); -Iterable middleAgedPeople = graphRepository.findAllByRange(null, "age",20,40); +Iterable middleAgedPeople = graphRepository.findAllByRange("age",20,40); -Iterable aTeam = graphRepository.findAllByQuery(null, "name","A*"); +Iterable aTeam = graphRepository.findAllByQuery("name","A*"); Iterable davesFriends = graphRepository.findAllByTraversal(dave, Traversal.description().pruneAfterDepth(1) @@ -155,9 +155,9 @@ PersonRepository personRepository; Person dave=personRepository.findOne(123); - Iterable devs = personRepository.findAllByProperyValue(null, "occupation","developer"); + Iterable devs = personRepository.findAllByProperyValue("occupation","developer"); - Iterable aTeam = graphRepository.findAllByQuery(null, "name","A*"); + Iterable aTeam = graphRepository.findAllByQuery( "name","A*"); Iterable friends = personRepository.findFriends(dave); ]]> diff --git a/src/docbkx/tutorial/indexing.xml b/src/docbkx/tutorial/indexing.xml index e36d32e6a..2c7de6579 100644 --- a/src/docbkx/tutorial/indexing.xml +++ b/src/docbkx/tutorial/indexing.xml @@ -24,9 +24,8 @@ @Test public void persistedMovieShouldBeRetrievableFromGraphDb() { int id = 1; Movie forrestGump = new Movie(id, "Forrest Gump", 1994).persist(); - GraphRepository movieRepository = graphRepositoryFactory.createNodeEntityRepository(Movie.class); - // REMINDER, the "null" stands for an optional index name - Movie retrievedMovie = movieRepository.findByPropertyValue(null, "id", id); + GraphRepository movieRepository = graphRepositoryFactory.createGraphRepository(Movie.class); + Movie retrievedMovie = movieRepository.findByPropertyValue("id", id); assertEqual("retrieved movie matches persisted one", forrestGump, retrievedMovie); assertEqual("retrieved movie title matches", "Forrest Gump", retrievedMovie.getTitle()); } diff --git a/src/docbkx/tutorial/repository.xml b/src/docbkx/tutorial/repository.xml index e2d6a1d5e..e9648c35a 100644 --- a/src/docbkx/tutorial/repository.xml +++ b/src/docbkx/tutorial/repository.xml @@ -33,7 +33,7 @@ public class CineastsRepostory { @Autowired MovieRepository movieRepository; public Movie getMovie(int id) { - return movieRepository.findByPropertyValue(null,"id", id); + return movieRepository.findByPropertyValue("id", id); } } ]]> diff --git a/src/docbkx/tutorial/security.xml b/src/docbkx/tutorial/security.xml index 501d8e7ec..3322f85c1 100644 --- a/src/docbkx/tutorial/security.xml +++ b/src/docbkx/tutorial/security.xml @@ -103,7 +103,7 @@ public class CineastsUserDetailsService implements UserDetailsService, Initializ } public User findUser(String login) { - return userRepository.findByPropertyValue(null,"login",login); + return userRepository.findByPropertyValue("login",login); } public User getUserFromSession() { SecurityContext context = SecurityContextHolder.getContext();