refactored repository queries

added support for like, not null, property-exists and index-query lookups for derived queries
fixed delete* methods in repositories
added singleOrNull() method to fluent result API

.gitignore

@@ -14,4 +14,4 @@ src/ant/.ant-targets-upload-dist.xml
 *.ipr
 *.iws
 spring-data-neo4j-examples/imdb/log.roo
-
+src/docbkx/snippets

spring-data-neo4j-examples/cineasts/src/main/java/org/neo4j/cineasts/domain/Movie.java

@@ -31,7 +31,7 @@ public class Movie {
     @RelatedTo(type="DIRECTED", direction = INCOMING)
     Person director;
 
-    @RelatedTo(elementClass = Person.class, type = "ACTS_IN", direction = INCOMING)
+    @RelatedTo(type = "ACTS_IN", direction = INCOMING)
     Set<Person> actors;
 
     @RelatedToVia(elementClass = Role.class, type = "ACTS_IN", direction = INCOMING)

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringEndResult.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.neo4j.rest;
 
+import org.neo4j.helpers.collection.IteratorUtil;
 import org.neo4j.rest.graphdb.util.ConvertedResult;
 import org.springframework.data.neo4j.conversion.EndResult;
 
@@ -32,6 +33,11 @@ public R single() {
         return result.single();
     }
 
+    @Override
+    public R singleOrNull() {
+        return IteratorUtil.singleOrNull(result);
+    }
+
     @Override
     public void handle(final org.springframework.data.neo4j.conversion.Handler<R> rHandler) {
         result.handle(new SpringHandler<R>(rHandler));

spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestResult.java

@@ -55,6 +55,11 @@ public Iterator<T> iterator() {
     }
 
 
+    @SuppressWarnings({"unchecked"})
+    @Override
+    public T singleOrNull() {
+        return (T) to(Object.class).singleOrNull();
+    }
 
     @SuppressWarnings("unchecked")
     @Override

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/EndResult.java

@@ -22,5 +22,7 @@
 */
 public interface EndResult<R> extends Iterable<R> {
     R single();
+    R singleOrNull();
     void handle(Handler<R> handler);
+
 }

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResultBuilder.java

@@ -18,6 +18,7 @@
 
 import org.neo4j.graphdb.index.IndexHits;
 import org.neo4j.helpers.collection.ClosableIterable;
+import org.neo4j.helpers.collection.IteratorUtil;
 import org.neo4j.helpers.collection.IteratorWrapper;
 
 import java.util.Iterator;
@@ -52,12 +53,15 @@ public <R> EndResult<R> to(Class<R> type) {
     @Override
     public T single() {
         try {
-            final Iterator<T> it = result.iterator();
-            if (!it.hasNext()) throw new IllegalStateException("Expected at least one result, got none.");
-            final T value = it.next();
-            if (it.hasNext())
-                throw new IllegalStateException("Expected at least one result, got more than one.");
-            return value;
+            return IteratorUtil.single(result);
+        } finally {
+            closeIfNeeded();
+        }
+    }
+    @Override
+    public T singleOrNull() {
+        try {
+            return IteratorUtil.singleOrNull(result);
         } finally {
             closeIfNeeded();
         }
@@ -69,11 +73,16 @@ public <R> EndResult<R> to(final Class<R> type, final ResultConverter<T, R> resu
             @Override
             public R single() {
                 try {
-                    final Iterator<T> it = result.iterator();
-                    if (!it.hasNext()) throw new IllegalStateException("Expected at least one result, got none.");
-                    final T value = it.next();
-                    if (it.hasNext())
-                        throw new IllegalStateException("Expected at least one result, got more than one.");
+                    final T value = IteratorUtil.single(result);
+                    return resultConverter.convert(value, type);
+                } finally {
+                    closeIfNeeded();
+                }
+            }
+            @Override
+            public R singleOrNull() {
+                try {
+                    final T value = IteratorUtil.singleOrNull(result);
                     return resultConverter.convert(value, type);
                 } finally {
                     closeIfNeeded();

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/IndexInfo.java

@@ -27,11 +27,13 @@ public class IndexInfo {
     private IndexType indexType;
     private final String fieldName;
     private final Indexed.Level level;
+    private String indexKey;
 
     public IndexInfo(Indexed annotation, Neo4jPersistentProperty property) {
         this.indexName = determineIndexName(annotation,property);
         this.indexType = annotation.indexType();
         fieldName = annotation.fieldName();
+        this.indexKey = fieldName.isEmpty() ? property.getNeo4jPropertyName() : fieldName;
         level = annotation.level();
     }
 
@@ -50,4 +52,12 @@ public String getIndexName() {
     public IndexType getIndexType() {
         return indexType;
     }
+
+    public boolean isFullText() {
+        return indexType == IndexType.FULLTEXT;
+    }
+
+    public String getIndexKey() {
+        return indexKey;
+    }
 }

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java

@@ -73,4 +73,6 @@ public interface Neo4jPersistentProperty extends PersistentProperty<Neo4jPersist
     Object getValue(final Object entity);
 
     Neo4jPersistentEntity<?> getOwner();
+
+    String getIndexKey();
 }

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java

@@ -293,16 +293,7 @@ public boolean exists(Long id) {
 
     @Override
     public void delete(T entity) {
-        final PropertyContainer state = template.getPersistentState(entity);
-        if (state instanceof Node) {
-            Node node = (Node) state;
-            node.delete();
-        }
-        if (state instanceof Relationship) {
-            Relationship relationship = (Relationship) state;
-            relationship.delete();
-        }
-
+        template.delete(entity);
     }
 
     @Override