diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala
index 9233b9358927c..a3f34e03567c6 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala
@@ -25,7 +25,7 @@ import org.neo4j.cypher.internal.ExecutionResult
import org.neo4j.graphdb
import org.neo4j.graphdb.ResourceIterator
import org.neo4j.graphdb.Result.ResultVisitor
-import org.neo4j.kernel.api.ExecutingQuery
+import org.neo4j.kernel.api.query.ExecutingQuery
import org.neo4j.kernel.impl.query.QueryExecutionMonitor
class ClosingExecutionResult(val query: ExecutingQuery, val inner: ExecutionResult, runSafely: RunSafely)
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/OnlyOnceQueryExecutionMonitor.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/OnlyOnceQueryExecutionMonitor.scala
index 6e82847fdf82a..ad349ea4f1642 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/OnlyOnceQueryExecutionMonitor.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/OnlyOnceQueryExecutionMonitor.scala
@@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal.compatibility
-import org.neo4j.kernel.api.ExecutingQuery
+import org.neo4j.kernel.api.query.ExecutingQuery
import org.neo4j.kernel.impl.query.QueryExecutionMonitor
case class OnlyOnceQueryExecutionMonitor(monitor: QueryExecutionMonitor) extends QueryExecutionMonitor {
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Compatibility.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Compatibility.scala
index 272666fc87663..1af3baf60bb55 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Compatibility.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Compatibility.scala
@@ -33,9 +33,8 @@ import org.neo4j.cypher.internal.spi.v2_3.{TransactionBoundGraphStatistics, Tran
import org.neo4j.cypher.internal.spi.v3_2.TransactionalContextWrapper
import org.neo4j.graphdb.{Node, Relationship}
import org.neo4j.kernel.GraphDatabaseQueryService
-import org.neo4j.kernel.api.query.PlannerInfo
+import org.neo4j.kernel.api.query.{IndexUsage, PlannerInfo}
import org.neo4j.kernel.api.KernelAPI
-import org.neo4j.kernel.api.index.IndexUsage
import org.neo4j.kernel.impl.core.NodeManager
import org.neo4j.kernel.impl.query.QueryExecutionMonitor
import org.neo4j.kernel.monitoring.{Monitors => KernelMonitors}
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/Compatibility.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/Compatibility.scala
index dedd0a46399c0..7f0e057e096f5 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/Compatibility.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/Compatibility.scala
@@ -32,9 +32,8 @@ import org.neo4j.cypher.internal.spi.v3_1.{TransactionalContextWrapper => Transa
import org.neo4j.cypher.internal.spi.v3_2.{TransactionalContextWrapper => TransactionalContextWrapperV3_2}
import org.neo4j.cypher.internal.{frontend, _}
import org.neo4j.kernel.GraphDatabaseQueryService
-import org.neo4j.kernel.api.query.PlannerInfo
+import org.neo4j.kernel.api.query.{IndexUsage, PlannerInfo}
import org.neo4j.kernel.api.KernelAPI
-import org.neo4j.kernel.api.index.IndexUsage
import org.neo4j.kernel.impl.query.QueryExecutionMonitor
import org.neo4j.kernel.monitoring.{Monitors => KernelMonitors}
import org.neo4j.logging.Log
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/Compatibility.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/Compatibility.scala
index 9f66a783ef501..6be3c6b10ae2e 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/Compatibility.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/Compatibility.scala
@@ -29,7 +29,7 @@ import org.neo4j.cypher.internal.frontend.v3_2.helpers.rewriting.RewriterStepSeq
import org.neo4j.cypher.internal.frontend.v3_2.phases.{CompilationPhaseTracer, RecordingNotificationLogger}
import org.neo4j.cypher.internal.spi.v3_2.TransactionBoundQueryContext.IndexSearchMonitor
import org.neo4j.cypher.internal.spi.v3_2._
-import org.neo4j.kernel.api.index.IndexUsage.{legacyIndexUsage, schemaIndexUsage}
+import org.neo4j.kernel.api.query.IndexUsage.{legacyIndexUsage, schemaIndexUsage}
import org.neo4j.kernel.api.KernelAPI
import org.neo4j.kernel.api.query.PlannerInfo
import org.neo4j.kernel.impl.query.QueryExecutionMonitor
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
index 9f9c9a0afb474..36e1e2c42e5f3 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
@@ -28,7 +28,7 @@ import org.neo4j.cypher.internal.{ExecutionEngine, ExecutionResult}
import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor}
import org.neo4j.kernel.GraphDatabaseQueryService
-import org.neo4j.kernel.api.ExecutingQuery
+import org.neo4j.kernel.api.query.ExecutingQuery
import org.neo4j.kernel.impl.query.{QueryExecutionMonitor, TransactionalContext}
import org.neo4j.test.TestGraphDatabaseFactory
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryStatisticsTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryStatisticsTestSupport.scala
index 1a10563cda697..38bc94d5100dd 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryStatisticsTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/QueryStatisticsTestSupport.scala
@@ -23,7 +23,7 @@ import org.neo4j.cypher.internal.QueryStatistics
import org.neo4j.cypher.internal.compatibility.v3_2.ExecutionResultWrapper
import org.neo4j.cypher.internal.compiler.v3_2.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_2.{CompiledRuntimeName, CostBasedPlannerName}
-import org.neo4j.kernel.api.ExecutingQuery
+import org.neo4j.kernel.api.query.ExecutingQuery
import org.neo4j.kernel.impl.query.QueryExecutionMonitor
import org.scalatest.Assertions
import org.scalatest.mock.MockitoSugar
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransactionHandle.java b/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransactionHandle.java
index 2dfc37d6df3de..b5498b30ec226 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransactionHandle.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransactionHandle.java
@@ -23,6 +23,7 @@
import java.util.stream.Stream;
import org.neo4j.kernel.api.exceptions.Status;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.security.SecurityContext;
import org.neo4j.kernel.impl.api.Kernel;
import org.neo4j.kernel.impl.locking.ActiveLock;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/QueryRegistryOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/QueryRegistryOperations.java
index 4b960da47815b..7cb28e0cd5b76 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/QueryRegistryOperations.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/QueryRegistryOperations.java
@@ -22,6 +22,7 @@
import java.util.Map;
import java.util.stream.Stream;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQuery.java
similarity index 95%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQuery.java
index 16f233519b597..ea1ee1dac6d9b 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQuery.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api;
+package org.neo4j.kernel.api.query;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -25,11 +25,6 @@
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import java.util.function.LongSupplier;
-import org.neo4j.kernel.api.query.ExecutingQueryStatus;
-import org.neo4j.kernel.api.query.PlannerInfo;
-import org.neo4j.kernel.api.query.QueryInfo;
-import org.neo4j.kernel.api.query.SimpleState;
-import org.neo4j.kernel.api.query.WaitingOnLockEvent;
import org.neo4j.kernel.impl.locking.ActiveLock;
import org.neo4j.kernel.impl.locking.LockTracer;
import org.neo4j.kernel.impl.locking.LockWaitEvent;
@@ -246,7 +241,7 @@ private LockWaitEvent waitForLock( boolean exclusive, ResourceType resourceType,
return event;
}
- public void closeWaitingOnLockEvent( WaitingOnLockEvent waitingOnLockEvent )
+ void closeWaitingOnLockEvent( WaitingOnLockEvent waitingOnLockEvent )
{
if ( status != waitingOnLockEvent )
{
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQueryStatus.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQueryStatus.java
index 93daae9e78033..8e06c2920f369 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQueryStatus.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQueryStatus.java
@@ -21,7 +21,6 @@
import java.util.Map;
-import org.neo4j.kernel.api.ExecutingQuery;
import org.neo4j.time.SystemNanoClock;
/**
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexUsage.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/IndexUsage.java
similarity index 97%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexUsage.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/query/IndexUsage.java
index f952beb4f890d..54c89c4c5c467 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexUsage.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/IndexUsage.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api.index;
+package org.neo4j.kernel.api.query;
import java.util.Map;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/LegacyIndexUsage.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/LegacyIndexUsage.java
similarity index 97%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/index/LegacyIndexUsage.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/query/LegacyIndexUsage.java
index 038baa330a1bb..605ea3504d2ea 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/LegacyIndexUsage.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/LegacyIndexUsage.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api.index;
+package org.neo4j.kernel.api.query;
import java.util.HashMap;
import java.util.Map;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/PlannerInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/PlannerInfo.java
index 46095a7ddf804..267bb27b64676 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/PlannerInfo.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/PlannerInfo.java
@@ -23,8 +23,6 @@
import javax.annotation.Nonnull;
-import org.neo4j.kernel.api.index.IndexUsage;
-
public class PlannerInfo
{
private final String planner;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/QueryInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/QueryInfo.java
index 3b8d093bd58eb..b3cbebbaabc6f 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/QueryInfo.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/QueryInfo.java
@@ -23,8 +23,6 @@
import java.util.List;
import java.util.Map;
-import org.neo4j.kernel.api.index.IndexUsage;
-
import static java.util.Collections.emptyList;
public class QueryInfo
@@ -35,7 +33,7 @@ public class QueryInfo
private final String runtime;
private final List indexes;
- public QueryInfo( String text, Map parameters, PlannerInfo plannerInfo )
+ QueryInfo( String text, Map parameters, PlannerInfo plannerInfo )
{
this.text = text;
this.parameters = parameters;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexUsage.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/SchemaIndexUsage.java
similarity index 97%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexUsage.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/query/SchemaIndexUsage.java
index f325d16c0d71b..4075338c29a9d 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexUsage.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/SchemaIndexUsage.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api.index;
+package org.neo4j.kernel.api.query;
import java.util.HashMap;
import java.util.Map;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/SimpleState.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/SimpleState.java
index 3b59fe68eefee..202c497119e3c 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/SimpleState.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/SimpleState.java
@@ -27,7 +27,7 @@
import static java.util.Collections.singletonMap;
import static java.util.Collections.unmodifiableMap;
-public final class SimpleState extends ExecutingQueryStatus
+final class SimpleState extends ExecutingQueryStatus
{
private static final ExecutingQueryStatus PLANNING = new SimpleState( singletonMap( "state", "PLANNING" ) );
private static final ExecutingQueryStatus RUNNING = new SimpleState( singletonMap( "state", "RUNNING" ) );
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/WaitingOnLock.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/WaitingOnLock.java
index d3eb3a3be5f55..e4f0f5553e343 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/WaitingOnLock.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/WaitingOnLock.java
@@ -26,14 +26,14 @@
import org.neo4j.storageengine.api.lock.ResourceType;
import org.neo4j.time.SystemNanoClock;
-public class WaitingOnLock extends ExecutingQueryStatus
+class WaitingOnLock extends ExecutingQueryStatus
{
private final String mode;
private final ResourceType resourceType;
private final long[] resourceIds;
private final long startTimeNanos;
- public WaitingOnLock( String mode, ResourceType resourceType, long[] resourceIds, long startTimeNanos )
+ WaitingOnLock( String mode, ResourceType resourceType, long[] resourceIds, long startTimeNanos )
{
this.mode = mode;
this.resourceType = resourceType;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/WaitingOnLockEvent.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/WaitingOnLockEvent.java
index 2a529d9e000a1..13e8274963ec8 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/WaitingOnLockEvent.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/WaitingOnLockEvent.java
@@ -19,27 +19,22 @@
*/
package org.neo4j.kernel.api.query;
-import org.neo4j.kernel.api.ExecutingQuery;
import org.neo4j.kernel.impl.locking.LockWaitEvent;
import org.neo4j.storageengine.api.lock.ResourceType;
-public class WaitingOnLockEvent extends WaitingOnLock implements LockWaitEvent
+class WaitingOnLockEvent extends WaitingOnLock implements LockWaitEvent
{
private final ExecutingQueryStatus previous;
private final ExecutingQuery executingQuery;
- public WaitingOnLockEvent(
- String mode,
- ResourceType resourceType,
- long[] resourceIds,
- ExecutingQuery executingQuery )
+ WaitingOnLockEvent( String mode, ResourceType resourceType, long[] resourceIds, ExecutingQuery executingQuery )
{
super( mode, resourceType, resourceIds, executingQuery.clock().nanos() );
this.executingQuery = executingQuery;
this.previous = executingQuery.executingQueryStatus();
}
- public ExecutingQueryStatus previousStatus()
+ ExecutingQueryStatus previousStatus()
{
return previous;
}
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ExecutingQueryList.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ExecutingQueryList.java
index 6cedb011e551b..ed431134f841b 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ExecutingQueryList.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ExecutingQueryList.java
@@ -23,7 +23,7 @@
import java.util.function.Function;
import java.util.stream.Stream;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
abstract class ExecutingQueryList
{
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java
index 0ead45c07831a..0e1f12d262643 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java
@@ -25,7 +25,7 @@
import org.neo4j.graphdb.NotInTransactionException;
import org.neo4j.graphdb.TransactionTerminatedException;
import org.neo4j.kernel.api.DataWriteOperations;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.ProcedureCallOperations;
import org.neo4j.kernel.api.QueryRegistryOperations;
import org.neo4j.kernel.api.ReadOperations;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationHandle.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationHandle.java
index 5193793255c9c..0da5764c1e592 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationHandle.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationHandle.java
@@ -22,7 +22,7 @@
import java.util.Optional;
import java.util.stream.Stream;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.KernelTransactionHandle;
import org.neo4j.kernel.api.exceptions.Status;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java
index 4351582fdded3..0909c82a13f88 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java
@@ -34,7 +34,7 @@
import org.neo4j.cursor.Cursor;
import org.neo4j.graphdb.Direction;
import org.neo4j.kernel.api.DataWriteOperations;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.LegacyIndexHits;
import org.neo4j.kernel.api.TokenWriteOperations;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java
index c4bba48a3b349..a3731cb507c6c 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StackingQueryRegistrationOperations.java
@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.stream.Stream;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.impl.api.operations.QueryRegistrationOperations;
import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
import org.neo4j.kernel.impl.util.MonotonicCounter;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/QueryRegistrationOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/QueryRegistrationOperations.java
index 6eab1d4337784..13ee2c5d8ff33 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/QueryRegistrationOperations.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/QueryRegistrationOperations.java
@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.stream.Stream;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.impl.api.KernelStatement;
import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java
index 59d133aff606c..d1c2d58f9f348 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java
@@ -27,6 +27,7 @@
import org.neo4j.kernel.GraphDatabaseQueryService;
import org.neo4j.kernel.api.*;
import org.neo4j.kernel.api.dbms.DbmsOperations;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.security.SecurityContext;
import org.neo4j.kernel.api.txstate.TxStateHolder;
import org.neo4j.kernel.guard.Guard;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextFactory.java
index 97a153945aee8..bc292ab0b77b1 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextFactory.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextFactory.java
@@ -24,7 +24,7 @@
import org.neo4j.graphdb.DependencyResolver;
import org.neo4j.kernel.GraphDatabaseQueryService;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.Statement;
import org.neo4j.kernel.guard.Guard;
import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryExecutionMonitor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryExecutionMonitor.java
index 13b74eaf6ce9c..b0f9abe29d121 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryExecutionMonitor.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryExecutionMonitor.java
@@ -19,7 +19,7 @@
*/
package org.neo4j.kernel.impl.query;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
/**
* The current (December 2014) usage of this interface expects the {@code end*} methods to be idempotent.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java
index 0f721d65c7474..e20ec845d8a2a 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java
@@ -22,7 +22,7 @@
import org.neo4j.graphdb.Lock;
import org.neo4j.graphdb.PropertyContainer;
import org.neo4j.kernel.GraphDatabaseQueryService;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.ReadOperations;
import org.neo4j.kernel.api.Statement;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/ExecutingQueryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryTest.java
similarity index 98%
rename from community/kernel/src/test/java/org/neo4j/kernel/api/ExecutingQueryTest.java
rename to community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryTest.java
index 106663ad2395e..3b937a87cec6a 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/api/ExecutingQueryTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryTest.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api;
+package org.neo4j.kernel.api.query;
import java.time.ZonedDateTime;
import java.util.Arrays;
@@ -31,6 +31,7 @@
import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.query.PlannerInfo;
import org.neo4j.kernel.impl.locking.LockWaitEvent;
import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/ExecutingQueryListTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/ExecutingQueryListTest.java
index a431013aa393b..e82a5228d31e9 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/ExecutingQueryListTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/ExecutingQueryListTest.java
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.stream.Collectors;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
import org.neo4j.time.Clocks;
import org.neo4j.time.CpuClock;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TestKernelTransactionHandle.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TestKernelTransactionHandle.java
index eee0399224be4..278cc539de7c5 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TestKernelTransactionHandle.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TestKernelTransactionHandle.java
@@ -23,7 +23,7 @@
import java.util.Optional;
import java.util.stream.Stream;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.KernelTransactionHandle;
import org.neo4j.kernel.api.exceptions.Status;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextTest.java
index fe5f85aaf9036..38e2cf281f8ab 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContextTest.java
@@ -29,7 +29,7 @@
import org.neo4j.graphdb.DependencyResolver;
import org.neo4j.kernel.GraphDatabaseQueryService;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.QueryRegistryOperations;
import org.neo4j.kernel.api.Statement;
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInDbmsProcedures.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInDbmsProcedures.java
index 6d6bfed636c7d..c08a8c0bed0c0 100644
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInDbmsProcedures.java
+++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/EnterpriseBuiltInDbmsProcedures.java
@@ -33,7 +33,7 @@
import org.neo4j.graphdb.DependencyResolver;
import org.neo4j.graphdb.security.AuthorizationViolationException;
import org.neo4j.helpers.collection.Pair;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.KernelTransactionHandle;
import org.neo4j.kernel.api.Statement;
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java
index 9d202fd270864..fd306d06c0e7a 100644
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java
+++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/enterprise/builtinprocs/QueryStatusResult.java
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.Map;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.exceptions.InvalidArgumentsException;
import org.neo4j.kernel.api.query.QueryInfo;
import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
diff --git a/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java b/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java
index 0db2e9a6b7d8e..d3473bec665d5 100644
--- a/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java
+++ b/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLoggerKernelExtension.java
@@ -29,7 +29,7 @@
import org.neo4j.helpers.Service;
import org.neo4j.helpers.Strings;
import org.neo4j.io.fs.FileSystemAbstraction;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.extension.KernelExtensionFactory;
import org.neo4j.kernel.impl.logging.LogService;
diff --git a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java
index f56b089d7d2ef..5b52fc6f2bef4 100644
--- a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java
+++ b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java
@@ -27,7 +27,7 @@
import org.junit.Test;
-import org.neo4j.kernel.api.ExecutingQuery;
+import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.impl.query.QueryLoggerKernelExtension.QueryLogger;
import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
import org.neo4j.kernel.impl.query.clientconnection.ShellConnectionInfo;