restructuring packages.

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)

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 {

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}

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

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

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
 

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

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;

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;
 
 

community/kernel/src/main/java/org/neo4j/kernel/api/ExecutingQuery.java → community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQuery.java

@@ -17,19 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.api;
+package org.neo4j.kernel.api.query;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Map;
 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 )
         {

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;
 
 /**

community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexUsage.java → 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 <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.api.index;
+package org.neo4j.kernel.api.query;
 
 import java.util.Map;
 

community/kernel/src/main/java/org/neo4j/kernel/api/index/LegacyIndexUsage.java → 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 <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.api.index;
+package org.neo4j.kernel.api.query;
 
 import java.util.HashMap;
 import java.util.Map;

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;

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<IndexUsage> indexes;
 
-    public QueryInfo( String text, Map<String,Object> parameters, PlannerInfo plannerInfo )
+    QueryInfo( String text, Map<String,Object> parameters, PlannerInfo plannerInfo )
     {
         this.text = text;
         this.parameters = parameters;

community/kernel/src/main/java/org/neo4j/kernel/api/index/SchemaIndexUsage.java → 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 <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.api.index;
+package org.neo4j.kernel.api.query;
 
 import java.util.HashMap;
 import java.util.Map;

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" ) );

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;

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;
     }

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
 {

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;

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;

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;

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;

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;
 

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;

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;

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.

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;

community/kernel/src/test/java/org/neo4j/kernel/api/ExecutingQueryTest.java → 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 <http://www.gnu.org/licenses/>.
  */
-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;

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;

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;

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;

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;

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;

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;