diff --git a/community/graphdb-api/src/main/java/org/neo4j/graphdb/GraphDatabaseService.java b/community/graphdb-api/src/main/java/org/neo4j/graphdb/GraphDatabaseService.java index 3b19f62fa087b..57a49158652a6 100644 --- a/community/graphdb-api/src/main/java/org/neo4j/graphdb/GraphDatabaseService.java +++ b/community/graphdb-api/src/main/java/org/neo4j/graphdb/GraphDatabaseService.java @@ -146,33 +146,6 @@ public interface GraphDatabaseService */ ResourceIterator findNodes( Label label ); - /** - * Returns all nodes having the label, and the wanted property value. - * If an online index is found, it will be used to look up the requested - * nodes. - *

- * If no indexes exist for the label/property combination, the database will - * scan all labeled nodes looking for the property value. - *

- * Note that equality for values do not follow the rules of Java. This means that the number 42 is equals to all - * other 42 numbers, indifferently of if they are encoded as Integer, Long, Float, Short, Byte or Double. - *

- * Same rules follow Character and String - the Character 'A' is equal to the String 'A'. - *

- * Finally - arrays also follow these rules. An int[] {1,2,3} is equal to a double[] {1.0, 2.0, 3.0} - *

- * Please ensure that the returned {@link ResourceIterable} is closed correctly and as soon as possible - * inside your transaction to avoid potential blocking of write operations. - * - * @param label consider nodes with this label - * @param key required property key - * @param value required property value - * @return an iterable containing all matching nodes. See {@link ResourceIterable} for responsibilities. - * @deprecated Use {@link #findNodes(Label, String, Object)} - */ - @Deprecated - ResourceIterable findNodesByLabelAndProperty( Label label, String key, Object value ); - /** * Returns all relationship types currently in the underlying store. * Relationship types are added to the underlying store the first time they diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java index ab475a9e32b34..03e3cde13dbb4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java @@ -501,13 +501,6 @@ public ResourceIterator findNodes( final Label myLabel ) return allNodesWithLabel( myLabel ); } - @Override - public ResourceIterable findNodesByLabelAndProperty( final Label myLabel, final String key, - final Object value ) - { - return () -> nodesByLabelAndProperty( myLabel, key, value ); - } - private ResourceIterator nodesByLabelAndProperty( Label myLabel, String key, Object value ) { Statement statement = spi.currentStatement(); diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java index 4b3bf2f8276e3..304ebdc357928 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java @@ -82,20 +82,6 @@ public void call( GraphDatabaseService graphDatabaseService ) } }; - static final FacadeMethod FIND_NODES_BY_LABEL_AND_PROPERTY = - new FacadeMethod( - "ResourceIterator findNodes( Label label, String key, Object value )" ) - { - @Override - public void call( GraphDatabaseService graphDatabaseService ) - { - for ( Node node : graphDatabaseService.findNodesByLabelAndProperty( label( "bar" ), "baz", 23 ) ) - { - - } - } - }; - static final FacadeMethod FIND_NODES_BY_LABEL_AND_PROPERTY_DEPRECATED = new FacadeMethod( "ResourceIterator findNodeByLabelAndProperty( Label label, String key, Object value )" ) @@ -171,7 +157,6 @@ public void call( GraphDatabaseService graphDatabaseService ) GET_NODE_BY_ID, GET_RELATIONSHIP_BY_ID, GET_ALL_NODES, - FIND_NODES_BY_LABEL_AND_PROPERTY, FIND_NODES_BY_LABEL_AND_PROPERTY_DEPRECATED, FIND_NODES_BY_LABEL, GET_ALL_RELATIONSHIP_TYPES, diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java index af5ef2866bdb6..e4e88dd3fa504 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java @@ -29,7 +29,7 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.graphdb.schema.IndexDefinition; -import org.neo4j.helpers.collection.Iterables; +import org.neo4j.helpers.collection.Iterators; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; @@ -475,8 +475,8 @@ public void shouldAddIndexedPropertyToNodeWithDynamicLabels() String key = propertyKeyPrefix + i; String value = propertyValuePrefix + i; - ResourceIterable nodes = db.findNodesByLabelAndProperty( label, key, value ); - assertEquals( 1, Iterables.count( nodes ) ); + ResourceIterator nodes = db.findNodes( label, key, value ); + assertEquals( 1, Iterators.count( nodes ) ); } tx.success(); } diff --git a/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java index 3dd4f2032ef84..9c7843fee47dd 100644 --- a/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java @@ -420,12 +420,6 @@ public ResourceIterator findNodes( Label label ) return database.findNodes( label ); } - @Override - public ResourceIterable findNodesByLabelAndProperty( Label label, String key, Object value ) - { - return database.findNodesByLabelAndProperty( label, key, value ); - } - @Override public ResourceIterable getAllRelationshipTypes() { diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java b/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java index 9235028f8c349..84ebee5d866bb 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java @@ -1063,10 +1063,4 @@ public ResourceIterator findNodes( Label label ) { return actual.findNodes( label ); } - - @Override - public ResourceIterable findNodesByLabelAndProperty( Label label, String key, Object value ) - { - return actual.findNodesByLabelAndProperty( label, key, value ); - } }