add resource tracker argument to various places in the interest of co…

…mpilation

community/cypher/acceptance-spec-suite/src/test/java/org/neo4j/internal/cypher/acceptance/TestResourceProcedure.java

@@ -34,7 +34,7 @@
 
 public class TestResourceProcedure
 {
-    public static abstract class SimulateFailureBaseException extends RuntimeException
+    abstract static class SimulateFailureBaseException extends RuntimeException
     {
     }
 

community/security/src/test/java/org/neo4j/server/security/auth/AuthProceduresTest.java

@@ -24,6 +24,8 @@
 import org.junit.rules.ExpectedException;
 
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
+import org.neo4j.kernel.api.ResourceTracker;
+import org.neo4j.kernel.api.StubResourceManager;
 import org.neo4j.kernel.api.exceptions.ProcedureException;
 import org.neo4j.kernel.api.security.AnonymousContext;
 import org.neo4j.kernel.impl.api.integrationtest.KernelIntegrationTest;
@@ -36,6 +38,8 @@ public class AuthProceduresTest extends KernelIntegrationTest
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
+    private final ResourceTracker<AutoCloseable> resourceTracker = new StubResourceManager();
+
     @Test
     public void shouldFailWhenDeprecatedChangePasswordWithStaticAccessModeInDbmsMode() throws Throwable
     {
@@ -49,7 +53,10 @@ public void shouldFailWhenDeprecatedChangePasswordWithStaticAccessModeInDbmsMode
 
         // When
         dbmsOperations()
-                .procedureCallDbms( procedureName( "dbms", "changePassword" ), inputArray, AnonymousContext.none() );
+                .procedureCallDbms( procedureName( "dbms", "changePassword" ),
+                                    inputArray,
+                                    AnonymousContext.none(),
+                                    resourceTracker );
     }
 
     @Test
@@ -64,7 +71,10 @@ public void shouldFailWhenChangePasswordWithStaticAccessModeInDbmsMode() throws
         exception.expectMessage( "Anonymous cannot change password" );
 
         // When
-        dbmsOperations().procedureCallDbms( procedureName( "dbms", "security", "changePassword" ), inputArray, AnonymousContext.none() );
+        dbmsOperations().procedureCallDbms( procedureName( "dbms", "security", "changePassword" ),
+                                            inputArray,
+                                            AnonymousContext.none(),
+                                            resourceTracker );
     }
 
     @Override

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/procedures/ClusterOverviewProcedure.java

@@ -36,6 +36,7 @@
 import org.neo4j.causalclustering.discovery.ReadReplicaAddresses;
 import org.neo4j.causalclustering.identity.MemberId;
 import org.neo4j.collection.RawIterator;
+import org.neo4j.kernel.api.ResourceTracker;
 import org.neo4j.kernel.api.exceptions.ProcedureException;
 import org.neo4j.kernel.api.proc.CallableProcedure;
 import org.neo4j.kernel.api.proc.Context;
@@ -70,7 +71,8 @@ public ClusterOverviewProcedure( CoreTopologyService discoveryService,
     }
 
     @Override
-    public RawIterator<Object[],ProcedureException> apply( Context ctx, Object[] input ) throws ProcedureException
+    public RawIterator<Object[],ProcedureException> apply(
+            Context ctx, Object[] input, ResourceTracker resourceTracker ) throws ProcedureException
     {
         List<ReadWriteEndPoint> endpoints = new ArrayList<>();
         CoreTopology coreTopology = discoveryService.coreServers();

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/procedures/GetServersProcedure.java

@@ -36,6 +36,7 @@
 import org.neo4j.causalclustering.identity.MemberId;
 import org.neo4j.collection.RawIterator;
 import org.neo4j.helpers.AdvertisedSocketAddress;
+import org.neo4j.kernel.api.ResourceTracker;
 import org.neo4j.kernel.api.exceptions.ProcedureException;
 import org.neo4j.kernel.api.proc.CallableProcedure;
 import org.neo4j.kernel.api.proc.Context;
@@ -86,7 +87,8 @@ public GetServersProcedure( CoreTopologyService discoveryService, LeaderLocator
     }
 
     @Override
-    public RawIterator<Object[],ProcedureException> apply( Context ctx, Object[] input ) throws ProcedureException
+    public RawIterator<Object[],ProcedureException> apply(
+            Context ctx, Object[] input, ResourceTracker resourceTracker ) throws ProcedureException
     {
         List<ReadWriteRouteEndPoint> writeEndpoints = writeEndpoints();
         List<ReadWriteRouteEndPoint> readEndpoints = readEndpoints();

enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/procedures/RoleProcedure.java

@@ -20,6 +20,7 @@
 package org.neo4j.causalclustering.discovery.procedures;
 
 import org.neo4j.collection.RawIterator;
+import org.neo4j.kernel.api.ResourceTracker;
 import org.neo4j.kernel.api.exceptions.ProcedureException;
 import org.neo4j.kernel.api.proc.CallableProcedure;
 import org.neo4j.kernel.api.proc.Context;
@@ -43,7 +44,8 @@ abstract class RoleProcedure extends CallableProcedure.BasicProcedure
     }
 
     @Override
-    public RawIterator<Object[],ProcedureException> apply( Context ctx, Object[] input ) throws ProcedureException
+    public RawIterator<Object[],ProcedureException> apply(
+            Context ctx, Object[] input, ResourceTracker resourceTracker ) throws ProcedureException
     {
         return RawIterator.<Object[],ProcedureException>of( new Object[]{role().name()} );
     }

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/procedures/ClusterOverviewProcedureTest.java

@@ -74,7 +74,7 @@ public void shouldProvideOverviewOfCoreServersAndReadReplicas() throws Exception
                 NullLogProvider.getInstance() );
 
         // when
-        final List<Object[]> members = asList( procedure.apply( null, new Object[0] ) );
+        final List<Object[]> members = asList( procedure.apply( null, new Object[0], null ) );
 
         // then
         assertThat( members, IsIterableContainingInOrder.contains(

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/procedures/GetServersProcedureRoutingTest.java

@@ -109,7 +109,7 @@ public void shouldReturnEndpointsInDifferentOrders() throws Exception
     private Object[] getEndpoints( GetServersProcedure proc )
             throws org.neo4j.kernel.api.exceptions.ProcedureException
     {
-        List<Object[]> results = asList( proc.apply( null, new Object[0] ) );
+        List<Object[]> results = asList( proc.apply( null, new Object[0], null ) );
         Object[] rows = results.get( 0 );
         List<Map<String,Object[]>> servers = (List<Map<String,Object[]>>) rows[1];
         Map<String,Object[]> endpoints = servers.get( serverClass );

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/procedures/GetServersProcedureTest.java

@@ -115,7 +115,7 @@ public void ttlShouldBeInSeconds() throws Exception
                 new GetServersProcedure( coreTopologyService, leaderLocator, config, getInstance() );
 
         // when
-        List<Object[]> results = asList( proc.apply( null, new Object[0] ) );
+        List<Object[]> results = asList( proc.apply( null, new Object[0], null ) );
 
         // then
         Object[] rows = results.get( 0 );
@@ -361,7 +361,7 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoAddressForTheLeader() throws
     @SuppressWarnings( "unchecked" )
     private ClusterView run( GetServersProcedure proc ) throws ProcedureException
     {
-        final Object[] rows = asList( proc.apply( null, new Object[0] ) ).get( 0 );
+        final Object[] rows = asList( proc.apply( null, new Object[0], null ) ).get( 0 );
         assertEquals( config.get( cluster_routing_ttl ) / 1000, /* ttl */(long) rows[0] );
         return ClusterView.parse( (List<Map<String,Object>>) rows[1] );
     }

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/procedures/RoleProcedureTest.java

@@ -43,7 +43,7 @@ public void shouldReturnLeader() throws Exception
         RoleProcedure proc = new CoreRoleProcedure( raft );
 
         // when
-        RawIterator<Object[], ProcedureException> result = proc.apply( null, null );
+        RawIterator<Object[], ProcedureException> result = proc.apply( null, null, null );
 
         // then
         assertEquals( Role.LEADER.name(), single( result )[0]);
@@ -58,7 +58,7 @@ public void shouldReturnFollower() throws Exception
         RoleProcedure proc = new CoreRoleProcedure( raft );
 
         // when
-        RawIterator<Object[], ProcedureException> result = proc.apply( null, null );
+        RawIterator<Object[], ProcedureException> result = proc.apply( null, null, null );
 
         // then
         assertEquals( Role.FOLLOWER.name(), single( result )[0]);
@@ -71,7 +71,7 @@ public void shouldReturnReadReplica() throws Exception
         RoleProcedure proc = new ReadReplicaRoleProcedure();
 
         // when
-        RawIterator<Object[], ProcedureException> result = proc.apply( null, null );
+        RawIterator<Object[], ProcedureException> result = proc.apply( null, null, null );
 
         // then
         assertEquals( Role.READ_REPLICA.name(), single( result )[0]);