From 55b75d3d884292bd3e42526647eb51daf641eb75 Mon Sep 17 00:00:00 2001 From: Davide Grohmann Date: Wed, 24 Feb 2016 12:08:30 +0100 Subject: [PATCH] Move GraphDatabaseAPI to internal pkgs --- .../org/neo4j/bolt/BoltKernelExtension.java | 2 +- .../v1/runtime/internal/StandardSessions.java | 2 +- .../v1/runtime/integration/TestSessions.java | 2 +- .../checking/GraphStoreFixture.java | 2 +- .../full/FullCheckIntegrationTest.java | 2 +- .../checking/GraphStoreFixture.java | 2 +- .../full/FullCheckIntegrationTest.java | 2 +- .../CallProcedureExecutionPlanTest.scala | 2 +- .../javacompat/CypherEngineProvider.java | 2 +- .../internal/GraphDatabaseCypherService.java | 2 +- .../spi/ExtendedTransactionalContext.scala | 2 +- .../v3_0/DoubleCheckCreateUniqueTest.scala | 2 +- .../internal/compiler/v3_0/LazyTest.scala | 2 +- .../ir/BuildProbeTableInstructionsTest.scala | 2 +- .../src/main/java/org/neo4j/jmx/JmxUtils.java | 2 +- .../java/org/neo4j/jmx/DescriptionTest.java | 2 +- .../java/org/neo4j/kernel/KernelData.java | 1 + .../impl/factory/CommunityEditionModule.java | 2 +- .../impl/factory/GraphDatabaseFacade.java | 2 +- .../impl/query/QueryEngineProvider.java | 2 +- .../dbstructure/GraphDbStructureGuide.java | 2 +- .../{ => internal}/GraphDatabaseAPI.java | 5 +--- .../neo4j/tooling/GlobalGraphOperations.java | 2 +- .../java/org/neo4j/graphdb/DenseNodeIT.java | 2 +- .../graphdb/GraphDatabaseInternalLogIT.java | 2 +- .../graphdb/GraphDatabaseShutdownTest.java | 2 +- .../neo4j/graphdb/IndexingAcceptanceTest.java | 2 +- .../org/neo4j/graphdb/LabelScanStoreIT.java | 26 +++++++++---------- .../java/org/neo4j/kernel/KernelDataTest.java | 1 + .../java/org/neo4j/kernel/RecoveryIT.java | 1 + .../test/java/org/neo4j/kernel/TestGuard.java | 1 + .../org/neo4j/kernel/TestKernelExtension.java | 1 + .../index/UniqueConstraintCompatibility.java | 2 +- .../KernelExtensionFactoryContractTest.java | 2 +- .../kernel/impl/AbstractNeo4jTestCase.java | 2 +- .../api/KernelSchemaStateFlushingTest.java | 2 +- .../org/neo4j/kernel/impl/api/KernelTest.java | 2 +- .../kernel/impl/api/SchemaLoggingIT.java | 2 +- ...nsactionRepresentationCommitProcessIT.java | 2 -- .../kernel/impl/api/index/IndexCRUDIT.java | 2 +- .../api/index/IndexPopulationJobTest.java | 2 +- .../impl/api/index/IndexRecoveryIT.java | 2 +- .../impl/api/index/IndexStatisticsIT.java | 2 +- .../impl/api/index/IndexStatisticsTest.java | 2 +- .../KernelIntegrationTest.java | 2 +- .../state/NoChangeWriteTransactionTest.java | 2 +- .../kernel/impl/api/store/DiskLayerTest.java | 2 +- .../impl/api/store/TestReferenceDangling.java | 2 +- .../neo4j/kernel/impl/core/BigStoreIT.java | 2 +- .../kernel/impl/core/ManyPropertyKeysIT.java | 2 +- .../kernel/impl/core/NodeManagerTest.java | 2 +- ...ncurrentRelationshipChainLoadingIssue.java | 2 +- .../impl/core/TestCrashWithRebuildSlow.java | 2 +- .../impl/core/TestRelationshipGrabSize.java | 2 +- .../impl/event/TestTransactionEvents.java | 2 +- .../impl/store/ProduceUncleanStore.java | 2 +- .../impl/store/TestGraphProperties.java | 2 +- .../impl/store/counts/CountsComputerTest.java | 2 +- .../impl/store/counts/CountsRotationTest.java | 2 +- ...DeferredIndexedConflictResolutionTest.java | 2 +- .../DuplicatePropertyRemoverTest.java | 2 +- ...ndexConsultedPropertyBlockSweeperTest.java | 2 +- .../IndexLookupTest.java | 2 +- .../NonIndexedConflictResolverTest.java | 2 +- .../ReadTransactionLogWritingTest.java | 2 +- .../transaction/TransactionMonitorTest.java | 2 +- .../log/pruning/TestLogPruning.java | 2 +- .../state/NeoStoreIndexStoreViewTest.java | 2 +- .../GraphDbStructureGuideTest.java | 2 +- .../java/org/neo4j/test/DatabaseRule.java | 2 +- .../unsafe/batchinsert/BatchInsertTest.java | 2 +- .../input/csv/CsvInputBatchImportIT.java | 2 +- .../ConstraintIndexConcurrencyTest.java | 2 +- .../impl/lucene/legacy/IndexCreationTest.java | 2 +- .../impl/lucene/legacy/TestAutoIndexing.java | 2 +- .../lucene/legacy/TestIndexDelectionFs.java | 2 +- .../impl/lucene/legacy/TestLuceneIndex.java | 2 +- .../recovery/UniqueIndexRecoveryTests.java | 2 +- .../impl/schema/LuceneIndexRecoveryIT.java | 2 +- .../api/constraints/ConstraintCreationIT.java | 2 +- .../api/constraints/ConstraintRecoveryIT.java | 2 +- .../index/IndexingServiceIntegrationTest.java | 2 +- .../TestLuceneSchemaBatchInsertIT.java | 2 +- .../MonitorLoggingAcceptanceTest.java | 2 +- .../org/neo4j/harness/internal/Procs.java | 2 +- .../test/java/counts/RebuildCountsTest.java | 2 +- .../index/IndexSamplingIntegrationTest.java | 2 +- .../recovery/CountsStoreRecoveryTest.java | 2 +- .../TestRecoveryMultipleDataSources.java | 2 +- .../java/recovery/TestRecoveryScenarios.java | 2 +- .../java/recovery/UniquenessRecoveryTest.java | 2 +- .../TestMigrateToDenseNodeSupport.java | 2 +- .../neo4j/server/plugins/ParameterList.java | 2 +- .../org/neo4j/server/plugins/PluginPoint.java | 2 +- .../rest/repr/RepresentationFormat.java | 2 +- .../server/plugins/PluginManagerTest.java | 2 +- .../org/neo4j/server/database/Database.java | 2 +- .../database/LifecycleManagingDatabase.java | 2 +- .../server/database/WrappedDatabase.java | 2 +- .../server/modules/ExtensionInitializer.java | 2 +- .../server/plugins/BooleanTypeCaster.java | 2 +- .../neo4j/server/plugins/ByteTypeCaster.java | 2 +- .../server/plugins/CharacterTypeCaster.java | 2 +- .../neo4j/server/plugins/DataExtractor.java | 2 +- .../server/plugins/DoubleTypeCaster.java | 2 +- .../neo4j/server/plugins/FloatTypeCaster.java | 2 +- .../server/plugins/IntegerTypeCaster.java | 2 +- .../plugins/ListParameterExtractor.java | 2 +- .../neo4j/server/plugins/LongTypeCaster.java | 2 +- .../neo4j/server/plugins/MapTypeCaster.java | 2 +- .../neo4j/server/plugins/NodeTypeCaster.java | 2 +- .../server/plugins/ParameterExtractor.java | 2 +- .../neo4j/server/plugins/PluginInvocator.java | 2 +- .../neo4j/server/plugins/PluginManager.java | 2 +- .../neo4j/server/plugins/PluginMethod.java | 2 +- .../plugins/RelationshipTypeCaster.java | 2 +- .../plugins/RelationshipTypeTypeCaster.java | 2 +- .../neo4j/server/plugins/ShortTypeCaster.java | 2 +- .../neo4j/server/plugins/SourceExtractor.java | 2 +- .../server/plugins/StringTypeCaster.java | 2 +- .../org/neo4j/server/plugins/TypeCaster.java | 2 +- .../neo4j/server/plugins/URLTypeCaster.java | 2 +- .../neo4j/server/plugins/UriTypeCaster.java | 2 +- .../rest/domain/PropertySettingStrategy.java | 4 +-- .../rest/management/console/ShellSession.java | 2 +- ...itionalPeriodTransactionMessContainer.java | 2 +- .../server/rest/web/DatabaseActions.java | 2 +- .../server/rest/web/ExtensionService.java | 2 +- .../org/neo4j/server/NeoServerJAXRSDocIT.java | 2 +- .../LifecycleManagingDatabaseTest.java | 2 +- .../server/helpers/FunctionalTestHelper.java | 2 +- .../neo4j/server/helpers/ServerHelper.java | 2 +- .../rest/AbstractRestFunctionalTestBase.java | 2 +- .../domain/PropertySettingStrategyTest.java | 2 +- .../integration/TransactionIT.java | 3 +-- .../server/rest/web/DatabaseActionsTest.java | 2 +- .../rest/web/DatabaseMetadataServiceTest.java | 2 +- .../server/rest/web/PagingTraversalTest.java | 2 +- ...estfulGraphDatabasePagedTraversalTest.java | 2 +- .../rest/web/RestfulGraphDatabaseTest.java | 2 +- .../TransactionWrappedDatabaseActions.java | 2 +- .../console/CypherSessionDocTest.java | 2 +- .../rest/Neo4jShellConsoleSessionDocTest.java | 2 +- .../org/neo4j/shell/impl/ShellBootstrap.java | 2 +- .../impl/ShellServerExtensionFactory.java | 2 +- .../impl/ShellServerKernelExtension.java | 2 +- .../kernel/GraphDatabaseShellServer.java | 3 +-- .../kernel/ReadOnlyGraphDatabaseProxy.java | 2 +- .../org/neo4j/shell/kernel/apps/Dbinfo.java | 2 +- .../org/neo4j/shell/kernel/apps/Mknode.java | 8 +++--- .../neo4j/shell/kernel/apps/cypher/Using.java | 3 +-- .../org/neo4j/shell/AbstractShellTest.java | 2 +- .../shell/ServerClientInteractionTest.java | 10 +++---- .../java/org/neo4j/shell/ShellDocTest.java | 2 +- .../org/neo4j/shell/TestConfiguration.java | 2 +- .../org/neo4j/shell/TestReadOnlyServer.java | 2 +- .../org/neo4j/shell/TestTransactionApps.java | 2 +- .../org/neo4j/shell/TransactionSoakIT.java | 4 +-- .../org/neo4j/shell/kernel/apps/CdTest.java | 2 +- .../java/org/neo4j/ext/udc/UdcSettingsIT.java | 2 +- .../java/org/neo4j/backup/BackupService.java | 2 +- .../java/org/neo4j/backup/OnlineBackup.java | 2 +- .../backup/OnlineBackupExtensionFactory.java | 2 +- .../backup/OnlineBackupKernelExtension.java | 2 +- .../org/neo4j/backup/BackupServiceIT.java | 2 +- .../BackupServiceStressTestingBuilder.java | 2 +- .../com/storecopy/StoreCopyClientTest.java | 2 +- .../core/EnterpriseCoreEditionModule.java | 2 +- .../edge/EnterpriseEdgeEditionModule.java | 2 +- .../ha/cluster/DefaultMasterImplSPI.java | 2 +- .../factory/HighlyAvailableEditionModule.java | 2 +- .../management/HighlyAvailableKernelData.java | 2 +- .../neo4j/ha/StartInstanceInAnotherJvm.java | 2 +- .../neo4j/ha/TestClusterIndexDeletion.java | 2 +- .../java/org/neo4j/ha/TestPullUpdates.java | 2 +- .../neo4j/ha/upgrade/LegacyDatabaseImpl.java | 14 +++++----- .../neo4j/ha/upgrade/RollingUpgradeIT.java | 2 +- .../neo4j/kernel/HACountsPropagationTest.java | 1 + ...MeasureUpdatePullingRecordAndIndexGap.java | 2 +- .../kernel/ha/TxPushStrategyConfigIT.java | 2 +- .../forseti/ForsetiServiceLoadingTest.java | 2 +- .../java/org/neo4j/shell/TestPECListing.java | 2 +- .../neo4j/management/ManagementBeansTest.java | 2 +- .../neo4j/management/TestLockManagerBean.java | 2 +- .../java/org/neo4j/metrics/BoltMetricsIT.java | 2 +- .../java/upgrade/StoreMigratorFrom21IT.java | 4 +-- .../ext/udc/impl/UdcExtensionImplTest.java | 2 +- .../StoreUpgradeIntegrationTest.java | 2 +- .../example/JavaExecutionEngineDocTest.java | 2 +- .../java/org/neo4j/examples/Neo4jShell.java | 3 ++- .../applytx/ApplyTransactionsCommand.java | 2 +- .../tools/applytx/DatabaseRebuildTool.java | 2 +- .../neo4j/tools/rebuild/RebuildFromLogs.java | 2 +- .../tools/rebuild/RebuildFromLogsTest.java | 2 +- 194 files changed, 222 insertions(+), 223 deletions(-) rename community/kernel/src/main/java/org/neo4j/kernel/{ => internal}/GraphDatabaseAPI.java (93%) diff --git a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java b/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java index 5f3edc5609fb1..d975e7fd6b3f6 100644 --- 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 index 49b699e5a9b70..9d54f3a135616 100644 --- 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 index d618a920ac3c5..d9f36b8614afc 100644 --- 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/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java b/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java index 16fb7175b50fd..1db22cb649d74 100644 --- a/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/GraphStoreFixture.java +++ b/community/consistency-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/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/full/FullCheckIntegrationTest.java b/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/full/FullCheckIntegrationTest.java index 3413812c3c886..fe5ad0d3cce30 100644 --- a/community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/full/FullCheckIntegrationTest.java +++ b/community/consistency-check-legacy/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/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java index 76c945d40cc92..1b20f7ad64f7e 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java +++ b/community/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/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java index 5fd83acb25f29..613aa751d8833 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java +++ b/community/consistency-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/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/CallProcedureExecutionPlanTest.scala b/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/CallProcedureExecutionPlanTest.scala index 08a3b4071c36d..6066387bd9fa6 100644 --- a/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/executionplan/procs/CallProcedureExecutionPlanTest.scala +++ b/community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/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/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CypherEngineProvider.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CypherEngineProvider.java index f2f6228fde7d9..f15de84f97d78 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CypherEngineProvider.java +++ b/community/cypher/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/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java index f918f5775479f..109d1ec02f253 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java +++ b/community/cypher/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/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/ExtendedTransactionalContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/ExtendedTransactionalContext.scala index 298572045b8f1..addce211d4a18 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/ExtendedTransactionalContext.scala +++ b/community/cypher/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/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/DoubleCheckCreateUniqueTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/DoubleCheckCreateUniqueTest.scala index 79ad844ea47fe..218acdbd6b077 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/DoubleCheckCreateUniqueTest.scala +++ b/community/cypher/cypher/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/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LazyTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LazyTest.scala index 702478cc7ef7e..6b89add9838d9 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/LazyTest.scala +++ b/community/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/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTableInstructionsTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTableInstructionsTest.scala index a6166c356959c..bede70c14c53d 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/codegen/ir/BuildProbeTableInstructionsTest.scala +++ b/community/cypher/cypher/src/test/scala/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 index 76803f949cf16..b26508ab39ee9 100644 --- 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 index 49f260a9cbfff..b7a48dc7d9592 100644 --- 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 index abdec21912d21..a136ab61d749f 100644 --- 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 index e9cf9636162ec..b2226f6d301b1 100644 --- 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 index 8ea76d1441285..40643918dff15 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 @@ -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 index 32d64ecd711a6..63027f10e4c9c 100644 --- 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/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java index 88a0172c3feba..2207581902000 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java +++ b/community/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/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseAPI.java b/community/kernel/src/main/java/org/neo4j/kernel/internal/GraphDatabaseAPI.java similarity index 93% rename from community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseAPI.java rename to community/kernel/src/main/java/org/neo4j/kernel/internal/GraphDatabaseAPI.java index d92abb685698b..2101f7638d9ee 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseAPI.java +++ b/community/kernel/src/main/java/org/neo4j/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 . */ -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 index 3ff1858ccf242..9018360c24980 100644 --- 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 index 0d8b825351ef3..8bd8e77d63a5a 100644 --- 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 index 46ab16226cc7e..4175f17d82cbf 100644 --- 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 index 3dce91538281c..38f8cb94d5a80 100644 --- 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 index e5389b83b8046..3cacc51199253 100644 --- 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 index b3978447a622c..051696665d0d8 100644 --- 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 index 0f5d27e5f84b7..7f7920bc7aba1 100644 --- 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 index 2fcbf0f86c04a..78a92a7745efa 100644 --- 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 index 05c7b4329858f..b4031af10a39a 100644 --- 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; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/TestKernelExtension.java b/community/kernel/src/test/java/org/neo4j/kernel/TestKernelExtension.java index 9e28b89d30614..4f6c43b39bbc6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/TestKernelExtension.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/TestKernelExtension.java @@ -24,6 +24,7 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactoryContractTest; import org.neo4j.kernel.extension.KernelExtensions; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.lifecycle.LifecycleStatus; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java index 4b0dbd693f41e..83eb3ef8c85d7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/UniqueConstraintCompatibility.java @@ -43,7 +43,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java b/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java index dab1173768973..ed38f3bee02b2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java @@ -27,7 +27,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.helpers.Service; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/AbstractNeo4jTestCase.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/AbstractNeo4jTestCase.java index 673e9c593644b..018387ed09401 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/AbstractNeo4jTestCase.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/AbstractNeo4jTestCase.java @@ -39,7 +39,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.core.NodeManager; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.AbstractDynamicStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java index 765ac6b7fef54..eefb6cd46747b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.locks.LockSupport; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java index 2242c66db842b..f90d0632fbc2f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java @@ -25,7 +25,7 @@ import java.util.Map; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java index 2ac077a3d10d1..0a9375fa1c74d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/SchemaLoggingIT.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.api.index.IndexPopulationJob; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.AssertableLogProvider.LogMatcherBuilder; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java index bd6ef901b980a..f00a7be7ef442 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessIT.java @@ -19,7 +19,6 @@ */ package org.neo4j.kernel.impl.api; -import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; @@ -32,7 +31,6 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.IndexManager; -import org.neo4j.kernel.GraphDatabaseAPI; import org.neo4j.kernel.impl.index.DummyIndexExtensionFactory; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index bb8d3e1a1308d..cb57b57d49ca5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -38,7 +38,7 @@ import org.neo4j.graphdb.Transaction; 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.DataWriteOperations; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index b381199865a5b..e80534a42217a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -43,7 +43,7 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.helpers.collection.Pair; import org.neo4j.helpers.collection.Visitor; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index a21946a62c58f..2b24402f830b5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -42,7 +42,7 @@ import org.neo4j.graphdb.schema.Schema; 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.Statement; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexAccessor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java index c9360680d5596..1e6468ea4619a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsIT.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.graphdb.schema.IndexDefinition; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.impl.api.CountsAccessor; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java index a10bae5e4efe7..31be80bc7e623 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java @@ -45,7 +45,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.KernelException; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java index c76c8e2029e33..c7cf1f72f9957 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java @@ -24,7 +24,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/NoChangeWriteTransactionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/NoChangeWriteTransactionTest.java index d2c76587c1322..a6fc578b91172 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/NoChangeWriteTransactionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/NoChangeWriteTransactionTest.java @@ -26,7 +26,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.Index; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.test.DatabaseRule; import org.neo4j.test.ImpermanentDatabaseRule; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerTest.java index f9aaee3b9b522..9587f89055190 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/DiskLayerTest.java @@ -31,7 +31,7 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.IndexDefinition; -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.index.IndexDescriptor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/TestReferenceDangling.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/TestReferenceDangling.java index 6cb0452b9c322..c0084b7ec9252 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/TestReferenceDangling.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/TestReferenceDangling.java @@ -24,7 +24,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; import org.neo4j.test.ImpermanentDatabaseRule; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java index c6393a9d9f677..787d1b1823a74 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/BigStoreIT.java @@ -41,7 +41,7 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.test.EmbeddedDatabaseRule; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java index aab06b24f2d3e..f841ff70522be 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/ManyPropertyKeysIT.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeManagerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeManagerTest.java index 9bc7f966a5ad2..f87dbcdc6abb0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeManagerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeManagerTest.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.coreapi.PlaceboTransaction; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentRelationshipChainLoadingIssue.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentRelationshipChainLoadingIssue.java index 446c7895c7d1e..bd742cc8de56e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentRelationshipChainLoadingIssue.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentRelationshipChainLoadingIssue.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java index bb19237cdecc5..5faf715c26d92 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java @@ -40,7 +40,7 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.helpers.collection.Visitor; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipGrabSize.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipGrabSize.java index 4651fe660f0d6..4df3556a8abc7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipGrabSize.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestRelationshipGrabSize.java @@ -31,7 +31,7 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; import static java.lang.String.valueOf; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java index b18b594ca37c7..bb267b0c1f5b1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestTransactionEvents.java @@ -44,7 +44,7 @@ import org.neo4j.graphdb.event.TransactionData; import org.neo4j.graphdb.event.TransactionEventHandler; import org.neo4j.graphdb.schema.IndexDefinition; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.test.DatabaseRule; import org.neo4j.test.ImpermanentDatabaseRule; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/ProduceUncleanStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/ProduceUncleanStore.java index 588fff007417c..64add370fd030 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/ProduceUncleanStore.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/ProduceUncleanStore.java @@ -23,7 +23,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.EmbeddedGraphDatabase; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.GraphDatabaseDependencies; import org.neo4j.kernel.impl.core.NodeManager; import org.neo4j.logging.NullLogProvider; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java index 9b0c928b1fbf0..285a5136de02d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestGraphProperties.java @@ -35,7 +35,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.core.NodeManager; import org.neo4j.logging.NullLogProvider; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java index f723f80a5ab18..5e8f8e006ce13 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsComputerTest.java @@ -35,7 +35,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; 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.configuration.Config; import org.neo4j.kernel.impl.store.CountsComputer; import org.neo4j.kernel.impl.store.NeoStores; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java index eea49fafa2b9f..18ac82314d815 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/counts/CountsRotationTest.java @@ -43,7 +43,7 @@ import org.neo4j.helpers.collection.Pair; 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.configuration.Config; import org.neo4j.kernel.impl.api.CountsVisitor; import org.neo4j.kernel.impl.core.LabelTokenHolder; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java index eee86a2461275..fd9166cb62213 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DeferredIndexedConflictResolutionTest.java @@ -35,7 +35,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseFactory; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DuplicatePropertyRemoverTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DuplicatePropertyRemoverTest.java index d9b208ca17b27..a0d2470793961 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DuplicatePropertyRemoverTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/DuplicatePropertyRemoverTest.java @@ -36,7 +36,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseFactory; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexConsultedPropertyBlockSweeperTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexConsultedPropertyBlockSweeperTest.java index e5a0c7d8fd844..9c786f6ee6c36 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexConsultedPropertyBlockSweeperTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexConsultedPropertyBlockSweeperTest.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookupTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookupTest.java index 7da5c3b530d10..1f294929d9fa5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookupTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/IndexLookupTest.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.LabelTokenStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/NonIndexedConflictResolverTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/NonIndexedConflictResolverTest.java index 20ed2b492825b..ed3ab432efa90 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/NonIndexedConflictResolverTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v21/propertydeduplication/NonIndexedConflictResolverTest.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.DependencyResolver; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.NodeStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java index c6a6f030e2c27..b29a7ec93b23f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/ReadTransactionLogWritingTest.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.transaction.log.LogFileInformation; import org.neo4j.kernel.impl.transaction.log.entry.LogEntry; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMonitorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMonitorTest.java index 021cfff2f6342..f26a08f8df91f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMonitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TransactionMonitorTest.java @@ -29,7 +29,7 @@ import org.neo4j.function.ThrowingConsumer; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestGraphDatabaseFactory; @RunWith( Parameterized.class ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java index 85fa5958b7556..a44f5608ce127 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/pruning/TestLogPruning.java @@ -31,7 +31,7 @@ import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageCommandReaderFactory; import org.neo4j.kernel.impl.transaction.log.LogVersionBridge; import org.neo4j.kernel.impl.transaction.log.LogVersionedStoreChannel; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreIndexStoreViewTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreIndexStoreViewTest.java index df50e2753f9e2..a51966f29efc1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreIndexStoreViewTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreIndexStoreViewTest.java @@ -35,7 +35,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Visitor; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.KernelException; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java index 44d684240c294..6b919439847ad 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuideTest.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.SchemaWriteOperations; diff --git a/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java index 8b6825845166d..8e0d89f2a225f 100644 --- a/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java @@ -51,7 +51,7 @@ import org.neo4j.graphdb.traversal.BidirectionalTraversalDescription; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertTest.java b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertTest.java index c6421701959aa..e06cbdb7f662e 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertTest.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertTest.java @@ -56,7 +56,7 @@ import org.neo4j.helpers.collection.Pair; 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.index.IndexConfiguration; import org.neo4j.kernel.api.index.IndexDescriptor; import org.neo4j.kernel.api.index.IndexPopulator; diff --git a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputBatchImportIT.java b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputBatchImportIT.java index b58bd34899778..c248d0071ed38 100644 --- a/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputBatchImportIT.java +++ b/community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputBatchImportIT.java @@ -47,7 +47,7 @@ import org.neo4j.helpers.collection.Pair; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.logging.NullLogService; diff --git a/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java b/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java index be04294fd6e35..207ad2b24132e 100644 --- a/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/concurrencytest/ConstraintIndexConcurrencyTest.java @@ -26,7 +26,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyConstraintViolationKernelException; import org.neo4j.kernel.api.index.IndexDescriptor; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexCreationTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexCreationTest.java index 4feb73c19ca86..b8b7f794ac384 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexCreationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/IndexCreationTest.java @@ -37,7 +37,7 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.helpers.collection.FilteringIterator; import org.neo4j.helpers.collection.IteratorUtil; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.index.IndexDefineCommand; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageCommandReaderFactory; import org.neo4j.kernel.impl.transaction.log.LogEntryCursor; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestAutoIndexing.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestAutoIndexing.java index ca7cc81f0a84d..24a8021809685 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestAutoIndexing.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestAutoIndexing.java @@ -35,7 +35,7 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.ReadableIndex; import org.neo4j.graphdb.index.RelationshipIndex; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestIndexDelectionFs.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestIndexDelectionFs.java index 1a49fe7734901..dda16525e844d 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestIndexDelectionFs.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestIndexDelectionFs.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.Index; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.index.IndexEntityType; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestLuceneIndex.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestLuceneIndex.java index 8668a9185191e..68e99f5e67322 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestLuceneIndex.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/legacy/TestLuceneIndex.java @@ -55,7 +55,7 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.index.lucene.QueryContext; import org.neo4j.index.lucene.ValueContext; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.index.IndexConfigStore; import static org.apache.lucene.search.NumericRangeQuery.newIntRange; diff --git a/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java b/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java index a24cd959e88eb..d0d4fc7046b32 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTests.java @@ -39,7 +39,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.ConstraintDefinition; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.impl.labelscan.LuceneLabelScanStoreExtension; import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; import org.neo4j.kernel.extension.KernelExtensionFactory; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java index d93c080476426..160f921747d54 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java @@ -34,7 +34,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.IndexDefinition; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java index 9a3368833f440..f82f7ff5501dc 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintCreationIT.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.impl.index.storage.layout.IndexFolderLayout; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.test.EmbeddedDatabaseRule; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java index f6ab3273f253e..a9fc02b881c3d 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintRecoveryIT.java @@ -33,7 +33,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.monitoring.Monitors; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java index cd416e684942e..e8eef2fe0fff0 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceIntegrationTest.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProviderFactory; import org.neo4j.kernel.api.index.IndexDescriptor; diff --git a/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java b/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java index f14d451293ff8..c0e9c13d99a4f 100644 --- a/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java +++ b/community/lucene-index/src/test/java/org/neo4j/unsafe/batchinsert/TestLuceneSchemaBatchInsertIT.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.impl.schema.LuceneSchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.extension.dependency.HighestSelectionStrategy; diff --git a/community/monitor-logging/src/test/java/org/neo4j/ext/monitorlogging/MonitorLoggingAcceptanceTest.java b/community/monitor-logging/src/test/java/org/neo4j/ext/monitorlogging/MonitorLoggingAcceptanceTest.java index 5717a0848fecf..5b986b854ad2d 100644 --- a/community/monitor-logging/src/test/java/org/neo4j/ext/monitorlogging/MonitorLoggingAcceptanceTest.java +++ b/community/monitor-logging/src/test/java/org/neo4j/ext/monitorlogging/MonitorLoggingAcceptanceTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.kernel.monitoring.Monitors; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/Procs.java b/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/Procs.java index 6796385b3749c..a2c32a19cfee7 100644 --- a/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/Procs.java +++ b/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/Procs.java @@ -22,7 +22,7 @@ import java.util.LinkedList; import java.util.List; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.exceptions.KernelException; import org.neo4j.kernel.impl.proc.Procedures; diff --git a/community/neo4j/src/test/java/counts/RebuildCountsTest.java b/community/neo4j/src/test/java/counts/RebuildCountsTest.java index 3ac64b8a5d561..da1b6b120e98f 100644 --- a/community/neo4j/src/test/java/counts/RebuildCountsTest.java +++ b/community/neo4j/src/test/java/counts/RebuildCountsTest.java @@ -33,7 +33,7 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.graphdb.Transaction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; diff --git a/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java b/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java index 020b32ffd2cc0..369063d08a387 100644 --- a/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java +++ b/community/neo4j/src/test/java/org/neo4j/index/IndexSamplingIntegrationTest.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.StoreFactory; diff --git a/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java b/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java index 40e3c0a8191e7..3c6f753c499fd 100644 --- a/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java +++ b/community/neo4j/src/test/java/recovery/CountsStoreRecoveryTest.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.api.CountsVisitor; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; diff --git a/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java b/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java index 465bfbf9e55a6..4d1e1717f9e08 100644 --- a/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java +++ b/community/neo4j/src/test/java/recovery/TestRecoveryMultipleDataSources.java @@ -27,7 +27,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer; import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo; diff --git a/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java b/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java index b31f68ed7d23c..4381f8bc50eb0 100644 --- a/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java +++ b/community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java @@ -38,7 +38,7 @@ import org.neo4j.helpers.collection.IteratorUtil; 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.impl.api.index.inmemory.InMemoryIndexProvider; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.impl.core.LabelTokenHolder; diff --git a/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java b/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java index d1bdcf187989f..98d8e13957ac3 100644 --- a/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java +++ b/community/neo4j/src/test/java/recovery/UniquenessRecoveryTest.java @@ -45,7 +45,7 @@ import org.neo4j.graphdb.schema.ConstraintType; import org.neo4j.helpers.collection.Iterables; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.SuppressOutput; import org.neo4j.test.TargetDirectory; diff --git a/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java b/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java index 700e1b7c60c26..e25d463751236 100644 --- a/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java +++ b/community/neo4j/src/test/java/upgrade/TestMigrateToDenseNodeSupport.java @@ -36,7 +36,7 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseFactory; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; diff --git a/community/server-api/src/main/java/org/neo4j/server/plugins/ParameterList.java b/community/server-api/src/main/java/org/neo4j/server/plugins/ParameterList.java index 87e2fd0e613f7..9bf8b6740c413 100644 --- a/community/server-api/src/main/java/org/neo4j/server/plugins/ParameterList.java +++ b/community/server-api/src/main/java/org/neo4j/server/plugins/ParameterList.java @@ -27,7 +27,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; public abstract class ParameterList diff --git a/community/server-api/src/main/java/org/neo4j/server/plugins/PluginPoint.java b/community/server-api/src/main/java/org/neo4j/server/plugins/PluginPoint.java index 0772f9cf5e00d..e6b0833adb1e4 100644 --- a/community/server-api/src/main/java/org/neo4j/server/plugins/PluginPoint.java +++ b/community/server-api/src/main/java/org/neo4j/server/plugins/PluginPoint.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; import org.neo4j.server.rest.repr.Representation; diff --git a/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationFormat.java b/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationFormat.java index 4aa5cb2a03c68..6521746a2509b 100644 --- a/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationFormat.java +++ b/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationFormat.java @@ -25,7 +25,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Relationship; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.plugins.ParameterList; import org.neo4j.server.rest.web.NodeNotFoundException; import org.neo4j.server.rest.web.RelationshipNotFoundException; diff --git a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginManagerTest.java b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginManagerTest.java index b561eadab2af3..78ae3b9358cfe 100644 --- a/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginManagerTest.java +++ b/community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginManagerTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.neo4j.graphdb.GraphDatabaseService; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.NullLogProvider; import org.neo4j.server.rest.repr.formats.NullFormat; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/server/src/main/java/org/neo4j/server/database/Database.java b/community/server/src/main/java/org/neo4j/server/database/Database.java index 1916b959beb7f..cfc185f493c2f 100644 --- a/community/server/src/main/java/org/neo4j/server/database/Database.java +++ b/community/server/src/main/java/org/neo4j/server/database/Database.java @@ -20,7 +20,7 @@ package org.neo4j.server.database; import org.neo4j.kernel.impl.factory.CommunityFacadeFactory; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.lifecycle.Lifecycle; diff --git a/community/server/src/main/java/org/neo4j/server/database/LifecycleManagingDatabase.java b/community/server/src/main/java/org/neo4j/server/database/LifecycleManagingDatabase.java index 12a80e50b5f25..c25f453c416bd 100644 --- a/community/server/src/main/java/org/neo4j/server/database/LifecycleManagingDatabase.java +++ b/community/server/src/main/java/org/neo4j/server/database/LifecycleManagingDatabase.java @@ -22,7 +22,7 @@ import java.io.File; import org.neo4j.graphdb.Result; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.logging.Log; diff --git a/community/server/src/main/java/org/neo4j/server/database/WrappedDatabase.java b/community/server/src/main/java/org/neo4j/server/database/WrappedDatabase.java index b7ff568ed0c71..5eb9433db1023 100644 --- a/community/server/src/main/java/org/neo4j/server/database/WrappedDatabase.java +++ b/community/server/src/main/java/org/neo4j/server/database/WrappedDatabase.java @@ -20,7 +20,7 @@ package org.neo4j.server.database; import org.neo4j.kernel.impl.factory.CommunityFacadeFactory; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.lifecycle.LifecycleAdapter; diff --git a/community/server/src/main/java/org/neo4j/server/modules/ExtensionInitializer.java b/community/server/src/main/java/org/neo4j/server/modules/ExtensionInitializer.java index ede8d59aa7073..dfac92792222d 100644 --- a/community/server/src/main/java/org/neo4j/server/modules/ExtensionInitializer.java +++ b/community/server/src/main/java/org/neo4j/server/modules/ExtensionInitializer.java @@ -23,7 +23,7 @@ import java.util.HashSet; 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.server.NeoServer; import org.neo4j.server.configuration.ConfigWrappingConfiguration; diff --git a/community/server/src/main/java/org/neo4j/server/plugins/BooleanTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/BooleanTypeCaster.java index 0a76941cc402b..2566b644e6a2e 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/BooleanTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/BooleanTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class BooleanTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/ByteTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/ByteTypeCaster.java index 738cfb0850f38..6da43fbb87722 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/ByteTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/ByteTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class ByteTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/CharacterTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/CharacterTypeCaster.java index fd29a496f8093..882499006bfd2 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/CharacterTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/CharacterTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class CharacterTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/DataExtractor.java b/community/server/src/main/java/org/neo4j/server/plugins/DataExtractor.java index e693ae44283c5..da335054e0cbf 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/DataExtractor.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/DataExtractor.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; abstract class DataExtractor diff --git a/community/server/src/main/java/org/neo4j/server/plugins/DoubleTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/DoubleTypeCaster.java index d9337764a4228..4f509619903a9 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/DoubleTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/DoubleTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class DoubleTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/FloatTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/FloatTypeCaster.java index 9543072165515..0e75c55da65a4 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/FloatTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/FloatTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class FloatTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/IntegerTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/IntegerTypeCaster.java index 87a6db7e8cc1f..26b58ac96dbf0 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/IntegerTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/IntegerTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class IntegerTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/ListParameterExtractor.java b/community/server/src/main/java/org/neo4j/server/plugins/ListParameterExtractor.java index c39fe8d07bc9c..d7e086eaf4377 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/ListParameterExtractor.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/ListParameterExtractor.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; abstract class ListParameterExtractor extends ParameterExtractor diff --git a/community/server/src/main/java/org/neo4j/server/plugins/LongTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/LongTypeCaster.java index 4141307f09f0b..f5a8318012022 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/LongTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/LongTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class LongTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/MapTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/MapTypeCaster.java index e272f1b29e179..4c135b00c7f0a 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/MapTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/MapTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; public class MapTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/NodeTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/NodeTypeCaster.java index 66dfee718e1b6..9c463e566e23c 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/NodeTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/NodeTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class NodeTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/ParameterExtractor.java b/community/server/src/main/java/org/neo4j/server/plugins/ParameterExtractor.java index b69c8ac55e6f3..3bca601be5347 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/ParameterExtractor.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/ParameterExtractor.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class ParameterExtractor extends DataExtractor diff --git a/community/server/src/main/java/org/neo4j/server/plugins/PluginInvocator.java b/community/server/src/main/java/org/neo4j/server/plugins/PluginInvocator.java index b96c19f5349de..39f140e7592a4 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/PluginInvocator.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/PluginInvocator.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Set; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; import org.neo4j.server.rest.repr.ExtensionPointRepresentation; import org.neo4j.server.rest.repr.Representation; diff --git a/community/server/src/main/java/org/neo4j/server/plugins/PluginManager.java b/community/server/src/main/java/org/neo4j/server/plugins/PluginManager.java index 74457316880f0..69f7ba50eadea 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/PluginManager.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/PluginManager.java @@ -27,7 +27,7 @@ import java.util.Set; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; diff --git a/community/server/src/main/java/org/neo4j/server/plugins/PluginMethod.java b/community/server/src/main/java/org/neo4j/server/plugins/PluginMethod.java index 924d46e0af22b..6a86e52164e3f 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/PluginMethod.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/PluginMethod.java @@ -23,7 +23,7 @@ import java.lang.reflect.Method; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; import org.neo4j.server.rest.repr.Representation; diff --git a/community/server/src/main/java/org/neo4j/server/plugins/RelationshipTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/RelationshipTypeCaster.java index be2edd4dd9f4c..2e8e797460bf3 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/RelationshipTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/RelationshipTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class RelationshipTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/RelationshipTypeTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/RelationshipTypeTypeCaster.java index 2418e7b035564..c3113824c4385 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/RelationshipTypeTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/RelationshipTypeTypeCaster.java @@ -20,7 +20,7 @@ package org.neo4j.server.plugins; import org.neo4j.graphdb.RelationshipType; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class RelationshipTypeTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/ShortTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/ShortTypeCaster.java index 1910e49742072..4e85edaab915e 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/ShortTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/ShortTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class ShortTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/SourceExtractor.java b/community/server/src/main/java/org/neo4j/server/plugins/SourceExtractor.java index 6d1fa819ccd02..01d3a3f1d43df 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/SourceExtractor.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/SourceExtractor.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; class SourceExtractor extends DataExtractor { diff --git a/community/server/src/main/java/org/neo4j/server/plugins/StringTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/StringTypeCaster.java index ce96b47d90902..e114da0b6cc98 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/StringTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/StringTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class StringTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/TypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/TypeCaster.java index 81052364394f2..25cb303c5227c 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/TypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/TypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; abstract class TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/URLTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/URLTypeCaster.java index 0e0c884bf9264..364d676a5bbc2 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/URLTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/URLTypeCaster.java @@ -23,7 +23,7 @@ import java.net.URI; import java.net.URL; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class URLTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/plugins/UriTypeCaster.java b/community/server/src/main/java/org/neo4j/server/plugins/UriTypeCaster.java index 48d1dc39c3d9e..144af4e745637 100644 --- a/community/server/src/main/java/org/neo4j/server/plugins/UriTypeCaster.java +++ b/community/server/src/main/java/org/neo4j/server/plugins/UriTypeCaster.java @@ -19,7 +19,7 @@ */ package org.neo4j.server.plugins; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.repr.BadInputException; class UriTypeCaster extends TypeCaster diff --git a/community/server/src/main/java/org/neo4j/server/rest/domain/PropertySettingStrategy.java b/community/server/src/main/java/org/neo4j/server/rest/domain/PropertySettingStrategy.java index f88eef601c1c0..d1fe353e1571a 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/domain/PropertySettingStrategy.java +++ b/community/server/src/main/java/org/neo4j/server/rest/domain/PropertySettingStrategy.java @@ -28,7 +28,7 @@ import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.web.PropertyValueException; /** @@ -111,7 +111,7 @@ public void setProperty(PropertyContainer entity, String key, Object value) thro // Ok, leave it this way return; } - + value = emptyArrayOfType(currentValue.getClass().getComponentType()); } diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/console/ShellSession.java b/community/server/src/main/java/org/neo4j/server/rest/management/console/ShellSession.java index 478c2a76db4b3..3dce148efcc6f 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/management/console/ShellSession.java +++ b/community/server/src/main/java/org/neo4j/server/rest/management/console/ShellSession.java @@ -24,7 +24,7 @@ import java.util.HashMap; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.extension.KernelExtensions; import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.logging.Log; diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java index f9367ff7d360e..40531c1e35a55 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java @@ -20,7 +20,7 @@ package org.neo4j.server.rest.transactional; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; public class TransitionalPeriodTransactionMessContainer diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/DatabaseActions.java b/community/server/src/main/java/org/neo4j/server/rest/web/DatabaseActions.java index 6d68262d596d6..b6c4b024b411f 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/web/DatabaseActions.java +++ b/community/server/src/main/java/org/neo4j/server/rest/web/DatabaseActions.java @@ -69,7 +69,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Pair; import org.neo4j.index.lucene.QueryContext; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.database.InjectableProvider; import org.neo4j.server.rest.domain.EndNodeNotFoundException; import org.neo4j.server.rest.domain.PropertySettingStrategy; diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/ExtensionService.java b/community/server/src/main/java/org/neo4j/server/rest/web/ExtensionService.java index 5b0e93c68a376..57d74c6aed8bf 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/web/ExtensionService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/web/ExtensionService.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.database.Database; import org.neo4j.server.plugins.BadPluginInvocationException; import org.neo4j.server.plugins.ParameterList; diff --git a/community/server/src/test/java/org/neo4j/server/NeoServerJAXRSDocIT.java b/community/server/src/test/java/org/neo4j/server/NeoServerJAXRSDocIT.java index 5c3cf7065a63d..aa81aee037424 100644 --- a/community/server/src/test/java/org/neo4j/server/NeoServerJAXRSDocIT.java +++ b/community/server/src/test/java/org/neo4j/server/NeoServerJAXRSDocIT.java @@ -28,7 +28,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.helpers.CommunityServerBuilder; import org.neo4j.server.helpers.FunctionalTestHelper; import org.neo4j.server.helpers.ServerHelper; diff --git a/community/server/src/test/java/org/neo4j/server/database/LifecycleManagingDatabaseTest.java b/community/server/src/test/java/org/neo4j/server/database/LifecycleManagingDatabaseTest.java index 43aadd591a278..299cdddc01882 100644 --- a/community/server/src/test/java/org/neo4j/server/database/LifecycleManagingDatabaseTest.java +++ b/community/server/src/test/java/org/neo4j/server/database/LifecycleManagingDatabaseTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.neo4j.graphdb.TransactionFailureException; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.GraphDatabaseDependencies; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; diff --git a/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java b/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java index 7215aa9f5dcaa..25c5481b741bd 100644 --- a/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java +++ b/community/server/src/test/java/org/neo4j/server/helpers/FunctionalTestHelper.java @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.Map; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.NeoServer; import org.neo4j.server.rest.JaxRsResponse; import org.neo4j.server.rest.RestRequest; diff --git a/community/server/src/test/java/org/neo4j/server/helpers/ServerHelper.java b/community/server/src/test/java/org/neo4j/server/helpers/ServerHelper.java index f6d53ce813203..cc3ee6f8e85fb 100644 --- a/community/server/src/test/java/org/neo4j/server/helpers/ServerHelper.java +++ b/community/server/src/test/java/org/neo4j/server/helpers/ServerHelper.java @@ -33,7 +33,7 @@ import org.neo4j.graphdb.index.IndexManager; import org.neo4j.graphdb.schema.ConstraintDefinition; import org.neo4j.graphdb.schema.IndexDefinition; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.LogProvider; import org.neo4j.server.NeoServer; diff --git a/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java b/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java index ab0b70cf59f8c..84dca70eeaaa7 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java +++ b/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java @@ -33,7 +33,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.domain.JsonHelper; import org.neo4j.server.rest.domain.JsonParseException; import org.neo4j.test.GraphDescription; diff --git a/community/server/src/test/java/org/neo4j/server/rest/domain/PropertySettingStrategyTest.java b/community/server/src/test/java/org/neo4j/server/rest/domain/PropertySettingStrategyTest.java index f275165e4aa87..9b8c7d7361647 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/domain/PropertySettingStrategyTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/domain/PropertySettingStrategyTest.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.web.PropertyValueException; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionIT.java b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionIT.java index e0864c627acfd..f1cb2310c181e 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionIT.java +++ b/community/server/src/test/java/org/neo4j/server/rest/transactional/integration/TransactionIT.java @@ -38,7 +38,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.IteratorUtil; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.impl.transaction.TransactionStats; import org.neo4j.server.ServerTestUtils; @@ -46,7 +46,6 @@ import org.neo4j.server.web.XForwardUtil; import org.neo4j.test.server.HTTP; import org.neo4j.test.server.HTTP.Response; -import org.neo4j.tooling.GlobalGraphOperations; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseActionsTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseActionsTest.java index 90dca67503551..367619b69483c 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseActionsTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseActionsTest.java @@ -50,7 +50,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.MapUtil; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.database.Database; import org.neo4j.server.database.WrappedDatabase; import org.neo4j.server.helpers.ServerHelper; diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseMetadataServiceTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseMetadataServiceTest.java index 28cb73908b5ea..b86e319e254ea 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseMetadataServiceTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/DatabaseMetadataServiceTest.java @@ -27,7 +27,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.database.Database; import org.neo4j.server.database.WrappedDatabase; import org.neo4j.server.rest.domain.JsonHelper; diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/PagingTraversalTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/PagingTraversalTest.java index 8607f69612d89..a46c0f5b1e379 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/PagingTraversalTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/PagingTraversalTest.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.FakeClock; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.database.Database; import org.neo4j.server.database.WrappedDatabase; import org.neo4j.server.rest.domain.GraphDbHelper; diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabasePagedTraversalTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabasePagedTraversalTest.java index af63c62faa9fc..0b2c02660326f 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabasePagedTraversalTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabasePagedTraversalTest.java @@ -32,7 +32,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.FakeClock; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.database.Database; import org.neo4j.server.database.WrappedDatabase; import org.neo4j.server.rest.domain.GraphDbHelper; diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java b/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java index e441a816c459c..e38cf23f1aa42 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java @@ -45,7 +45,7 @@ import org.neo4j.helpers.FakeClock; import org.neo4j.helpers.UTF8; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.exceptions.Status.Request; import org.neo4j.kernel.api.exceptions.Status.Schema; import org.neo4j.kernel.api.exceptions.Status.Statement; diff --git a/community/server/src/test/java/org/neo4j/server/rest/web/TransactionWrappedDatabaseActions.java b/community/server/src/test/java/org/neo4j/server/rest/web/TransactionWrappedDatabaseActions.java index 06353b8e46aa1..b4906a4de575e 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/web/TransactionWrappedDatabaseActions.java +++ b/community/server/src/test/java/org/neo4j/server/rest/web/TransactionWrappedDatabaseActions.java @@ -25,7 +25,7 @@ import org.neo4j.graphdb.ConstraintViolationException; import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.server.rest.domain.EndNodeNotFoundException; import org.neo4j.server.rest.domain.StartNodeNotFoundException; import org.neo4j.server.rest.paging.LeaseManager; diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java b/community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java index 6d873f90caf1b..7dd6d68128d6c 100644 --- a/community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java +++ b/community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.logging.NullLogProvider; import org.neo4j.server.database.CypherExecutor; import org.neo4j.server.database.Database; diff --git a/community/server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java b/community/server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java index bd7702f911cee..3be6eb42ca917 100644 --- a/community/server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java +++ b/community/server/src/test/java/org/neo4j/server/webadmin/rest/Neo4jShellConsoleSessionDocTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.neo4j.helpers.UTF8; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Settings; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; diff --git a/community/shell/src/main/java/org/neo4j/shell/impl/ShellBootstrap.java b/community/shell/src/main/java/org/neo4j/shell/impl/ShellBootstrap.java index d023cb4e605ef..f336479a7d0c6 100644 --- a/community/shell/src/main/java/org/neo4j/shell/impl/ShellBootstrap.java +++ b/community/shell/src/main/java/org/neo4j/shell/impl/ShellBootstrap.java @@ -25,7 +25,7 @@ import java.rmi.RemoteException; import java.util.Base64; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.shell.ShellSettings; import org.neo4j.shell.kernel.GraphDatabaseShellServer; diff --git a/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerExtensionFactory.java b/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerExtensionFactory.java index 710bf317b1709..68824e7de9d4b 100644 --- a/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerExtensionFactory.java +++ b/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerExtensionFactory.java @@ -20,7 +20,7 @@ package org.neo4j.shell.impl; 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.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.spi.KernelContext; diff --git a/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerKernelExtension.java b/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerKernelExtension.java index af7b50b411f86..c8cefe468020f 100644 --- a/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerKernelExtension.java +++ b/community/shell/src/main/java/org/neo4j/shell/impl/ShellServerKernelExtension.java @@ -19,7 +19,7 @@ */ package org.neo4j.shell.impl; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.lifecycle.Lifecycle; import org.neo4j.shell.kernel.GraphDatabaseShellServer; diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/GraphDatabaseShellServer.java b/community/shell/src/main/java/org/neo4j/shell/kernel/GraphDatabaseShellServer.java index 5ab2344da77aa..a04c124008c36 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/GraphDatabaseShellServer.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/GraphDatabaseShellServer.java @@ -27,9 +27,8 @@ import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.impl.coreapi.TopLevelTransaction; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.shell.Output; diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java b/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java index b8ab743205e2e..300ecc5577115 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java @@ -56,7 +56,7 @@ import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.helpers.collection.PrefetchingResourceIterator; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.store.StoreId; public class ReadOnlyGraphDatabaseProxy implements GraphDatabaseService, GraphDatabaseAPI, IndexManager diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Dbinfo.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Dbinfo.java index a8786c39ce6c7..f340c0ecb3f9d 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Dbinfo.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Dbinfo.java @@ -35,7 +35,7 @@ import org.neo4j.jmx.Kernel; import org.neo4j.jmx.impl.JmxKernelExtension; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.AppCommandParser; import org.neo4j.shell.Continuation; import org.neo4j.shell.OptionDefinition; diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Mknode.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Mknode.java index 616ecf1228ae5..382b1cd55e48a 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Mknode.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Mknode.java @@ -21,7 +21,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.helpers.Service; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.App; import org.neo4j.shell.AppCommandParser; import org.neo4j.shell.Continuation; @@ -43,20 +43,20 @@ public class Mknode extends TransactionProvidingApp addOptionDefinition( "l", new OptionDefinition( OptionValueType.MUST, "Labels to attach to the created node, either a single label or a JSON array" ) ); } - + @Override public String getDescription() { return "Creates a new node, f.ex:\n" + "mknode --cd --np \"{'name':'Neo'}\" -l PERSON"; } - + @Override protected Continuation exec( AppCommandParser parser, Session session, Output out ) throws Exception { GraphDatabaseAPI db = getServer().getDb(); Node node = db.createNode( parseLabels( parser ) ); - + setProperties( node, parser.option( "np", null ) ); if ( parser.options().containsKey( "cd" ) ) cdTo( session, node ); if ( parser.options().containsKey( "v" ) ) diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Using.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Using.java index d260bf9a7a66c..622a28f5d78df 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Using.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Using.java @@ -23,9 +23,8 @@ import org.neo4j.graphdb.Result; import org.neo4j.helpers.Service; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.impl.coreapi.TopLevelTransaction; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.query.QueryExecutionEngine; import org.neo4j.kernel.impl.query.QueryExecutionKernelException; diff --git a/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java b/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java index be63102778d90..b949105be1700 100644 --- a/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/AbstractShellTest.java @@ -34,7 +34,7 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.impl.CollectingOutput; import org.neo4j.shell.impl.RemoteClient; import org.neo4j.shell.impl.SameJvmClient; diff --git a/community/shell/src/test/java/org/neo4j/shell/ServerClientInteractionTest.java b/community/shell/src/test/java/org/neo4j/shell/ServerClientInteractionTest.java index acbd477427ede..0ab8b38c3a80a 100644 --- a/community/shell/src/test/java/org/neo4j/shell/ServerClientInteractionTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/ServerClientInteractionTest.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.impl.SameJvmClient; import org.neo4j.shell.impl.SimpleAppServer; import org.neo4j.shell.kernel.GraphDatabaseShellServer; @@ -46,20 +46,20 @@ public void shouldConsiderAndInterpretCustomClientPrompt() throws Exception { // GIVEN client.setSessionVariable( PROMPT_KEY, "MyPrompt \\d \\t$ " ); - + // WHEN Response response = server.interpretLine( client.getId(), "", out ); - + // THEN String regexPattern = "MyPrompt .{1,3} .{1,3} \\d{1,2} \\d{2}:\\d{2}:\\d{2}\\$"; assertTrue( "Prompt from server '" + response.getPrompt() + "' didn't match pattern '" + regexPattern + "'", compile( regexPattern ).matcher( response.getPrompt() ).find() ); } - + private SimpleAppServer server; private ShellClient client; private SilentLocalOutput out; - + @Before public void before() throws Exception { diff --git a/community/shell/src/test/java/org/neo4j/shell/ShellDocTest.java b/community/shell/src/test/java/org/neo4j/shell/ShellDocTest.java index 38ccc92da063d..77df8ccc0ba12 100644 --- a/community/shell/src/test/java/org/neo4j/shell/ShellDocTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/ShellDocTest.java @@ -28,7 +28,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.configuration.Settings; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.impl.CollectingOutput; import org.neo4j.shell.impl.RemoteClient; import org.neo4j.shell.kernel.GraphDatabaseShellServer; diff --git a/community/shell/src/test/java/org/neo4j/shell/TestConfiguration.java b/community/shell/src/test/java/org/neo4j/shell/TestConfiguration.java index da2f75ab04b11..40f473bc16858 100644 --- a/community/shell/src/test/java/org/neo4j/shell/TestConfiguration.java +++ b/community/shell/src/test/java/org/neo4j/shell/TestConfiguration.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.impl.CollectingOutput; import org.neo4j.shell.kernel.GraphDatabaseShellServer; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/community/shell/src/test/java/org/neo4j/shell/TestReadOnlyServer.java b/community/shell/src/test/java/org/neo4j/shell/TestReadOnlyServer.java index 9f31bfb160343..9371f551ea216 100644 --- a/community/shell/src/test/java/org/neo4j/shell/TestReadOnlyServer.java +++ b/community/shell/src/test/java/org/neo4j/shell/TestReadOnlyServer.java @@ -25,7 +25,7 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.kernel.GraphDatabaseShellServer; import org.neo4j.shell.kernel.ReadOnlyGraphDatabaseProxy; diff --git a/community/shell/src/test/java/org/neo4j/shell/TestTransactionApps.java b/community/shell/src/test/java/org/neo4j/shell/TestTransactionApps.java index 02422d1bc2221..d129ff20aa9ae 100644 --- a/community/shell/src/test/java/org/neo4j/shell/TestTransactionApps.java +++ b/community/shell/src/test/java/org/neo4j/shell/TestTransactionApps.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.omg.CORBA.SystemException; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.impl.CollectingOutput; import org.neo4j.shell.impl.SameJvmClient; import org.neo4j.shell.kernel.GraphDatabaseShellServer; diff --git a/community/shell/src/test/java/org/neo4j/shell/TransactionSoakIT.java b/community/shell/src/test/java/org/neo4j/shell/TransactionSoakIT.java index 27a76bc8d1af2..1336a3fb4930e 100644 --- a/community/shell/src/test/java/org/neo4j/shell/TransactionSoakIT.java +++ b/community/shell/src/test/java/org/neo4j/shell/TransactionSoakIT.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.shell.impl.CollectingOutput; import org.neo4j.shell.impl.SameJvmClient; import org.neo4j.shell.kernel.GraphDatabaseShellServer; @@ -98,7 +98,7 @@ public void multiThreads() throws Exception { long relationshipCount = count( db.getAllRelationships() ); int expected = committerCount( testers ); - + assertEquals( expected, relationshipCount ); } } diff --git a/community/shell/src/test/java/org/neo4j/shell/kernel/apps/CdTest.java b/community/shell/src/test/java/org/neo4j/shell/kernel/apps/CdTest.java index 4f7fba908d621..b0ce77023c19d 100644 --- a/community/shell/src/test/java/org/neo4j/shell/kernel/apps/CdTest.java +++ b/community/shell/src/test/java/org/neo4j/shell/kernel/apps/CdTest.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.shell.AppCommandParser; import org.neo4j.shell.Output; diff --git a/community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsIT.java b/community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsIT.java index bc46dd3cf84b5..796fdfd235209 100644 --- a/community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsIT.java +++ b/community/udc/src/test/java/org/neo4j/ext/udc/UdcSettingsIT.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java b/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java index 8feb63ff2c658..cd658dc9ed726 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java @@ -49,7 +49,7 @@ import org.neo4j.io.fs.FileUtils; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.impl.logging.LogService; diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackup.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackup.java index 14fe24896cc7a..aa553e3c1e187 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackup.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackup.java @@ -24,7 +24,7 @@ import org.neo4j.backup.BackupService.BackupOutcome; import org.neo4j.consistency.ConsistencyCheckSettings; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import static org.neo4j.helpers.collection.MapUtil.stringMap; diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupExtensionFactory.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupExtensionFactory.java index 53663a5c26531..a01b851b3836a 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupExtensionFactory.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupExtensionFactory.java @@ -23,7 +23,7 @@ import org.neo4j.helpers.Service; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java index d4ffb1adffd37..18bb528397e69 100644 --- a/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java +++ b/enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java @@ -34,7 +34,7 @@ import org.neo4j.com.monitor.RequestMonitor; import org.neo4j.com.storecopy.StoreCopyServer; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.StoreId; diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java index a99569527d5ed..4819aa931d323 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java @@ -50,7 +50,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.FileUtils; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.DatabaseInfo; import org.neo4j.kernel.impl.spi.SimpleKernelContext; diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceStressTestingBuilder.java b/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceStressTestingBuilder.java index 9d28dbcc81694..7c124aab67182 100644 --- a/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceStressTestingBuilder.java +++ b/enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceStressTestingBuilder.java @@ -43,7 +43,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.DatabaseInfo; import org.neo4j.kernel.impl.spi.SimpleKernelContext; diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/StoreCopyClientTest.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/StoreCopyClientTest.java index 500596bb101ca..fb99d8a4543cf 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/StoreCopyClientTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/StoreCopyClientTest.java @@ -37,7 +37,7 @@ import org.neo4j.helpers.collection.IteratorUtil; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.fs.DefaultFileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java index 1a04b92251247..63173c358dd55 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java @@ -98,7 +98,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/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EnterpriseEdgeEditionModule.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EnterpriseEdgeEditionModule.java index e1fbdb69c31cc..b5c63fb001347 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EnterpriseEdgeEditionModule.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/server/edge/EnterpriseEdgeEditionModule.java @@ -46,7 +46,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/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java index 0639de928e7f2..4076026e053f3 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java @@ -28,7 +28,7 @@ import org.neo4j.com.storecopy.StoreCopyServer; import org.neo4j.com.storecopy.StoreWriter; import org.neo4j.io.fs.FileSystemAbstraction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.NeoStoreDataSource; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java index e459943250e5c..61f6f42107a11 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java @@ -57,7 +57,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.AvailabilityGuard; -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.api.KernelAPI; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/HighlyAvailableKernelData.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/HighlyAvailableKernelData.java index 915981405031b..1bc9ed4aa8fd8 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/HighlyAvailableKernelData.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/management/HighlyAvailableKernelData.java @@ -26,7 +26,7 @@ import org.neo4j.function.Functions; 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.KernelData; import org.neo4j.kernel.Version; import org.neo4j.kernel.configuration.Config; diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/StartInstanceInAnotherJvm.java b/enterprise/ha/src/test/java/org/neo4j/ha/StartInstanceInAnotherJvm.java index 06edfd1a0dede..e001b89cf3df2 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/StartInstanceInAnotherJvm.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/StartInstanceInAnotherJvm.java @@ -26,7 +26,7 @@ import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; import org.neo4j.helpers.Args; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; public class StartInstanceInAnotherJvm { diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TestClusterIndexDeletion.java b/enterprise/ha/src/test/java/org/neo4j/ha/TestClusterIndexDeletion.java index ff9241823655c..505803d92cf0b 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TestClusterIndexDeletion.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestClusterIndexDeletion.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.ha.HaSettings; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java index 2cc29aaff6f1b..4e746aebf6eb5 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java @@ -40,7 +40,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; import org.neo4j.helpers.collection.MapUtil; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.ha.HaSettings; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.ha.ClusterManager; diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/LegacyDatabaseImpl.java b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/LegacyDatabaseImpl.java index 10cb428f959e8..170c1aa8bc827 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/LegacyDatabaseImpl.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/LegacyDatabaseImpl.java @@ -36,7 +36,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.TestHighlyAvailableGraphDatabaseFactory; import org.neo4j.helpers.Args; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.ha.UpdatePuller; import org.neo4j.shell.impl.RmiLocation; @@ -71,7 +71,7 @@ public static void main( String[] args ) throws Exception LegacyDatabaseImpl legacyDb = new LegacyDatabaseImpl( storeDir, db ); rmiLocation( parseInt( arguments.orphans().get( 1 ) ) ).bind( legacyDb ); } - + private final GraphDatabaseAPI db; private final String storeDir; @@ -81,7 +81,7 @@ public LegacyDatabaseImpl( String storeDir, GraphDatabaseAPI db ) throws RemoteE this.storeDir = storeDir; this.db = db; } - + public static Future start( String classpath, File storeDir, Map config ) throws Exception { @@ -93,7 +93,7 @@ public static Future start( String classpath, File storeDir, Map final Process process = execJava( appendNecessaryTestClasses( classpath ), LegacyDatabaseImpl.class.getName(), args.toArray( new String[0] ) ); new ProcessStreamHandler( process, false ).launch(); - + final RmiLocation rmiLocation = rmiLocation( rmiPort ); ExecutorService executor = newSingleThreadExecutor(); Future future = executor.submit( new Callable() @@ -138,7 +138,7 @@ private static RmiLocation rmiLocation( int rmiPort ) { return RmiLocation.location( "127.0.0.1", rmiPort, "remote" ); } - + @Override public int stop() { @@ -339,14 +339,14 @@ public void verifyNodeExists( long id ) { throw launderedException( e ); } - + try ( Transaction tx = db.beginTx() ) { db.getNodeById( id ); tx.success(); } } - + @Override public boolean isMaster() throws RemoteException { diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java index 0512b6d2bf6ec..1e6ad78199e59 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java @@ -51,7 +51,7 @@ import org.neo4j.helpers.collection.MapUtil; import org.neo4j.helpers.collection.Pair; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.ha.UpdatePuller; import org.neo4j.test.TargetDirectory; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/HACountsPropagationTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/HACountsPropagationTest.java index e059a16690121..774ae2392f855 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/HACountsPropagationTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/HACountsPropagationTest.java @@ -31,6 +31,7 @@ import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.counts.CountsTracker; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.ha.ClusterRule; import static org.junit.Assert.assertEquals; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/MeasureUpdatePullingRecordAndIndexGap.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/MeasureUpdatePullingRecordAndIndexGap.java index bf55ae53a6a08..80d268ec89e45 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/MeasureUpdatePullingRecordAndIndexGap.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/MeasureUpdatePullingRecordAndIndexGap.java @@ -33,7 +33,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.test.ha.ClusterRule; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java index a1d5364dfd79e..9b55c49b024aa 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java @@ -30,7 +30,7 @@ import org.neo4j.cluster.InstanceId; import org.neo4j.helpers.TransactionTemplate; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.ha.ClusterManager.ManagedCluster; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.test.SuppressOutput; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiServiceLoadingTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiServiceLoadingTest.java index 44a726d84f888..03114fab83220 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiServiceLoadingTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiServiceLoadingTest.java @@ -22,7 +22,7 @@ import org.junit.Rule; import org.junit.Test; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.kernel.impl.locking.community.CommunityLockManger; diff --git a/enterprise/kernel/src/test/java/org/neo4j/shell/TestPECListing.java b/enterprise/kernel/src/test/java/org/neo4j/shell/TestPECListing.java index 6ee8837ad2835..677fa01a3d6ed 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/shell/TestPECListing.java +++ b/enterprise/kernel/src/test/java/org/neo4j/shell/TestPECListing.java @@ -24,7 +24,7 @@ import org.neo4j.SchemaHelper; import org.neo4j.graphdb.Label; import org.neo4j.graphdb.RelationshipType; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; import static org.neo4j.graphdb.Label.label; diff --git a/enterprise/management/src/test/java/org/neo4j/management/ManagementBeansTest.java b/enterprise/management/src/test/java/org/neo4j/management/ManagementBeansTest.java index 8b0ea1b58d63a..2290b0fdac3d5 100644 --- a/enterprise/management/src/test/java/org/neo4j/management/ManagementBeansTest.java +++ b/enterprise/management/src/test/java/org/neo4j/management/ManagementBeansTest.java @@ -28,7 +28,7 @@ import org.neo4j.jmx.Kernel; import org.neo4j.jmx.Primitives; import org.neo4j.jmx.impl.JmxKernelExtension; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.test.EmbeddedDatabaseRule; import static org.junit.Assert.assertNotNull; diff --git a/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java b/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java index 44c60e5f6aa18..0d4e4310552c0 100644 --- a/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java +++ b/enterprise/management/src/test/java/org/neo4j/management/TestLockManagerBean.java @@ -27,7 +27,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.jmx.impl.JmxKernelExtension; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.kernel.info.LockInfo; import org.neo4j.test.ImpermanentDatabaseRule; diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/BoltMetricsIT.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/BoltMetricsIT.java index fd24b4484d7eb..c074f55b5890c 100644 --- a/enterprise/metrics/src/test/java/org/neo4j/metrics/BoltMetricsIT.java +++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/BoltMetricsIT.java @@ -31,7 +31,7 @@ import org.neo4j.bolt.v1.transport.socket.client.Connection; import org.neo4j.bolt.v1.transport.socket.client.SocketConnection; import org.neo4j.helpers.HostnamePort; -import org.neo4j.kernel.GraphDatabaseAPI; +import org.neo4j.kernel.internal.GraphDatabaseAPI; import org.neo4j.metrics.source.db.BoltMetrics; import org.neo4j.test.TestGraphDatabaseFactory; diff --git a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java index 75c4460f3659d..1d7f4ccfa43cc 100644 --- a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java +++ b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom21IT.java @@ -37,7 +37,7 @@ import org.neo4j.helpers.collection.IteratorUtil; 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.KernelAPI; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; @@ -194,7 +194,7 @@ private void verifyPropertiesEqual( PropertyContainer entity, Pair