Move GraphDatabaseAPI to internal pkgs

neo4j · Feb 25, 2016 · 55b75d3 · 55b75d3
1 parent d5af4cb
commit 55b75d3
Show file tree

Hide file tree

Showing 194 changed files with 222 additions and 223 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java b/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java
@@ -53,7 +53,7 @@
 import org.neo4j.graphdb.factory.Description;
 import org.neo4j.helpers.HostnamePort;
 import org.neo4j.helpers.Service;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.configuration.ConfigValues;
 import org.neo4j.kernel.extension.KernelExtensionFactory;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/StandardSessions.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/StandardSessions.java
@@ -21,7 +21,7 @@
 
 import org.neo4j.bolt.v1.runtime.Session;
 import org.neo4j.bolt.v1.runtime.Sessions;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TestSessions.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TestSessions.java
@@ -34,10 +34,10 @@
 import org.neo4j.bolt.v1.runtime.internal.StandardSessions;
 import org.neo4j.bolt.v1.runtime.internal.concurrent.ThreadedSessions;
 import org.neo4j.graphdb.DependencyResolver;
-import org.neo4j.kernel.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.logging.NullLogService;
 import org.neo4j.kernel.impl.util.Neo4jJobScheduler;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.udc.UsageData;

diff --git a/...y-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java b/...y-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java
@@ -33,7 +33,7 @@
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.direct.DirectStoreAccess;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;

diff --git a/...cy/src/test/java/org/neo4j/legacy/consistency/checking/full/FullCheckIntegrationTest.java b/...cy/src/test/java/org/neo4j/legacy/consistency/checking/full/FullCheckIntegrationTest.java
@@ -48,7 +48,7 @@
 import org.neo4j.helpers.UTF8;
 import org.neo4j.helpers.collection.Pair;
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.direct.DirectStoreAccess;

diff --git a/...ity/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java b/...ity/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java
@@ -38,7 +38,7 @@
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.direct.DirectStoreAccess;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;

diff --git a/...ncy-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java b/...ncy-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java
@@ -54,7 +54,7 @@
 import org.neo4j.helpers.UTF8;
 import org.neo4j.helpers.collection.Pair;
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.direct.DirectStoreAccess;

diff --git a/...4j/cypher/internal/compiler/v3_0/executionplan/procs/CallProcedureExecutionPlanTest.scala b/...4j/cypher/internal/compiler/v3_0/executionplan/procs/CallProcedureExecutionPlanTest.scala
@@ -28,9 +28,9 @@ import org.neo4j.cypher.internal.compiler.v3_0.spi._
 import org.neo4j.cypher.internal.frontend.v3_0.ast.{Add, Expression, SignedDecimalIntegerLiteral, StringLiteral}
 import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.frontend.v3_0.{ParameterNotFoundException, DummyPosition, InvalidArgumentException, symbols}
-import org.neo4j.kernel.GraphDatabaseAPI
 import org.neo4j.kernel.api.Statement
 import org.neo4j.kernel.api.txstate.TxStateHolder
+import org.neo4j.kernel.internal.GraphDatabaseAPI
 
 import scala.collection.mutable
 

diff --git a/...ypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CypherEngineProvider.java b/...ypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CypherEngineProvider.java
@@ -21,7 +21,7 @@
 
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService;
 import org.neo4j.helpers.Service;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.query.QueryEngineProvider;
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;

diff --git a/...cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java b/...cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java
@@ -28,7 +28,7 @@
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.security.URLAccessValidationError;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.GraphDatabaseQueryService;
 
 public class GraphDatabaseCypherService implements GraphDatabaseQueryService

diff --git a/...er/cypher/src/main/scala/org/neo4j/cypher/internal/spi/ExtendedTransactionalContext.scala b/...er/cypher/src/main/scala/org/neo4j/cypher/internal/spi/ExtendedTransactionalContext.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.spi
 
 import org.neo4j.cypher.internal.compiler.v3_0.spi.TransactionalContext
 import org.neo4j.graphdb.{Lock, PropertyContainer, Transaction}
-import org.neo4j.kernel.{GraphDatabaseQueryService, GraphDatabaseAPI}
+import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.api.{ReadOperations, Statement}
 import org.neo4j.kernel.api.txstate.TxStateHolder
 import org.neo4j.kernel.impl.api.KernelStatement

diff --git a/.../src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/DoubleCheckCreateUniqueTest.scala b/.../src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/DoubleCheckCreateUniqueTest.scala
@@ -32,8 +32,8 @@ import org.neo4j.graphdb.event.{KernelEventHandler, TransactionEventHandler}
 import org.neo4j.graphdb.index.IndexManager
 import org.neo4j.graphdb.schema.Schema
 import org.neo4j.graphdb.traversal.{BidirectionalTraversalDescription, TraversalDescription}
-import org.neo4j.kernel.GraphDatabaseAPI
 import org.neo4j.kernel.impl.store.StoreId
+import org.neo4j.kernel.internal.GraphDatabaseAPI
 import org.neo4j.test.TestGraphDatabaseFactory
 
 import scala.collection.JavaConverters._

diff --git a/...unity/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LazyTest.scala b/...unity/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LazyTest.scala
@@ -41,12 +41,12 @@ import org.neo4j.cypher.internal.frontend.v3_0.symbols.CTInteger
 import org.neo4j.cypher.internal.spi.v3_0.MonoDirectionalTraversalMatcher
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb._
-import org.neo4j.kernel.GraphDatabaseAPI
 import org.neo4j.kernel.api.{ReadOperations, Statement}
 import org.neo4j.kernel.configuration.Config
 import org.neo4j.kernel.impl.api.OperationsFacade
 import org.neo4j.kernel.impl.core.{NodeManager, NodeProxy, ThreadToStatementContextBridge}
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore
+import org.neo4j.kernel.internal.GraphDatabaseAPI
 
 // TODO: this test is horribly broken, it relies on mocking the core API for verification, but the internals don't use the core API
 class LazyTest extends ExecutionEngineFunSuite {

diff --git a/.../org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTableInstructionsTest.scala b/.../org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTableInstructionsTest.scala
@@ -31,10 +31,10 @@ import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.frontend.v3_0.{SemanticTable, symbols}
 import org.neo4j.cypher.internal.spi.ExtendedTransactionalContext
 import org.neo4j.graphdb.Node
-import org.neo4j.kernel.GraphDatabaseAPI
 import org.neo4j.kernel.api.txstate.TxStateHolder
 import org.neo4j.kernel.api.{ReadOperations, Statement}
 import org.neo4j.kernel.impl.core.{NodeManager, NodeProxy}
+import org.neo4j.kernel.internal.GraphDatabaseAPI
 
 import scala.collection.mutable
 

diff --git a/community/jmx/src/main/java/org/neo4j/jmx/JmxUtils.java b/community/jmx/src/main/java/org/neo4j/jmx/JmxUtils.java
@@ -26,7 +26,7 @@
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.jmx.impl.JmxKernelExtension;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 
 import static java.lang.String.format;
 

diff --git a/community/jmx/src/test/java/org/neo4j/jmx/DescriptionTest.java b/community/jmx/src/test/java/org/neo4j/jmx/DescriptionTest.java
@@ -30,7 +30,7 @@
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.jmx.impl.JmxKernelExtension;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.test.TestGraphDatabaseFactory;
 
 import static java.lang.management.ManagementFactory.getPlatformMBeanServer;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/KernelData.java b/community/kernel/src/main/java/org/neo4j/kernel/KernelData.java
@@ -28,6 +28,7 @@
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.kernel.configuration.Config;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 
 /**
  * @deprecated This will be moved to internal packages in the next major release.

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityEditionModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityEditionModule.java
@@ -27,7 +27,7 @@
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.kernel.DatabaseAvailability;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.KernelData;
 import org.neo4j.kernel.NeoStoreDataSource;
 import org.neo4j.kernel.Version;

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
@@ -49,7 +49,7 @@
 import org.neo4j.graphdb.traversal.TraversalDescription;
 import org.neo4j.helpers.collection.PrefetchingResourceIterator;
 import org.neo4j.helpers.collection.ResourceClosingIterator;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.Statement;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryEngineProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryEngineProvider.java
@@ -20,7 +20,7 @@
 package org.neo4j.kernel.impl.query;
 
 import org.neo4j.helpers.Service;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 
 public abstract class QueryEngineProvider extends Service
 {

diff --git a/...ty/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java b/...ty/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java
@@ -27,7 +27,7 @@
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.helpers.collection.Visitable;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.api.StatementTokenNameLookup;

diff --git a/...va/org/neo4j/kernel/GraphDatabaseAPI.java → ...o4j/kernel/internal/GraphDatabaseAPI.java b/...va/org/neo4j/kernel/GraphDatabaseAPI.java → ...o4j/kernel/internal/GraphDatabaseAPI.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;
+package org.neo4j.kernel.internal;
 
 import java.net.URL;
 
@@ -28,10 +28,7 @@
 
 /**
  * This API can be used to get access to services.
- *
- * @deprecated This will be moved to internal packages in the next major release.
  */
-@Deprecated
 public interface GraphDatabaseAPI extends GraphDatabaseService
 {
     /**

diff --git a/community/kernel/src/main/java/org/neo4j/tooling/GlobalGraphOperations.java b/community/kernel/src/main/java/org/neo4j/tooling/GlobalGraphOperations.java
@@ -26,7 +26,7 @@
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.ResourceIterable;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.api.TokenAccess;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 

diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/DenseNodeIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/DenseNodeIT.java
@@ -23,7 +23,7 @@
 import org.junit.Test;
 
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.MyRelTypes;
 import org.neo4j.test.ImpermanentDatabaseRule;

diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseInternalLogIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseInternalLogIT.java
@@ -29,7 +29,7 @@
 import java.util.stream.Stream;
 
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.logging.StoreLogService;
 import org.neo4j.test.TargetDirectory;

diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseShutdownTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseShutdownTest.java
@@ -26,7 +26,7 @@
 import org.junit.Test;
 
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.locking.LockCountVisitor;
 import org.neo4j.kernel.impl.locking.Locks;
 import org.neo4j.test.TestGraphDatabaseFactory;

diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/IndexingAcceptanceTest.java
@@ -30,7 +30,7 @@
 import org.neo4j.collection.primitive.PrimitiveLongSet;
 import org.neo4j.graphdb.schema.IndexDefinition;
 import org.neo4j.helpers.collection.Iterables;
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;

diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreIT.java b/community/kernel/src/test/java/org/neo4j/graphdb/LabelScanStoreIT.java
@@ -24,7 +24,7 @@
 
 import java.util.Set;
 
-import org.neo4j.kernel.GraphDatabaseAPI;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.test.DatabaseRule;
 import org.neo4j.test.EmbeddedDatabaseRule;
 
@@ -51,7 +51,7 @@ public void shouldGetNodesWithCreatedLabel() throws Exception
         Node node3 = createLabeledNode( Labels.Third );
         Node node4 = createLabeledNode( Labels.First, Labels.Second, Labels.Third );
         Node node5 = createLabeledNode( Labels.First, Labels.Third );
-        
+
         // THEN
         assertEquals(
                 asSet( node1, node4, node5 ),
@@ -63,7 +63,7 @@ public void shouldGetNodesWithCreatedLabel() throws Exception
                 asSet( node3, node4, node5 ),
                 asSet( getAllNodesWithLabel( Labels.Third ) ) );
     }
-    
+
     @Test
     public void shouldGetNodesWithAddedLabel() throws Exception
     {
@@ -73,11 +73,11 @@ public void shouldGetNodesWithAddedLabel() throws Exception
         Node node3 = createLabeledNode( Labels.Third );
         Node node4 = createLabeledNode( Labels.First );
         Node node5 = createLabeledNode( Labels.First );
-        
+
         // WHEN
         addLabels( node4, Labels.Second, Labels.Third );
         addLabels( node5, Labels.Third );
-        
+
         // THEN
         assertEquals(
                 asSet( node1, node4, node5 ),
@@ -89,17 +89,17 @@ public void shouldGetNodesWithAddedLabel() throws Exception
                 asSet( node3, node4, node5 ),
                 asSet( getAllNodesWithLabel( Labels.Third ) ) );
     }
-    
+
     @Test
     public void shouldGetNodesAfterDeletedNodes() throws Exception
     {
         // GIVEN
         Node node1 = createLabeledNode( Labels.First, Labels.Second );
         Node node2 = createLabeledNode( Labels.First, Labels.Third );
-        
+
         // WHEN
         deleteNode( node1 );
-        
+
         // THEN
         assertEquals(
                 asSet( node2 ),
@@ -111,18 +111,18 @@ public void shouldGetNodesAfterDeletedNodes() throws Exception
                 asSet( node2 ),
                 getAllNodesWithLabel( Labels.Third ) );
     }
-    
+
     @Test
     public void shouldGetNodesAfterRemovedLabels() throws Exception
     {
         // GIVEN
         Node node1 = createLabeledNode( Labels.First, Labels.Second );
         Node node2 = createLabeledNode( Labels.First, Labels.Third );
-        
+
         // WHEN
         removeLabels( node1, Labels.First );
         removeLabels( node2, Labels.Third );
-        
+
         // THEN
         assertEquals(
                 asSet( node2 ),
@@ -176,7 +176,7 @@ public void shouldHandleLargeAmountsOfNodesAddedAndRemovedInSameTx() throws Exce
             }
         }
     }
-    
+
     private void removeLabels( Node node, Label... labels )
     {
         try ( Transaction tx = dbRule.getGraphDatabaseService().beginTx() )
@@ -215,7 +215,7 @@ private Node createLabeledNode( Label... labels )
             return node;
         }
     }
-    
+
     private void addLabels( Node node, Label... labels )
     {
         try ( Transaction tx = dbRule.getGraphDatabaseService().beginTx() )

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/KernelDataTest.java b/community/kernel/src/test/java/org/neo4j/kernel/KernelDataTest.java
@@ -33,6 +33,7 @@
 
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.kernel.configuration.Config;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.test.PageCacheRule;
 
 import static org.junit.Assert.assertEquals;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java
@@ -45,6 +45,7 @@
 import org.neo4j.kernel.impl.storemigration.LogFiles;
 import org.neo4j.kernel.impl.transaction.command.Command;
 import org.neo4j.kernel.internal.DatabaseHealth;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.test.AdversarialPageCacheGraphDatabaseFactory;
 import org.neo4j.test.TargetDirectory;
 import org.neo4j.test.TestGraphDatabaseFactory;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/TestGuard.java b/community/kernel/src/test/java/org/neo4j/kernel/TestGuard.java
@@ -29,6 +29,7 @@
 import org.neo4j.kernel.guard.GuardOperationsCountException;
 import org.neo4j.kernel.guard.GuardTimeoutException;
 import org.neo4j.kernel.impl.util.UnsatisfiedDependencyException;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.test.TestGraphDatabaseFactory;
 
 import static java.lang.Integer.MAX_VALUE;