From a9a4e094789a3983e39814ece522179393a8fc0b Mon Sep 17 00:00:00 2001
From: Chris Vest <mr.chrisvest@gmail.com>
Date: Tue, 31 Jul 2018 17:30:34 +0200
Subject: [PATCH] Simplify the FacadeMethod tests and extend the transaction
 check to more facade methods.

---
 .../neo4j/graphdb/NodeIndexFacadeMethods.java |  96 +------
 .../RelationshipIndexFacadeMethods.java       | 132 +--------
 .../ConstraintCreatorFacadeMethods.java       |  21 +-
 .../ConstraintDefinitionFacadeMethods.java    |  54 +---
 .../GraphDatabaseServiceFacadeMethods.java    | 160 ++---------
 .../graphdb/IndexCreatorFacadeMethods.java    |  21 +-
 .../graphdb/IndexDefinitionFacadeMethods.java |  48 +---
 .../graphdb/IndexManagerFacadeMethods.java    |  93 +------
 .../org/neo4j/graphdb/NodeFacadeMethods.java  | 257 ++----------------
 .../graphdb/RelationshipFacadeMethods.java    | 153 ++---------
 .../neo4j/graphdb/SchemaFacadeMethods.java    | 108 +-------
 .../impl/coreapi/schema/SchemaImplTest.java   |   5 +-
 .../kernel/impl/core/RelationshipProxy.java   |   3 +
 .../impl/coreapi/schema/SchemaImpl.java       |   3 -
 .../impl/factory/GraphDatabaseFacade.java     |   1 +
 .../java/org/neo4j/graphdb/FacadeMethod.java  |  30 +-
 16 files changed, 148 insertions(+), 1037 deletions(-)

diff --git a/community/community-it/index-it/src/test/java/org/neo4j/graphdb/NodeIndexFacadeMethods.java b/community/community-it/index-it/src/test/java/org/neo4j/graphdb/NodeIndexFacadeMethods.java
index d52f16f1f262..3daa158c21a4 100644
--- a/community/community-it/index-it/src/test/java/org/neo4j/graphdb/NodeIndexFacadeMethods.java
+++ b/community/community-it/index-it/src/test/java/org/neo4j/graphdb/NodeIndexFacadeMethods.java
@@ -26,93 +26,15 @@
 
 public class NodeIndexFacadeMethods
 {
-    private static final FacadeMethod<Index<Node>> GET = new FacadeMethod<Index<Node>>( "IndexHits<T> get( String " +
-            "key, Object value )" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.get( "foo", "bar" );
-        }
-    };
-
-    private static final FacadeMethod<Index<Node>> QUERY_BY_KEY = new FacadeMethod<Index<Node>>( "IndexHits<T> query(" +
-            " String key, Object queryOrQueryObject )" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.query( "foo", "bar" );
-        }
-    };
-
-    private static final FacadeMethod<Index<Node>> QUERY = new FacadeMethod<Index<Node>>( "IndexHits<T> query( Object" +
-            " queryOrQueryObject )" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.query( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<Index<Node>> ADD = new FacadeMethod<Index<Node>>( "void add( T entity, " +
-            "String key, Object value )" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.add( null, "foo", 42 );
-        }
-    };
-
-    private static final FacadeMethod<Index<Node>> REMOVE_BY_KEY_AND_VALUE = new FacadeMethod<Index<Node>>( "void " +
-            "remove( T entity, String key, Object value )" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.remove( null, "foo", 42 );
-        }
-    };
-
-    private static final FacadeMethod<Index<Node>> REMOVE_BY_KEY = new FacadeMethod<Index<Node>>( "void remove( T " +
-            "entity, String key )" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.remove( null, "foo" );
-        }
-    };
-
-    private static final FacadeMethod<Index<Node>> REMOVE = new FacadeMethod<Index<Node>>( "void remove( T entity )" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.remove( null );
-        }
-    };
-
-    private static final FacadeMethod<Index<Node>> DELETE = new FacadeMethod<Index<Node>>( "void delete()" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.delete();
-        }
-    };
-
-    private static final FacadeMethod<Index<Node>> PUT_IF_ABSENT = new FacadeMethod<Index<Node>>( "T putIfAbsent( T " +
-            "entity, String key, Object value )" )
-    {
-        @Override
-        public void call( Index<Node> self )
-        {
-            self.putIfAbsent( null, "foo", 42 );
-        }
-    };
+    private static final FacadeMethod<Index<Node>> GET = new FacadeMethod<>( "IndexHits<T> get( String key, Object value )", self -> self.get( "foo", "bar" ) );
+    private static final FacadeMethod<Index<Node>> QUERY_BY_KEY = new FacadeMethod<>( "IndexHits<T> query( String key, Object queryOrQueryObject )", self -> self.query( "foo", "bar" ) );
+    private static final FacadeMethod<Index<Node>> QUERY = new FacadeMethod<>( "IndexHits<T> query( Object queryOrQueryObject )", self -> self.query( "foo" ) );
+    private static final FacadeMethod<Index<Node>> ADD = new FacadeMethod<>( "void add( T entity, String key, Object value )", self -> self.add( null, "foo", 42 ) );
+    private static final FacadeMethod<Index<Node>> REMOVE_BY_KEY_AND_VALUE = new FacadeMethod<>( "void remove( T entity, String key, Object value )", self -> self.remove( null, "foo", 42 ) );
+    private static final FacadeMethod<Index<Node>> REMOVE_BY_KEY = new FacadeMethod<>( "void remove( T entity, String key )", self -> self.remove( null, "foo" ) );
+    private static final FacadeMethod<Index<Node>> REMOVE = new FacadeMethod<>( "void remove( T entity )", self -> self.remove( null ) );
+    private static final FacadeMethod<Index<Node>> DELETE = new FacadeMethod<>( "void delete()", Index::delete );
+    private static final FacadeMethod<Index<Node>> PUT_IF_ABSENT = new FacadeMethod<>( "T putIfAbsent( T entity, String key, Object value )", self -> self.putIfAbsent( null, "foo", 42 ) );
 
     static final Iterable<FacadeMethod<Index<Node>>> ALL_NODE_INDEX_FACADE_METHODS = unmodifiableCollection(
             asList(
diff --git a/community/community-it/index-it/src/test/java/org/neo4j/graphdb/RelationshipIndexFacadeMethods.java b/community/community-it/index-it/src/test/java/org/neo4j/graphdb/RelationshipIndexFacadeMethods.java
index 23c8663a54a7..9fe7a6e3b953 100644
--- a/community/community-it/index-it/src/test/java/org/neo4j/graphdb/RelationshipIndexFacadeMethods.java
+++ b/community/community-it/index-it/src/test/java/org/neo4j/graphdb/RelationshipIndexFacadeMethods.java
@@ -26,126 +26,18 @@
 
 public class RelationshipIndexFacadeMethods
 {
-    private static final FacadeMethod<RelationshipIndex> GET_WITH_FILTER = new FacadeMethod<RelationshipIndex>(
-            "IndexHits<Relationship> get( String key, Object valueOrNull, Node startNodeOrNull, Node endNodeOrNull )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.get( "foo", 42, null, null );
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> QUERY_BY_KEY_WITH_FILTER = new
-            FacadeMethod<RelationshipIndex>( "IndexHits<Relationship> query( String key, " +
-                    "Object queryOrQueryObjectOrNull, Node startNodeOrNull, Node endNodeOrNull )" )
-            {
-                @Override
-                public void call( RelationshipIndex self )
-                {
-                    self.query( "foo", 42, null, null );
-                }
-            };
-
-    private static final FacadeMethod<RelationshipIndex> QUERY_WITH_FILTER = new FacadeMethod<RelationshipIndex>(
-            "IndexHits<Relationship> query( Object queryOrQueryObjectOrNull, Node startNodeOrNull, " +
-                    "Node endNodeOrNull )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.query( 42, null, null );
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> GET = new FacadeMethod<RelationshipIndex>( "IndexHits<T>" +
-            " get( String key, Object value )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.get( "foo", "bar" );
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> QUERY_BY_KEY = new FacadeMethod<RelationshipIndex>(
-            "IndexHits<T> query( String key, Object queryOrQueryObject )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.query( "foo", "bar" );
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> QUERY = new FacadeMethod<RelationshipIndex>(
-            "IndexHits<T> query( Object queryOrQueryObject )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.query( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> ADD = new FacadeMethod<RelationshipIndex>( "void add( T " +
-            "entity, String key, Object value )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.add( null, "foo", 42 );
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> REMOVE_BY_KEY_AND_VALUE = new
-            FacadeMethod<RelationshipIndex>( "void remove( T entity, String key, Object value )" )
-            {
-                @Override
-                public void call( RelationshipIndex self )
-                {
-                    self.remove( null, "foo", 42 );
-                }
-            };
-
-    private static final FacadeMethod<RelationshipIndex> REMOVE_BY_KEY = new FacadeMethod<RelationshipIndex>(
-            "void remove( T entity, String key )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.remove( null, "foo" );
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> REMOVE = new FacadeMethod<RelationshipIndex>( "void " +
-            "remove( T entity )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.remove( null );
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> DELETE = new FacadeMethod<RelationshipIndex>( "void delete()" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.delete();
-        }
-    };
-
-    private static final FacadeMethod<RelationshipIndex> PUT_IF_ABSENT = new FacadeMethod<RelationshipIndex>( "T " +
-            "putIfAbsent( T entity, String key, Object value )" )
-    {
-        @Override
-        public void call( RelationshipIndex self )
-        {
-            self.putIfAbsent( null, "foo", 42 );
-        }
-    };
+    private static final FacadeMethod<RelationshipIndex> GET_WITH_FILTER = new FacadeMethod<>( "IndexHits<Relationship> get( String key, Object valueOrNull, Node startNodeOrNull, Node endNodeOrNull )", ri -> ri.get( "foo", 42, null, null ) );
+    private static final FacadeMethod<RelationshipIndex> QUERY_BY_KEY_WITH_FILTER = new FacadeMethod<>( "IndexHits<Relationship> query( String key, Object queryOrQueryObjectOrNull, Node startNodeOrNull, Node endNodeOrNull )", ri -> ri.query( "foo", 42, null, null ) );
+    private static final FacadeMethod<RelationshipIndex> QUERY_WITH_FILTER = new FacadeMethod<>( "IndexHits<Relationship> query( Object queryOrQueryObjectOrNull, Node startNodeOrNull, Node endNodeOrNull )", ri -> ri.query( 42, null, null ) );
+    private static final FacadeMethod<RelationshipIndex> GET = new FacadeMethod<>( "IndexHits<T> get( String key, Object value )", ri -> ri.get( "foo", "bar" ) );
+    private static final FacadeMethod<RelationshipIndex> QUERY_BY_KEY = new FacadeMethod<>( "IndexHits<T> query( String key, Object queryOrQueryObject )", ri -> ri.query( "foo", "bar" ) );
+    private static final FacadeMethod<RelationshipIndex> QUERY = new FacadeMethod<>( "IndexHits<T> query( Object queryOrQueryObject )", ri -> ri.query( "foo" ) );
+    private static final FacadeMethod<RelationshipIndex> ADD = new FacadeMethod<>( "void add( T entity, String key, Object value )", ri -> ri.add( null, "foo", 42 ) );
+    private static final FacadeMethod<RelationshipIndex> REMOVE_BY_KEY_AND_VALUE = new FacadeMethod<>( "void remove( T entity, String key, Object value )", ri -> ri.remove( null, "foo", 42 ) );
+    private static final FacadeMethod<RelationshipIndex> REMOVE_BY_KEY = new FacadeMethod<>( "void remove( T entity, String key )", ri -> ri.remove( null, "foo" ) );
+    private static final FacadeMethod<RelationshipIndex> REMOVE = new FacadeMethod<>( "void remove( T entity )", ri -> ri.remove( null ) );
+    private static final FacadeMethod<RelationshipIndex> DELETE = new FacadeMethod<>( "void delete()", RelationshipIndex::delete );
+    private static final FacadeMethod<RelationshipIndex> PUT_IF_ABSENT = new FacadeMethod<>( "T putIfAbsent( T entity, String key, Object value )", ri -> ri.putIfAbsent( null, "foo", 42 ) );
 
     static final Iterable<FacadeMethod<RelationshipIndex>> ALL_RELATIONSHIP_INDEX_FACADE_METHODS =
             unmodifiableCollection(
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java
index e14c875dbfb3..d9c18d26f7c7 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintCreatorFacadeMethods.java
@@ -26,25 +26,8 @@
 
 public class ConstraintCreatorFacadeMethods
 {
-    private static final FacadeMethod<ConstraintCreator> UNIQUE =
-            new FacadeMethod<ConstraintCreator>( "ConstraintCreator unique()" )
-        {
-            @Override
-            public void call( ConstraintCreator self )
-            {
-                self.assertPropertyIsUnique( "property" );
-            }
-        };
-
-    private static final FacadeMethod<ConstraintCreator> CREATE =
-        new FacadeMethod<ConstraintCreator>( "ConstraintDefinition create()" )
-        {
-            @Override
-            public void call( ConstraintCreator self )
-            {
-                self.create();
-            }
-        };
+    private static final FacadeMethod<ConstraintCreator> UNIQUE = new FacadeMethod<>( "ConstraintCreator assertPropertyIsUnique()", self -> self.assertPropertyIsUnique( "property" ) );
+    private static final FacadeMethod<ConstraintCreator> CREATE = new FacadeMethod<>( "ConstraintDefinition create()", ConstraintCreator::create );
 
     static final Iterable<FacadeMethod<ConstraintCreator>> ALL_CONSTRAINT_CREATOR_FACADE_METHODS =
             unmodifiableCollection( asList(
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintDefinitionFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintDefinitionFacadeMethods.java
index 1115aabeb5d6..4fcdad324680 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintDefinitionFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/ConstraintDefinitionFacadeMethods.java
@@ -27,55 +27,11 @@
 
 public class ConstraintDefinitionFacadeMethods
 {
-    private static final FacadeMethod<ConstraintDefinition> GET_LABEL =
-            new FacadeMethod<ConstraintDefinition>( "Label getLabel()" )
-            {
-                @Override
-                public void call( ConstraintDefinition self )
-                {
-                    self.getLabel();
-                }
-            };
-
-    private static final FacadeMethod<ConstraintDefinition> GET_RELATIONSHIP_TYPE =
-            new FacadeMethod<ConstraintDefinition>( "RelationshipType getRelationshipType()" )
-            {
-                @Override
-                public void call( ConstraintDefinition self )
-                {
-                    self.getRelationshipType();
-                }
-            };
-
-    private static final FacadeMethod<ConstraintDefinition> DROP =
-            new FacadeMethod<ConstraintDefinition>( "void drop()" )
-            {
-                @Override
-                public void call( ConstraintDefinition self )
-                {
-                    self.drop();
-                }
-            };
-
-    private static final FacadeMethod<ConstraintDefinition> IS_CONSTRAINT_TYPE =
-            new FacadeMethod<ConstraintDefinition>( "boolean isConstraintType( ConstraintType type )" )
-            {
-                @Override
-                public void call( ConstraintDefinition self )
-                {
-                    self.isConstraintType( ConstraintType.UNIQUENESS );
-                }
-            };
-
-    private static final FacadeMethod<ConstraintDefinition> GET_PROPERTY_KEYS =
-            new FacadeMethod<ConstraintDefinition>( "Iterable<String> getPropertyKeys()" )
-            {
-                @Override
-                public void call( ConstraintDefinition self )
-                {
-                    self.getPropertyKeys();
-                }
-            };
+    private static final FacadeMethod<ConstraintDefinition> GET_LABEL = new FacadeMethod<>( "Label getLabel()", ConstraintDefinition::getLabel );
+    private static final FacadeMethod<ConstraintDefinition> GET_RELATIONSHIP_TYPE = new FacadeMethod<>( "RelationshipType getRelationshipType()", ConstraintDefinition::getRelationshipType );
+    private static final FacadeMethod<ConstraintDefinition> DROP = new FacadeMethod<>( "void drop()", ConstraintDefinition::drop );
+    private static final FacadeMethod<ConstraintDefinition> IS_CONSTRAINT_TYPE = new FacadeMethod<>( "boolean isConstraintType( ConstraintType type )", self -> self.isConstraintType( ConstraintType.UNIQUENESS ) );
+    private static final FacadeMethod<ConstraintDefinition> GET_PROPERTY_KEYS = new FacadeMethod<>( "Iterable<String> getPropertyKeys()", ConstraintDefinition::getPropertyKeys );
 
     static final Iterable<FacadeMethod<ConstraintDefinition>> ALL_CONSTRAINT_DEFINITION_FACADE_METHODS =
             unmodifiableCollection( asList(
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java
index 7a4a1eae38ad..6814dc3af1a0 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/GraphDatabaseServiceFacadeMethods.java
@@ -21,6 +21,7 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableCollection;
+import static org.neo4j.graphdb.FacadeMethod.consume;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.Iterators.loop;
 
@@ -29,145 +30,22 @@
  */
 public class GraphDatabaseServiceFacadeMethods
 {
-    static final FacadeMethod<GraphDatabaseService> CREATE_NODE =
-        new FacadeMethod<GraphDatabaseService>( "Node createNode()" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            graphDatabaseService.createNode();
-        }
-    };
-
-    static final FacadeMethod<GraphDatabaseService> CREATE_NODE_WITH_LABELS =
-        new FacadeMethod<GraphDatabaseService>( "Node createNode( Label... labels )" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            graphDatabaseService.createNode( label( "FOO" ) );
-        }
-    };
-
-    static final FacadeMethod<GraphDatabaseService> GET_NODE_BY_ID =
-        new FacadeMethod<GraphDatabaseService>( "Node getNodeById( long id )" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            graphDatabaseService.getNodeById( 42 );
-        }
-    };
-
-    static final FacadeMethod<GraphDatabaseService> GET_RELATIONSHIP_BY_ID =
-        new FacadeMethod<GraphDatabaseService>( "Relationship getRelationshipById( long id )" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            graphDatabaseService.getRelationshipById( 87 );
-        }
-    };
-
-    static final FacadeMethod<GraphDatabaseService> GET_ALL_NODES =
-            new FacadeMethod<GraphDatabaseService>( "Iterable<Node> getAllNodes()" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            for ( Node node : graphDatabaseService.getAllNodes() )
-            {
-
-            }
-        }
-    };
-
-    static final FacadeMethod<GraphDatabaseService> FIND_NODES_BY_LABEL_AND_PROPERTY_DEPRECATED =
-        new FacadeMethod<GraphDatabaseService>(
-                "ResourceIterator<Node> findNodeByLabelAndProperty( Label label, String key, Object value )" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            for ( Node node : loop( graphDatabaseService.findNodes( label( "bar" ), "baz", 23 ) ) )
-            {
-
-            }
-        }
-    };
-
-    static final FacadeMethod<GraphDatabaseService> FIND_NODES_BY_LABEL =
-            new FacadeMethod<GraphDatabaseService>(
-                    "ResourceIterator<Node> findNodes( Label label )" )
-            {
-                @Override
-                public void call( GraphDatabaseService graphDatabaseService )
-                {
-                    for ( Node node : loop( graphDatabaseService.findNodes( label( "bar" ) ) ) )
-                    {
-
-                    }
-                }
-            };
-
-    static final FacadeMethod<GraphDatabaseService> GET_ALL_LABELS =
-            new FacadeMethod<GraphDatabaseService>( "Iterable<Label> getAllLabels()" )
-            {
-                @Override
-                public void call( GraphDatabaseService graphDatabaseService )
-                {
-                    graphDatabaseService.getAllLabels();
-                }
-            };
-
-    static final FacadeMethod<GraphDatabaseService> GET_ALL_LABELS_IN_USE =
-            new FacadeMethod<GraphDatabaseService>( "Iterable<Label> getAllLabelsInUse()" )
-            {
-                @Override
-                public void call( GraphDatabaseService graphDatabaseService )
-                {
-                    graphDatabaseService.getAllLabelsInUse();
-                }
-            };
-
-    static final FacadeMethod<GraphDatabaseService> GET_ALL_RELATIONSHIP_TYPES =
-            new FacadeMethod<GraphDatabaseService>( "Iterable<RelationshipType> getAllRelationshipTypes()" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            graphDatabaseService.getAllRelationshipTypes();
-        }
-    };
-    static final FacadeMethod<GraphDatabaseService> GET_ALL_RELATIONSHIP_TYPES_IN_USE =
-            new FacadeMethod<GraphDatabaseService>( "Iterable<RelationshipType> getAllRelationshipTypesInUse()" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            graphDatabaseService.getAllRelationshipTypesInUse();
-        }
-    };
-
-    static final FacadeMethod<GraphDatabaseService> GET_ALL_PROPERTY_KEYS =
-            new FacadeMethod<GraphDatabaseService>( "Iterable<String> getAllPropertyKeys()" )
-    {
-        @Override
-        public void call( GraphDatabaseService graphDatabaseService )
-        {
-            graphDatabaseService.getAllPropertyKeys();
-        }
-    };
-
-    static final FacadeMethod<GraphDatabaseService> SCHEMA =
-            new FacadeMethod<GraphDatabaseService>( "Schema schema()" )
-            {
-                @Override
-                public void call( GraphDatabaseService graphDatabaseService )
-                {
-                    graphDatabaseService.schema();
-                }
-            };
+    static final FacadeMethod<GraphDatabaseService> CREATE_NODE = new FacadeMethod<>( "Node createNode()", GraphDatabaseService::createNode );
+    static final FacadeMethod<GraphDatabaseService> CREATE_NODE_WITH_LABELS = new FacadeMethod<>( "Node createNode( Label... labels )", gds -> gds.createNode( label( "FOO" ) ) );
+    static final FacadeMethod<GraphDatabaseService> GET_NODE_BY_ID = new FacadeMethod<>( "Node getNodeById( long id )", gds -> gds.getNodeById( 42 ) );
+    static final FacadeMethod<GraphDatabaseService> GET_RELATIONSHIP_BY_ID = new FacadeMethod<>( "Relationship getRelationshipById( long id )", gds -> gds.getRelationshipById( 42 ) );
+    static final FacadeMethod<GraphDatabaseService> GET_ALL_NODES = new FacadeMethod<>( "Iterable<Node> getAllNodes()", gds -> consume( gds.getAllNodes() ) );
+    static final FacadeMethod<GraphDatabaseService> FIND_NODES_BY_LABEL_AND_PROPERTY_DEPRECATED = new FacadeMethod<>(
+                "ResourceIterator<Node> findNodeByLabelAndProperty( Label label, String key, Object value )", gds -> consume( gds.findNodes( label( "bar" ), "baz", 23 ) ) );
+    static final FacadeMethod<GraphDatabaseService> FIND_NODES_BY_LABEL = new FacadeMethod<>(
+                    "ResourceIterator<Node> findNodes( Label label )", gds -> consume( gds.findNodes( label( "bar" ) ) ) );
+    static final FacadeMethod<GraphDatabaseService> GET_ALL_LABELS = new FacadeMethod<>( "Iterable<Label> getAllLabels()", GraphDatabaseService::getAllLabels );
+    static final FacadeMethod<GraphDatabaseService> GET_ALL_LABELS_IN_USE = new FacadeMethod<>( "Iterable<Label> getAllLabelsInUse()", GraphDatabaseService::getAllLabelsInUse );
+    static final FacadeMethod<GraphDatabaseService> GET_ALL_RELATIONSHIP_TYPES = new FacadeMethod<>( "Iterable<RelationshipType> getAllRelationshipTypes()", GraphDatabaseService::getAllRelationshipTypes );
+    static final FacadeMethod<GraphDatabaseService> GET_ALL_RELATIONSHIP_TYPES_IN_USE = new FacadeMethod<>( "Iterable<RelationshipType> getAllRelationshipTypesInUse()", GraphDatabaseService::getAllRelationshipTypesInUse );
+    static final FacadeMethod<GraphDatabaseService> GET_ALL_PROPERTY_KEYS = new FacadeMethod<>( "Iterable<String> getAllPropertyKeys()", GraphDatabaseService::getAllPropertyKeys );
+    static final FacadeMethod<GraphDatabaseService> SCHEMA = new FacadeMethod<>( "Schema schema()", GraphDatabaseService::schema );
+    static final FacadeMethod<GraphDatabaseService> INDEX = new FacadeMethod<>( "IndexManager index()", GraphDatabaseService::index );
 
     static final Iterable<FacadeMethod<GraphDatabaseService>> ALL_NON_TRANSACTIONAL_GRAPH_DATABASE_METHODS =
         unmodifiableCollection( asList(
@@ -183,8 +61,8 @@ public void call( GraphDatabaseService graphDatabaseService )
                 GET_ALL_RELATIONSHIP_TYPES,
                 GET_ALL_RELATIONSHIP_TYPES_IN_USE,
                 GET_ALL_PROPERTY_KEYS,
-                SCHEMA
-                // TODO: INDEX
+                SCHEMA,
+                INDEX
         ) );
 
     private GraphDatabaseServiceFacadeMethods()
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexCreatorFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexCreatorFacadeMethods.java
index 97da4985ffc7..d42e04cba2a7 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexCreatorFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexCreatorFacadeMethods.java
@@ -26,25 +26,8 @@
 
 public class IndexCreatorFacadeMethods
 {
-    private static final FacadeMethod<IndexCreator> ON =
-        new FacadeMethod<IndexCreator>( "IndexCreator on( String propertyKey )" )
-        {
-            @Override
-            public void call( IndexCreator self )
-            {
-                self.on( "property" );
-            }
-        };
-
-    private static final FacadeMethod<IndexCreator> CREATE =
-        new FacadeMethod<IndexCreator>( "IndexDefinition create()" )
-        {
-            @Override
-            public void call( IndexCreator self )
-            {
-                self.on( "property" );
-            }
-        };
+    private static final FacadeMethod<IndexCreator> ON = new FacadeMethod<>( "IndexCreator on( String propertyKey )", self -> self.on( "property" ) );
+    private static final FacadeMethod<IndexCreator> CREATE = new FacadeMethod<>( "IndexDefinition create()", IndexCreator::create );
 
     static final Iterable<FacadeMethod<IndexCreator>> ALL_INDEX_CREATOR_FACADE_METHODS =
         unmodifiableCollection( asList(
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java
index c425290d2418..71c27c52efb5 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexDefinitionFacadeMethods.java
@@ -26,53 +26,15 @@
 
 public class IndexDefinitionFacadeMethods
 {
-    private static final FacadeMethod<IndexDefinition> GET_LABEL =
-        new FacadeMethod<IndexDefinition>( "Label getLabel()" )
-        {
-            @Override
-            public void call( IndexDefinition self )
-            {
-                self.getLabel();
-            }
-        };
-
+    private static final FacadeMethod<IndexDefinition> GET_LABEL = new FacadeMethod<>( "Label getLabel()", IndexDefinition::getLabel );
     private static final FacadeMethod<IndexDefinition> GET_PROPERTY_KEYS =
-        new FacadeMethod<IndexDefinition>( "Iterable<String> getPropertyKeys()" )
-        {
-            @Override
-            public void call( IndexDefinition self )
-            {
-                self.getPropertyKeys();
-            }
-        };
-
-    private static final FacadeMethod<IndexDefinition> DROP =
-        new FacadeMethod<IndexDefinition>( "void drop()" )
-        {
-            @Override
-            public void call( IndexDefinition self )
-            {
-                self.drop();
-            }
-        };
-
+            new FacadeMethod<>( "Iterable<String> getPropertyKeys()", IndexDefinition::getPropertyKeys );
+    private static final FacadeMethod<IndexDefinition> DROP = new FacadeMethod<>( "void drop()", IndexDefinition::drop );
     private static final FacadeMethod<IndexDefinition> IS_CONSTRAINT_INDEX =
-        new FacadeMethod<IndexDefinition>( "boolean isConstraintIndex()" )
-        {
-            @Override
-            public void call( IndexDefinition self )
-            {
-                self.isConstraintIndex();
-            }
-        };
+            new FacadeMethod<>( "boolean isConstraintIndex()", IndexDefinition::isConstraintIndex );
 
     static final Iterable<FacadeMethod<IndexDefinition>> ALL_INDEX_DEFINITION_FACADE_METHODS =
-        unmodifiableCollection( asList(
-            GET_LABEL,
-            GET_PROPERTY_KEYS,
-            DROP,
-            IS_CONSTRAINT_INDEX
-        ) );
+            unmodifiableCollection( asList( GET_LABEL, GET_PROPERTY_KEYS, DROP, IS_CONSTRAINT_INDEX ) );
 
     private IndexDefinitionFacadeMethods()
     {
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexManagerFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexManagerFacadeMethods.java
index 67156a3c3813..24f84d8f38d4 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexManagerFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/IndexManagerFacadeMethods.java
@@ -26,91 +26,14 @@
 
 public class IndexManagerFacadeMethods
 {
-    private static final FacadeMethod<IndexManager> EXISTS_FOR_NODES = new FacadeMethod<IndexManager>( "boolean " +
-            "existsForNodes( String indexName )" )
-    {
-        @Override
-        public void call( IndexManager indexManager )
-        {
-            indexManager.existsForNodes( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<IndexManager> FOR_NODES = new FacadeMethod<IndexManager>( "Index<Node> forNodes" +
-            "( String indexName )" )
-    {
-        @Override
-        public void call( IndexManager indexManager )
-        {
-            indexManager.forNodes( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<IndexManager> FOR_NODES_WITH_CONFIG = new FacadeMethod<IndexManager>(
-            "Index<Node> forNodes( String indexName, Map<String, String> customConfiguration )" )
-    {
-        @Override
-        public void call( IndexManager indexManager )
-        {
-            indexManager.forNodes( "foo", null );
-        }
-    };
-
-    private static final FacadeMethod<IndexManager> NODE_INDEX_NAMES = new FacadeMethod<IndexManager>( "String[] " +
-            "nodeIndexNames()" )
-    {
-        @Override
-        public void call( IndexManager indexManager )
-        {
-            for ( String indexName : indexManager.nodeIndexNames() )
-            {
-
-            }
-        }
-    };
-
-    private static final FacadeMethod<IndexManager> EXISTS_FOR_RELATIONSHIPS = new FacadeMethod<IndexManager>(
-            "boolean existsForRelationships( String indexName )" )
-    {
-        @Override
-        public void call( IndexManager indexManager )
-        {
-            indexManager.existsForRelationships( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<IndexManager> FOR_RELATIONSHIPS = new FacadeMethod<IndexManager>(
-            "RelationshipIndex forRelationships( String indexName )" )
-    {
-        @Override
-        public void call( IndexManager indexManager )
-        {
-            indexManager.forRelationships( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<IndexManager> FOR_RELATIONSHIPS_WITH_CONFIG = new FacadeMethod<IndexManager>(
-            "RelationshipIndex forRelationships( String indexName, Map<String, String> customConfiguration )" )
-    {
-        @Override
-        public void call( IndexManager indexManager )
-        {
-            indexManager.forRelationships( "foo", null );
-        }
-    };
-
-    private static final FacadeMethod<IndexManager> RELATIONSHIP_INDEX_NAMES = new FacadeMethod<IndexManager>(
-            "String[] relationshipIndexNames()" )
-    {
-        @Override
-        public void call( IndexManager indexManager )
-        {
-            for ( String indexName : indexManager.relationshipIndexNames() )
-            {
-
-            }
-        }
-    };
+    private static final FacadeMethod<IndexManager> EXISTS_FOR_NODES = new FacadeMethod<>( "boolean existsForNodes( String indexName )", self -> self.existsForNodes( "foo" ) );
+    private static final FacadeMethod<IndexManager> FOR_NODES = new FacadeMethod<>( "Index<Node> forNodes( String indexName )", self -> self.forNodes( "foo" ) );
+    private static final FacadeMethod<IndexManager> FOR_NODES_WITH_CONFIG = new FacadeMethod<>( "Index<Node> forNodes( String indexName, Map<String, String> customConfiguration )", self -> self.forNodes( "foo", null ) );
+    private static final FacadeMethod<IndexManager> NODE_INDEX_NAMES = new FacadeMethod<>( "String[] nodeIndexNames()", IndexManager::nodeIndexNames );
+    private static final FacadeMethod<IndexManager> EXISTS_FOR_RELATIONSHIPS = new FacadeMethod<>( "boolean existsForRelationships( String indexName )", self -> self.existsForRelationships( "foo" ) );
+    private static final FacadeMethod<IndexManager> FOR_RELATIONSHIPS = new FacadeMethod<>( "RelationshipIndex forRelationships( String indexName )", self -> self.forRelationships( "foo" ) );
+    private static final FacadeMethod<IndexManager> FOR_RELATIONSHIPS_WITH_CONFIG = new FacadeMethod<>( "RelationshipIndex forRelationships( String indexName, Map<String, String> customConfiguration )", self -> self.forRelationships( "foo", null ) );
+    private static final FacadeMethod<IndexManager> RELATIONSHIP_INDEX_NAMES = new FacadeMethod<>( "String[] relationshipIndexNames()", IndexManager::relationshipIndexNames );
 
     static final Iterable<FacadeMethod<IndexManager>> ALL_INDEX_MANAGER_FACADE_METHODS =
             unmodifiableCollection( asList(
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java
index 0476f91349da..8ad0cd82f943 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/NodeFacadeMethods.java
@@ -21,8 +21,8 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableCollection;
-import static org.junit.Assert.assertNotNull;
 import static org.neo4j.graphdb.Direction.BOTH;
+import static org.neo4j.graphdb.FacadeMethod.consume;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.graphdb.RelationshipType.withName;
 
@@ -33,230 +33,29 @@ public class NodeFacadeMethods
     private static final RelationshipType BAR = withName( "bar" );
     private static final Label QUUX = label( "quux" );
 
-    private static final FacadeMethod<Node> HAS_PROPERTY = new FacadeMethod<Node>( "boolean hasProperty( " +
-            "String key )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.hasProperty( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_PROPERTY = new FacadeMethod<Node>( "Object getProperty( String key )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.getProperty( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_PROPERTY_WITH_DEFAULT = new FacadeMethod<Node>( "Object getProperty( " +
-            "String key, Object defaultValue )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.getProperty( "foo", 42 );
-        }
-    };
-
-    private static final FacadeMethod<Node> SET_PROPERTY = new FacadeMethod<Node>( "void setProperty( String key, " +
-            "Object value )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.setProperty( "foo", 42 );
-        }
-    };
-
-    private static final FacadeMethod<Node> REMOVE_PROPERTY = new FacadeMethod<Node>(
-            "Object removeProperty( String key )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.removeProperty( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_PROPERTY_KEYS = new FacadeMethod<Node>(
-            "Iterable<String> getPropertyKeys()" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            consume( node.getPropertyKeys() );
-        }
-    };
-
-    private static final FacadeMethod<Node> DELETE = new FacadeMethod<Node>( "void delete()" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.delete();
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_RELATIONSHIPS = new FacadeMethod<Node>(
-            "Iterable<Relationship> getRelationships()" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            consume( node.getRelationships() );
-        }
-    };
-
-    private static final FacadeMethod<Node> HAS_RELATIONSHIP = new FacadeMethod<Node>( "boolean hasRelationship()" )
-
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.hasRelationship();
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_RELATIONSHIPS_BY_TYPE = new FacadeMethod<Node>(
-            "Iterable<Relationship> getRelationships( RelationshipType... types )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            consume( node.getRelationships( FOO, BAR ) );
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_RELATIONSHIPS_BY_DIRECTION_AND_TYPES = new FacadeMethod<Node>(
-            "Iterable<Relationship> getRelationships( Direction direction, RelationshipType... types )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            consume( node.getRelationships( BOTH, FOO, BAR ) );
-        }
-    };
-
-    private static final FacadeMethod<Node> HAS_RELATIONSHIP_BY_TYPE = new FacadeMethod<Node>( "boolean " +
-            "hasRelationship( RelationshipType... types )" )
-
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.hasRelationship( FOO );
-        }
-    };
-
-    private static final FacadeMethod<Node> HAS_RELATIONSHIP_BY_DIRECTION_AND_TYPE = new FacadeMethod<Node>( "boolean " +
-            "hasRelationship( Direction direction, RelationshipType... types )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.hasRelationship( BOTH, FOO );
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_RELATIONSHIPS_BY_DIRECTION = new FacadeMethod<Node>(
-            "Iterable<Relationship> getRelationships( Direction dir )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            consume( node.getRelationships( BOTH ) );
-        }
-    };
-
-    private static final FacadeMethod<Node> HAS_RELATIONSHIP_BY_DIRECTION = new FacadeMethod<Node>( "boolean " +
-            "hasRelationship( Direction dir )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.hasRelationship( BOTH );
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_RELATIONSHIPS_BY_TYPE_AND_DIRECTION = new FacadeMethod<Node>(
-            "Iterable<Relationship> getRelationships( RelationshipType type, Direction dir );" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            consume( node.getRelationships( FOO, BOTH ) );
-        }
-    };
-
-    private static final FacadeMethod<Node> HAS_RELATIONSHIP_BY_TYPE_AND_DIRECTION = new FacadeMethod<Node>( "boolean " +
-            "hasRelationship( RelationshipType type, Direction dir )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.hasRelationship( FOO, BOTH );
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_SINGLE_RELATIONSHIP = new FacadeMethod<Node>( "Relationship " +
-            "getSingleRelationship( RelationshipType type, Direction dir )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.getSingleRelationship( FOO, BOTH );
-        }
-    };
-
-    private static final FacadeMethod<Node> CREATE_RELATIONSHIP_TO = new FacadeMethod<Node>( "Relationship " +
-            "createRelationshipTo( Node otherNode, RelationshipType type )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.createRelationshipTo( node, FOO );
-        }
-    };
-
-    private static final FacadeMethod<Node> ADD_LABEL = new FacadeMethod<Node>( "void addLabel( Label label )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.addLabel( QUUX );
-        }
-    };
-
-    private static final FacadeMethod<Node> REMOVE_LABEL = new FacadeMethod<Node>( "void removeLabel( Label label )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.removeLabel( QUUX );
-        }
-    };
-
-    private static final FacadeMethod<Node> HAS_LABEL = new FacadeMethod<Node>( "boolean hasLabel( Label label )" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            node.hasLabel( QUUX );
-        }
-    };
-
-    private static final FacadeMethod<Node> GET_LABELS = new FacadeMethod<Node>( "ResourceIterable<Label> getLabels()" )
-    {
-        @Override
-        public void call( Node node )
-        {
-            consume( node.getLabels() );
-        }
-    };
+    private static final FacadeMethod<Node> HAS_PROPERTY = new FacadeMethod<>( "boolean hasProperty( String key )", n -> n.hasProperty( "foo" ) );
+    private static final FacadeMethod<Node> GET_PROPERTY = new FacadeMethod<>( "Object getProperty( String key )", n -> n.getProperty( "foo" ) );
+    private static final FacadeMethod<Node> GET_PROPERTY_WITH_DEFAULT = new FacadeMethod<>( "Object getProperty( String key, Object defaultValue )", n -> n.getProperty( "foo", 42 ) );
+    private static final FacadeMethod<Node> SET_PROPERTY = new FacadeMethod<>( "void setProperty( String key, Object value )", n -> n.setProperty( "foo", 42 ) );
+    private static final FacadeMethod<Node> REMOVE_PROPERTY = new FacadeMethod<>( "Object removeProperty( String key )", n -> n.removeProperty( "foo" ) );
+    private static final FacadeMethod<Node> GET_PROPERTY_KEYS = new FacadeMethod<>( "Iterable<String> getPropertyKeys()", n -> consume( n.getPropertyKeys() ) );
+    private static final FacadeMethod<Node> DELETE = new FacadeMethod<>( "void delete()", Node::delete );
+    private static final FacadeMethod<Node> GET_RELATIONSHIPS = new FacadeMethod<>( "Iterable<Relationship> getRelationships()", n -> consume( n.getRelationships() ) );
+    private static final FacadeMethod<Node> HAS_RELATIONSHIP = new FacadeMethod<>( "boolean hasRelationship()", Node::hasRelationship );
+    private static final FacadeMethod<Node> GET_RELATIONSHIPS_BY_TYPE = new FacadeMethod<>( "Iterable<Relationship> getRelationships( RelationshipType... types )", n -> consume( n.getRelationships( FOO, BAR ) ) );
+    private static final FacadeMethod<Node> GET_RELATIONSHIPS_BY_DIRECTION_AND_TYPES = new FacadeMethod<>( "Iterable<Relationship> getRelationships( Direction direction, RelationshipType... types )", n -> consume( n.getRelationships( BOTH, FOO, BAR ) ) );
+    private static final FacadeMethod<Node> HAS_RELATIONSHIP_BY_TYPE = new FacadeMethod<>( "boolean hasRelationship( RelationshipType... types )", n -> n.hasRelationship( FOO ) );
+    private static final FacadeMethod<Node> HAS_RELATIONSHIP_BY_DIRECTION_AND_TYPE = new FacadeMethod<>( "boolean hasRelationship( Direction direction, RelationshipType... types )", n -> n.hasRelationship( BOTH, FOO ) );
+    private static final FacadeMethod<Node> GET_RELATIONSHIPS_BY_DIRECTION = new FacadeMethod<>( "Iterable<Relationship> getRelationships( Direction dir )", n -> consume( n.getRelationships( BOTH ) ) );
+    private static final FacadeMethod<Node> HAS_RELATIONSHIP_BY_DIRECTION = new FacadeMethod<>( "boolean hasRelationship( Direction dir )", n -> n.hasRelationship( BOTH ) );
+    private static final FacadeMethod<Node> GET_RELATIONSHIPS_BY_TYPE_AND_DIRECTION = new FacadeMethod<>( "Iterable<Relationship> getRelationships( RelationshipType type, Direction dir )", n -> consume( n.getRelationships( FOO, BOTH ) ) );
+    private static final FacadeMethod<Node> HAS_RELATIONSHIP_BY_TYPE_AND_DIRECTION = new FacadeMethod<>( "boolean hasRelationship( RelationshipType type, Direction dir )", n -> n.hasRelationship( FOO, BOTH ) );
+    private static final FacadeMethod<Node> GET_SINGLE_RELATIONSHIP = new FacadeMethod<>( "Relationship getSingleRelationship( RelationshipType type, Direction dir )", n -> n.getSingleRelationship( FOO, BOTH ) );
+    private static final FacadeMethod<Node> CREATE_RELATIONSHIP_TO = new FacadeMethod<>( "Relationship createRelationshipTo( Node otherNode, RelationshipType type )", n -> n.createRelationshipTo( n, FOO ) );
+    private static final FacadeMethod<Node> ADD_LABEL = new FacadeMethod<>( "void addLabel( Label label )", n -> n.addLabel( QUUX ) );
+    private static final FacadeMethod<Node> REMOVE_LABEL = new FacadeMethod<>( "void removeLabel( Label label )", n -> n.removeLabel( QUUX ) );
+    private static final FacadeMethod<Node> HAS_LABEL = new FacadeMethod<>( "boolean hasLabel( Label label )", n -> n.hasLabel( QUUX ) );
+    private static final FacadeMethod<Node> GET_LABELS = new FacadeMethod<>( "ResourceIterable<Label> getLabels()", n -> consume( n.getLabels() ) );
 
     static final Iterable<FacadeMethod<Node>> ALL_NODE_FACADE_METHODS = unmodifiableCollection( asList(
         HAS_PROPERTY,
@@ -285,12 +84,4 @@ public void call( Node node )
     private NodeFacadeMethods()
     {
     }
-
-    private static void consume( Iterable<?> iterable )
-    {
-        for ( Object o : iterable )
-        {
-            assertNotNull( o );
-        }
-    }
 }
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java
index 11f40c04004e..7a85eea0d5fe 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/RelationshipFacadeMethods.java
@@ -21,146 +21,28 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableCollection;
+import static org.neo4j.graphdb.FacadeMethod.consume;
 import static org.neo4j.graphdb.RelationshipType.withName;
 
 @SuppressWarnings( "UnusedDeclaration" )
 public class RelationshipFacadeMethods
 {
-    private static final FacadeMethod<Relationship> HAS_PROPERTY =
-        new FacadeMethod<Relationship>( "boolean hasProperty( String key )" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.hasProperty( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<Relationship> GET_PROPERTY =
-        new FacadeMethod<Relationship>( "Object getProperty( String key )" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.getProperty( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<Relationship> GET_PROPERTY_WITH_DEFAULT =
-        new FacadeMethod<Relationship>( "Object getProperty( String key, Object defaultValue )" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.getProperty( "foo", 42 );
-        }
-    };
-
-    private static final FacadeMethod<Relationship> SET_PROPERTY =
-        new FacadeMethod<Relationship>( "void setProperty( String key, Object value )" )
-
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.setProperty( "foo", 42 );
-        }
-    };
-
-    private static final FacadeMethod<Relationship> REMOVE_PROPERTY =
-        new FacadeMethod<Relationship>( "Object removeProperty( String key )" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.removeProperty( "foo" );
-        }
-    };
-
-    private static final FacadeMethod<Relationship> GET_PROPERTY_KEYS =
-        new FacadeMethod<Relationship>( "Iterable<String> getPropertyKeys()" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            for ( String key : relationship.getPropertyKeys() )
-            {
-
-            }
-        }
-    };
-
-    private static final FacadeMethod<Relationship> DELETE = new FacadeMethod<Relationship>( "void delete()" )
-
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.delete();
-        }
-    };
-
-    private static final FacadeMethod<Relationship> GET_START_NODE =
-        new FacadeMethod<Relationship>( "Node getStartNode()" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.getStartNode();
-        }
-    };
-
-    private static final FacadeMethod<Relationship> GET_END_NODE = new FacadeMethod<Relationship>( "Node getEndNode()" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.getEndNode();
-        }
-    };
-
-    private static final FacadeMethod<Relationship> GET_OTHER_NODE =
-        new FacadeMethod<Relationship>( "Node getOtherNode( Node node )" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.getOtherNode( null );
-        }
-    };
-
-    private static final FacadeMethod<Relationship> GET_NODES = new FacadeMethod<Relationship>( "Node[] getNodes()" )
-    {
-        @SuppressWarnings( "UnusedDeclaration" )
-        @Override
-        public void call( Relationship relationship )
-        {
-            for ( Node node : relationship.getNodes() )
-            {
-
-            }
-        }
-    };
-
-    private static final FacadeMethod<Relationship> GET_TYPE =
-            new FacadeMethod<Relationship>( "RelationshipType getType()" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.getType();
-        }
-    };
-
-    private static final FacadeMethod<Relationship> IS_TYPE =
-        new FacadeMethod<Relationship>( "boolean isType( RelationshipType type )" )
-    {
-        @Override
-        public void call( Relationship relationship )
-        {
-            relationship.isType( withName( "foo" ) );
-        }
-    };
+    private static final FacadeMethod<Relationship> HAS_PROPERTY = new FacadeMethod<>( "boolean hasProperty( String key )", r -> r.hasProperty( "foo" ) );
+    private static final FacadeMethod<Relationship> GET_PROPERTY = new FacadeMethod<>( "Object getProperty( String key )", r -> r.getProperty( "foo" ) );
+    private static final FacadeMethod<Relationship> GET_PROPERTY_WITH_DEFAULT = new FacadeMethod<>( "Object getProperty( String key, Object defaultValue )", r -> r.getProperty( "foo", 42 ) );
+    private static final FacadeMethod<Relationship> SET_PROPERTY = new FacadeMethod<>( "void setProperty( String key, Object value )", r -> r.setProperty( "foo", 42 ) );
+    private static final FacadeMethod<Relationship> REMOVE_PROPERTY = new FacadeMethod<>( "Object removeProperty( String key )", r -> r.removeProperty( "foo" ) );
+    private static final FacadeMethod<Relationship> GET_PROPERTY_KEYS = new FacadeMethod<>( "Iterable<String> getPropertyKeys()", r -> consume( r.getPropertyKeys() ) );
+    private static final FacadeMethod<Relationship> DELETE = new FacadeMethod<>( "void delete()", Relationship::delete );
+    private static final FacadeMethod<Relationship> GET_START_NODE = new FacadeMethod<>( "Node getStartNode()", Relationship::getStartNode );
+    private static final FacadeMethod<Relationship> GET_START_NODE_ID = new FacadeMethod<>( "Node getStartNode()", Relationship::getStartNodeId );
+    private static final FacadeMethod<Relationship> GET_END_NODE = new FacadeMethod<>( "Node getEndNode()", Relationship::getEndNode );
+    private static final FacadeMethod<Relationship> GET_END_NODE_ID = new FacadeMethod<>( "Node getEndNode()", Relationship::getEndNodeId );
+    private static final FacadeMethod<Relationship> GET_OTHER_NODE = new FacadeMethod<>( "Node getOtherNode( Node node )", r -> r.getOtherNode( null ) );
+    private static final FacadeMethod<Relationship> GET_OTHER_NODE_ID = new FacadeMethod<>( "Node getOtherNode( Node node )", r -> r.getOtherNodeId( 42 ) );
+    private static final FacadeMethod<Relationship> GET_NODES = new FacadeMethod<>( "Node[] getNodes()", Relationship::getNodes );
+    private static final FacadeMethod<Relationship> GET_TYPE = new FacadeMethod<>( "RelationshipType getType()", Relationship::getType );
+    private static final FacadeMethod<Relationship> IS_TYPE = new FacadeMethod<>( "boolean isType( RelationshipType type )", r -> r.isType( withName( "foo" ) ) );
 
     static final Iterable<FacadeMethod<Relationship>> ALL_RELATIONSHIP_FACADE_METHODS = unmodifiableCollection( asList(
         HAS_PROPERTY,
@@ -173,6 +55,7 @@ public void call( Relationship relationship )
         GET_START_NODE,
         GET_END_NODE,
         GET_OTHER_NODE,
+        GET_OTHER_NODE_ID,
         GET_NODES,
         GET_TYPE,
         IS_TYPE
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/SchemaFacadeMethods.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/SchemaFacadeMethods.java
index c199b4ea92fe..77fa5250791c 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/SchemaFacadeMethods.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/SchemaFacadeMethods.java
@@ -34,104 +34,16 @@ public class SchemaFacadeMethods
 
     private static final IndexDefinition INDEX_DEFINITION = mock( IndexDefinition.class );
 
-    private static final FacadeMethod<Schema> INDEX_FOR = new FacadeMethod<Schema>( "IndexCreator indexFor( Label label )" )
-    {
-        @Override
-        public void call( Schema self )
-        {
-            self.indexFor( LABEL );
-        }
-    };
-
-    private static final FacadeMethod<Schema> GET_INDEXES_BY_LABEL =
-            new FacadeMethod<Schema>( "Iterable<IndexDefinition> getIndexes( Label label )" )
-    {
-                @Override
-                public void call( Schema self )
-                {
-                    self.getIndexes( LABEL );
-                }
-            };
-
-    private static final FacadeMethod<Schema> GET_INDEXES =
-        new FacadeMethod<Schema>( "Iterable<IndexDefinition> getIndexes()" )
-    {
-            @Override
-            public void call( Schema self )
-            {
-                self.getIndexes();
-            }
-        };
-
-    private static final FacadeMethod<Schema> GET_INDEX_STATE =
-        new FacadeMethod<Schema>( "IndexState getIndexState( IndexDefinition index )" )
-    {
-            @Override
-            public void call( Schema self )
-            {
-                self.getIndexState( INDEX_DEFINITION );
-            }
-        };
-
-    private static final FacadeMethod<Schema> GET_INDEX_FAILURE =
-        new FacadeMethod<Schema>( "String getIndexFailure( IndexDefinition index )" )
-    {
-            @Override
-            public void call( Schema self )
-            {
-                self.getIndexFailure( INDEX_DEFINITION );
-            }
-        };
-
-    private static final FacadeMethod<Schema> CONSTRAINT_FOR =
-        new FacadeMethod<Schema>( "ConstraintCreator constraintFor( Label label )" )
-    {
-            @Override
-            public void call( Schema self )
-            {
-                self.constraintFor( LABEL );
-            }
-        };
-
-    private static final FacadeMethod<Schema> GET_CONSTRAINTS_BY_LABEL =
-        new FacadeMethod<Schema>( "Iterable<ConstraintDefinition> getConstraints( Label label )" )
-    {
-            @Override
-            public void call( Schema self )
-            {
-                self.getConstraints( LABEL );
-            }
-        };
-
-    private static final FacadeMethod<Schema> GET_CONSTRAINTS =
-        new FacadeMethod<Schema>( "Iterable<ConstraintDefinition> getConstraints()" )
-    {
-            @Override
-            public void call( Schema self )
-            {
-                self.getConstraints();
-            }
-        };
-
-    private static final FacadeMethod<Schema> AWAIT_INDEX_ONLINE =
-        new FacadeMethod<Schema>( "void awaitIndexOnline( IndexDefinition index, long duration, TimeUnit unit )" )
-    {
-            @Override
-            public void call( Schema self )
-            {
-                self.awaitIndexOnline( INDEX_DEFINITION, 1L, TimeUnit.SECONDS );
-            }
-        };
-
-    private static final FacadeMethod<Schema> AWAIT_INDEXES_ONLINE =
-        new FacadeMethod<Schema>( "void awaitIndexesOnline( long duration, TimeUnit unit )" )
-    {
-            @Override
-            public void call( Schema self )
-            {
-                self.awaitIndexesOnline( 1L, TimeUnit.SECONDS );
-            }
-        };
+    private static final FacadeMethod<Schema> INDEX_FOR = new FacadeMethod<>( "IndexCreator indexFor( Label label )", s -> s.indexFor( LABEL ) );
+    private static final FacadeMethod<Schema> GET_INDEXES_BY_LABEL = new FacadeMethod<>( "Iterable<IndexDefinition> getIndexes( Label label )", s -> s.getIndexes( LABEL ) );
+    private static final FacadeMethod<Schema> GET_INDEXES = new FacadeMethod<>( "Iterable<IndexDefinition> getIndexes()", Schema::getIndexes );
+    private static final FacadeMethod<Schema> GET_INDEX_STATE = new FacadeMethod<>( "IndexState getIndexState( IndexDefinition index )", s -> s.getIndexState( INDEX_DEFINITION ) );
+    private static final FacadeMethod<Schema> GET_INDEX_FAILURE = new FacadeMethod<>( "String getIndexFailure( IndexDefinition index )", s -> s.getIndexFailure( INDEX_DEFINITION ) );
+    private static final FacadeMethod<Schema> CONSTRAINT_FOR = new FacadeMethod<>( "ConstraintCreator constraintFor( Label label )", s -> s.constraintFor( LABEL ) );
+    private static final FacadeMethod<Schema> GET_CONSTRAINTS_BY_LABEL = new FacadeMethod<>( "Iterable<ConstraintDefinition> getConstraints( Label label )", s -> s.getConstraints( LABEL ) );
+    private static final FacadeMethod<Schema> GET_CONSTRAINTS = new FacadeMethod<>( "Iterable<ConstraintDefinition> getConstraints()", Schema::getConstraints );
+    private static final FacadeMethod<Schema> AWAIT_INDEX_ONLINE = new FacadeMethod<>( "void awaitIndexOnline( IndexDefinition index, long duration, TimeUnit unit )", s -> s.awaitIndexOnline( INDEX_DEFINITION, 1L, TimeUnit.SECONDS ) );
+    private static final FacadeMethod<Schema> AWAIT_INDEXES_ONLINE = new FacadeMethod<>( "void awaitIndexesOnline( long duration, TimeUnit unit )", s -> s.awaitIndexesOnline( 1L, TimeUnit.SECONDS ) );
 
     static final Iterable<FacadeMethod<Schema>> ALL_SCHEMA_FACADE_METHODS = unmodifiableCollection( asList(
         INDEX_FOR,
diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java
index 1a02dfdbd0f1..b37aaf3a7d50 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImplTest.java
@@ -39,6 +39,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 public class SchemaImplTest
@@ -90,7 +91,7 @@ public void testGetIndexPopulationProgress() throws Exception
         }
 
         // Get state and progress
-        try ( Transaction tx = db.beginTx() )
+        try ( Transaction ignore = db.beginTx() )
         {
             Schema schema = db.schema();
             Schema.IndexState state;
@@ -107,7 +108,7 @@ public void testGetIndexPopulationProgress() throws Exception
             }
             while ( state == Schema.IndexState.POPULATING );
 
-            assertTrue( state == Schema.IndexState.ONLINE );
+            assertSame( state, Schema.IndexState.ONLINE );
             assertEquals( 100.0f, progress.getCompletedPercentage(), 0.0f );
         }
     }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java
index a51674240168..d42a8ca33088 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java
@@ -187,18 +187,21 @@ public Node getEndNode()
     @Override
     public long getStartNodeId()
     {
+        spi.assertInUnterminatedTransaction();
         return sourceId();
     }
 
     @Override
     public long getEndNodeId()
     {
+        spi.assertInUnterminatedTransaction();
         return targetId();
     }
 
     @Override
     public long getOtherNodeId( long id )
     {
+        spi.assertInUnterminatedTransaction();
         long start = sourceId();
         long end = targetId();
         if ( start == id )
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java
index 84b72ec9fe90..e6501366e92f 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java
@@ -47,8 +47,6 @@
 import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
-import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException;
-import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException;
 import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException;
 import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException;
 import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException;
@@ -78,7 +76,6 @@
 import org.neo4j.storageengine.api.schema.PopulationProgress;
 import org.neo4j.storageengine.api.schema.SchemaRule;
 
-import static java.lang.String.format;
 import static java.util.Collections.emptyList;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.graphdb.RelationshipType.withName;
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 13c7366dce63..ce80a0c20753 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
@@ -333,6 +333,7 @@ public Relationship getRelationshipById( long id )
     @Override
     public IndexManager index()
     {
+        assertTransactionOpen();
         return indexManager.get();
     }
 
diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/FacadeMethod.java b/community/kernel/src/test/java/org/neo4j/graphdb/FacadeMethod.java
index cec5e0eecc74..4ea9c49fa1e9 100644
--- a/community/kernel/src/test/java/org/neo4j/graphdb/FacadeMethod.java
+++ b/community/kernel/src/test/java/org/neo4j/graphdb/FacadeMethod.java
@@ -19,20 +19,44 @@
  */
 package org.neo4j.graphdb;
 
-public abstract class FacadeMethod<T>
+import java.util.Iterator;
+import java.util.function.Consumer;
+
+import static org.junit.Assert.assertNotNull;
+
+public class FacadeMethod<T>
 {
     private final String methodSignature;
+    private final Consumer<T> callable;
 
-    public FacadeMethod( String methodSignature )
+    public FacadeMethod( String methodSignature, Consumer<T> callable )
     {
         this.methodSignature = methodSignature;
+        this.callable = callable;
     }
 
-    public abstract void call( T self );
+    public void call( T self )
+    {
+        callable.accept( self );
+    }
 
     @Override
     public String toString()
     {
         return methodSignature;
     }
+
+    public static <T> void consume( Iterator<T> iterator )
+    {
+        Iterable<T> iterable = () -> iterator;
+        consume( iterable );
+    }
+
+    public static void consume( Iterable<?> iterable )
+    {
+        for ( Object o : iterable )
+        {
+            assertNotNull( o );
+        }
+    }
 }