Remove deprecated findNodesByLabelAndProperty from GraphDatabaseService

community/graphdb-api/src/main/java/org/neo4j/graphdb/GraphDatabaseService.java

@@ -146,33 +146,6 @@ public interface GraphDatabaseService
      */
     ResourceIterator<Node> 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.
-     * <p>
-     * If no indexes exist for the label/property combination, the database will
-     * scan all labeled nodes looking for the property value.
-     * <p>
-     * 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.
-     * <p>
-     * Same rules follow Character and String - the Character 'A' is equal to the String 'A'.
-     * <p>
-     * Finally - arrays also follow these rules. An int[] {1,2,3} is equal to a double[] {1.0, 2.0, 3.0}
-     * <p>
-     * 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<Node> 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

community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java

@@ -501,13 +501,6 @@ public ResourceIterator<Node> findNodes( final Label myLabel )
         return allNodesWithLabel( myLabel );
     }
 
-    @Override
-    public ResourceIterable<Node> findNodesByLabelAndProperty( final Label myLabel, final String key,
-            final Object value )
-    {
-        return () -> nodesByLabelAndProperty( myLabel, key, value );
-    }
-
     private ResourceIterator<Node> nodesByLabelAndProperty( Label myLabel, String key, Object value )
     {
         Statement statement = spi.currentStatement();

community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java

@@ -82,20 +82,6 @@ public void call( GraphDatabaseService graphDatabaseService )
         }
     };
 
-    static final FacadeMethod<GraphDatabaseService> FIND_NODES_BY_LABEL_AND_PROPERTY =
-        new FacadeMethod<GraphDatabaseService>(
-                "ResourceIterator<Node> 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<GraphDatabaseService> FIND_NODES_BY_LABEL_AND_PROPERTY_DEPRECATED =
         new FacadeMethod<GraphDatabaseService>(
                 "ResourceIterator<Node> 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,

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<Node> nodes = db.findNodesByLabelAndProperty( label, key, value );
-                assertEquals( 1, Iterables.count( nodes ) );
+                ResourceIterator<Node> nodes = db.findNodes( label, key, value );
+                assertEquals( 1, Iterators.count( nodes ) );
             }
             tx.success();
         }

community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java

@@ -420,12 +420,6 @@ public ResourceIterator<Node> findNodes( Label label )
         return database.findNodes( label );
     }
 
-    @Override
-    public ResourceIterable<Node> findNodesByLabelAndProperty( Label label, String key, Object value )
-    {
-        return database.findNodesByLabelAndProperty( label, key, value );
-    }
-
     @Override
     public ResourceIterable<RelationshipType> getAllRelationshipTypes()
     {

community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java

@@ -1063,10 +1063,4 @@ public ResourceIterator<Node> findNodes( Label label )
     {
         return actual.findNodes( label );
     }
-
-    @Override
-    public ResourceIterable<Node> findNodesByLabelAndProperty( Label label, String key, Object value )
-    {
-        return actual.findNodesByLabelAndProperty( label, key, value );
-    }
 }