diff --git a/kernel/src/main/java/org/neo4j/graphdb/Expander.java b/kernel/src/main/java/org/neo4j/graphdb/Expander.java index afc01276..8da1c100 100644 --- a/kernel/src/main/java/org/neo4j/graphdb/Expander.java +++ b/kernel/src/main/java/org/neo4j/graphdb/Expander.java @@ -68,8 +68,17 @@ public interface Expander extends RelationshipExpander /** * Add a {@link Relationship} filter. * + * @deprecated because of typo use {@link Expander#addRelationshipFilter(Predicate)} instead * @param filter filter to use * @return new instance */ Expander addRelationsipFilter( Predicate filter ); + + /** + * Add a {@link Relationship} filter. + * + * @param filter filter to use + * @return new instance + */ + Expander addRelationshipFilter( Predicate filter ); } diff --git a/kernel/src/main/java/org/neo4j/kernel/StandardExpander.java b/kernel/src/main/java/org/neo4j/kernel/StandardExpander.java index 272c2dd7..86953bf7 100644 --- a/kernel/src/main/java/org/neo4j/kernel/StandardExpander.java +++ b/kernel/src/main/java/org/neo4j/kernel/StandardExpander.java @@ -91,7 +91,7 @@ public StandardExpansion filterNodes( Predicate filter ) public StandardExpansion filterRelationships( Predicate filter ) { - return createNew( expander.addRelationsipFilter( filter ) ); + return createNew( expander.addRelationshipFilter( filter ) ); } public T getSingle() @@ -122,7 +122,7 @@ public StandardExpansion nodes() public StandardExpansion relationships() { - return new RelationsipExpansion( expander, start ); + return new RelationshipExpansion( expander, start ); } public StandardExpansion> pairs() @@ -131,10 +131,10 @@ public StandardExpansion> pairs() } } - private static final class RelationsipExpansion extends + private static final class RelationshipExpansion extends StandardExpansion { - RelationsipExpansion( StandardExpander expander, Node start ) + RelationshipExpansion( StandardExpander expander, Node start ) { super( expander, start ); } @@ -149,7 +149,7 @@ public String toString() StandardExpansion createNew( @SuppressWarnings( "hiding" ) StandardExpander expander ) { - return new RelationsipExpansion( expander, start ); + return new RelationshipExpansion( expander, start ); } @Override @@ -664,8 +664,15 @@ public StandardExpander addNodeFilter( Predicate filter ) public StandardExpander addRelationsipFilter( Predicate filter ) { - return new FilteringExpander( expander, append( filters, - new RelationshipFilter( filter ) ) ); + return addRelationshipFilter(filter); + } + + @Override + public StandardExpander addRelationshipFilter( + Predicate filter ) + { + return new FilteringExpander( expander, append( filters, + new RelationshipFilter( filter ) ) ); } @Override @@ -878,7 +885,7 @@ boolean exclude( Node start, Relationship item ) public final Expansion expand( Node start ) { - return new RelationsipExpansion( this, start ); + return new RelationshipExpansion( this, start ); } static T[] append( T[] array, T item ) @@ -960,7 +967,13 @@ public StandardExpander addNodeFilter( Predicate filter ) public StandardExpander addRelationsipFilter( Predicate filter ) { - return new FilteringExpander( this, new RelationshipFilter( filter ) ); + return addRelationshipFilter(filter); + } + + public StandardExpander addRelationshipFilter( + Predicate filter ) + { + return new FilteringExpander( this, new RelationshipFilter( filter ) ); } static StandardExpander wrap( RelationshipExpander expander )