diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java index c8c320c401cac..7043504f4d17d 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/BoltStateMachine.java @@ -36,7 +36,7 @@ import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.bolt.ManagedBoltStateMachine; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.logging.Log; import org.neo4j.values.AnyValue; diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/StatementProcessor.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/StatementProcessor.java index c0e010576eaed..eaa555ee51ae5 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/StatementProcessor.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/StatementProcessor.java @@ -22,7 +22,7 @@ import org.neo4j.bolt.v1.runtime.spi.BoltResult; import org.neo4j.function.ThrowingConsumer; import org.neo4j.internal.kernel.api.exceptions.KernelException; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.values.virtual.MapValue; public interface StatementProcessor diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java index 5e52fd6a5a41d..2256351cdfa60 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachine.java @@ -35,7 +35,7 @@ import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.query.QueryExecutionKernelException; import org.neo4j.values.virtual.MapValue; diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java index 1b3d8b4a2063b..81ea4e1bda840 100644 --- a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java +++ b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.AvailabilityGuard; import org.neo4j.kernel.GraphDatabaseQueryService; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.txtracking.TransactionIdTracker; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.coreapi.InternalTransaction; diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPITest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPITest.java index ba7be96a0d85f..8a9279e684458 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPITest.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPITest.java @@ -31,7 +31,7 @@ import org.neo4j.graphdb.DependencyResolver; import org.neo4j.kernel.AvailabilityGuard; import org.neo4j.kernel.GraphDatabaseQueryService; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.query.QueryExecutionEngine; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java index ee6da40a130af..10b4e5970145c 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java @@ -45,7 +45,7 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.helpers.progress.ProgressMonitorFactory; import org.neo4j.io.fs.FileUtils; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; 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 b619f79d142e5..82f84d6039f3d 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 @@ -45,7 +45,7 @@ import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.direct.DirectStoreAccess; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensions; 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 5f3753886e2ab..2f4fc1ca20ff2 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 @@ -66,7 +66,7 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.direct.DirectStoreAccess; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.index.IndexAccessor; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/TransactionFailureException.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/TransactionFailureException.java similarity index 94% rename from community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/TransactionFailureException.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/TransactionFailureException.java index 756a31f8194f0..3ed9daeefe0f4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/TransactionFailureException.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/TransactionFailureException.java @@ -17,9 +17,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.exceptions; +package org.neo4j.internal.kernel.api.exceptions; -import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.kernel.api.exceptions.Status; /** * This class (in its current form - 2013-05-07) is a vector for exceptions thrown by a transaction manager, for diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/InwardKernel.java b/community/kernel/src/main/java/org/neo4j/kernel/api/InwardKernel.java index c1605e95afa5d..ddde66f5f5ab8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/InwardKernel.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/InwardKernel.java @@ -22,7 +22,7 @@ import org.neo4j.internal.kernel.api.Kernel; import org.neo4j.internal.kernel.api.exceptions.ProcedureException; import org.neo4j.internal.kernel.api.security.LoginContext; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.proc.CallableProcedure; import org.neo4j.kernel.api.proc.CallableUserAggregationFunction; import org.neo4j.kernel.api.proc.CallableUserFunction; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java b/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java index 020e0d3e2ce96..6d60b1e372158 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java @@ -28,7 +28,7 @@ import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.ClockContext; import org.neo4j.kernel.impl.api.Kernel; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java index b56b15bc5a54e..cabf5826827bc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ConstraintViolationTransactionFailureException.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.exceptions; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; /** * This exception is thrown when committing a transaction contains diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java index fb590db1c1235..e36185bfbbf15 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/ReadOnlyDbException.java @@ -19,6 +19,8 @@ */ package org.neo4j.kernel.api.exceptions; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; + /** * This exception is thrown when committing an updating transaction in a read only database. Can also be thrown when * trying to create tokens (like new property names) in a read only database. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txtracking/TransactionIdTracker.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txtracking/TransactionIdTracker.java index ec1bbc6ce1296..adc65c78cbe6f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/txtracking/TransactionIdTracker.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txtracking/TransactionIdTracker.java @@ -25,7 +25,7 @@ import org.neo4j.kernel.AvailabilityGuard; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/CachingExplicitIndexTransactionState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/CachingExplicitIndexTransactionState.java index 07947980784aa..92bc1457db1f2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/CachingExplicitIndexTransactionState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/CachingExplicitIndexTransactionState.java @@ -25,7 +25,7 @@ import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; import org.neo4j.kernel.api.ExplicitIndex; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState; import org.neo4j.kernel.impl.index.IndexEntityType; import org.neo4j.storageengine.api.StorageCommand; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java index e3b183e48f372..4e64445af770f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java @@ -20,7 +20,6 @@ package org.neo4j.kernel.impl.api; -import org.neo4j.internal.kernel.api.CursorFactory; import org.neo4j.internal.kernel.api.Modes; import org.neo4j.internal.kernel.api.Session; import org.neo4j.internal.kernel.api.Transaction; @@ -29,7 +28,7 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.TransactionHook; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.proc.CallableProcedure; import org.neo4j.kernel.api.proc.CallableUserAggregationFunction; import org.neo4j.kernel.api.proc.CallableUserFunction; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java index 226d71c8a9f2f..d2e8721b64474 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java @@ -62,7 +62,7 @@ import org.neo4j.kernel.api.SilentTokenNameLookup; import org.neo4j.kernel.api.exceptions.ConstraintViolationTransactionFailureException; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ReadOnlyTransactionCommitProcess.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ReadOnlyTransactionCommitProcess.java index 774c8b03f4eed..2212f507722f0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ReadOnlyTransactionCommitProcess.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ReadOnlyTransactionCommitProcess.java @@ -20,7 +20,7 @@ package org.neo4j.kernel.impl.api; import org.neo4j.kernel.api.exceptions.ReadOnlyDbException; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; import org.neo4j.storageengine.api.TransactionApplicationMode; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java index 0ad8fa5895406..2087fc95a2de9 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java @@ -50,7 +50,7 @@ import org.neo4j.kernel.api.ExplicitIndexHits; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionCommitProcess.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionCommitProcess.java index b5c6c1642f0ee..f4ba3544de801 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionCommitProcess.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionCommitProcess.java @@ -19,7 +19,7 @@ */ package org.neo4j.kernel.impl.api; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.transaction.TransactionRepresentation; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; import org.neo4j.storageengine.api.TransactionApplicationMode; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcess.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcess.java index 2671ba321f5d1..2bb646314dd28 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcess.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcess.java @@ -19,7 +19,7 @@ */ package org.neo4j.kernel.impl.api; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.transaction.log.TransactionAppender; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; import org.neo4j.kernel.impl.transaction.tracing.LogAppendEvent; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java index 44e817390432a..1fd203f50e8bf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.SilentTokenNameLookup; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java index fe2824da01fb0..85bb23b408592 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/ClassicCoreSPI.java @@ -32,7 +32,7 @@ import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.kernel.GraphDatabaseQueryService; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.impl.coreapi.CoreAPIAvailabilityGuard; import org.neo4j.kernel.impl.query.QueryExecutionKernelException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java index 986fa0e82ac4a..2f76576a243f4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Operations.java @@ -55,7 +55,7 @@ import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.SilentTokenNameLookup; import org.neo4j.kernel.api.StatementConstants; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureGDBFacadeSPI.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureGDBFacadeSPI.java index ba2c970d7aa03..6e779facb4a4a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureGDBFacadeSPI.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/proc/ProcedureGDBFacadeSPI.java @@ -34,7 +34,7 @@ import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.GraphDatabaseQueryService; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.impl.coreapi.CoreAPIAvailabilityGuard; import org.neo4j.kernel.impl.factory.DataSourceModule; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java index 2101454b58b85..c863f0d331672 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageEngine.java @@ -37,7 +37,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.tracing.cursor.context.VersionContextSupplier; import org.neo4j.kernel.api.exceptions.TransactionApplyKernelException; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.LabelScanWriter; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidator.java index f484f243155fd..941ce774a3188 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IntegrityValidator.java @@ -21,7 +21,7 @@ import org.neo4j.kernel.api.exceptions.ConstraintViolationTransactionFailureException; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordState.java index 6a721d6a209cf..593b12337477c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordState.java @@ -21,7 +21,7 @@ import java.util.Collection; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.transaction.command.Command; import org.neo4j.storageengine.api.StorageCommand; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java index 8a39c3b74cd3c..3d7373be16462 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordState.java @@ -24,7 +24,7 @@ import java.util.Comparator; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.core.RelationshipTypeToken; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.NeoStores; diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageEngine.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageEngine.java index 9955367542a52..b08a0adf44d44 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageEngine.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StorageEngine.java @@ -24,7 +24,7 @@ import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.io.pagecache.IOLimiter; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.info.DiagnosticsManager; import org.neo4j.storageengine.api.lock.ResourceLocker; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/TopLevelTransactionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/TopLevelTransactionTest.java index 9dfccd85d579e..372721ab66e6c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/TopLevelTransactionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/TopLevelTransactionTest.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.TransientTransactionFailureException; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.coreapi.TopLevelTransaction; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/txtracking/TransactionIdTrackerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/txtracking/TransactionIdTrackerTest.java index b63255f2f0e67..e20c9b91570e9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/txtracking/TransactionIdTrackerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/txtracking/TransactionIdTrackerTest.java @@ -27,7 +27,7 @@ import org.neo4j.kernel.AvailabilityGuard; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import static java.time.Duration.ofMillis; 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 6cfc79931e56c..488e84f33acf8 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 @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java index 897ce10de7deb..c2f4a8c882ebb 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java @@ -40,7 +40,7 @@ import org.neo4j.io.pagecache.tracing.cursor.DefaultPageCursorTracer; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.locking.Locks; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java index c23c113900d5a..a3937f57b094f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java @@ -35,7 +35,7 @@ import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState; import org.neo4j.kernel.impl.api.index.IndexingService; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java index 90d3652e7e309..29f407b87d77c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.KernelTransactionHandle; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.impl.api.index.IndexingService; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessTest.java index 9686d0260f2ac..c0ea036264abe 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TransactionRepresentationCommitProcessTest.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.util.Collections; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.transaction.TransactionRepresentation; import org.neo4j.kernel.impl.transaction.log.FakeCommitment; import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; 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 64001c9a55ba3..6c774b48b4b52 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 @@ -46,7 +46,7 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/CompositeUniquenessConstraintValidationIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/CompositeUniquenessConstraintValidationIT.java index 363d911dbf4af..15d6c5890f904 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/CompositeUniquenessConstraintValidationIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/CompositeUniquenessConstraintValidationIT.java @@ -37,7 +37,7 @@ import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.internal.GraphDatabaseAPI; 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 f21e8586efc6b..d73bfe274f875 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 @@ -44,7 +44,7 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.dbms.DbmsOperations; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.impl.api.index.IndexingService; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/ProceduresKernelIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/ProceduresKernelIT.java index d8bd19bc57e8a..37070de4a4381 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/ProceduresKernelIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/ProceduresKernelIT.java @@ -31,7 +31,7 @@ import org.neo4j.internal.kernel.api.procs.ProcedureSignature; import org.neo4j.internal.kernel.api.procs.QualifiedName; import org.neo4j.kernel.api.ResourceTracker; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.proc.CallableProcedure; import org.neo4j.kernel.api.proc.Context; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/TransactionHookIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/TransactionHookIT.java index c919777ab9307..6bc73efaf018f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/TransactionHookIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/TransactionHookIT.java @@ -22,6 +22,7 @@ import org.junit.Test; import org.neo4j.internal.kernel.api.Write; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.TransactionHook; import org.neo4j.kernel.api.exceptions.Status; @@ -91,7 +92,7 @@ public Throwable failure() commit(); fail("Expected this to fail."); } - catch ( org.neo4j.kernel.api.exceptions.TransactionFailureException e ) + catch ( TransactionFailureException e ) { assertThat( e.status(), equalTo( Status.Transaction.TransactionHookFailed ) ); assertThat( e.getCause().getMessage(), equalTo( message ) ); 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 4c4bc1254ad71..0658d1ca6e9aa 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 @@ -35,7 +35,7 @@ import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.store.NeoStores; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java index 83ad65ebe6a58..c980fda2c8307 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/NeoStoresTest.java @@ -54,7 +54,7 @@ import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.properties.PropertyKeyValue; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.configuration.Config; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerConstraintCreationDeadlockIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerConstraintCreationDeadlockIT.java index cba845278fda1..acfed8fa3a2b8 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerConstraintCreationDeadlockIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/checkpoint/CheckPointerConstraintCreationDeadlockIT.java @@ -30,7 +30,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.ConstraintDefinition; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.api.index.IndexingService; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java index dcd770acd8b3e..fd5b67a41acaa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java @@ -38,7 +38,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.collection.Iterables; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.impl.api.BatchTransactionApplier; import org.neo4j.kernel.impl.api.CommandVisitor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/WriteTransactionCommandOrderingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/WriteTransactionCommandOrderingTest.java index b69565d9c6fda..5c5dc8d15e141 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/WriteTransactionCommandOrderingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/WriteTransactionCommandOrderingTest.java @@ -21,14 +21,13 @@ import org.junit.Test; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.CommandVisitor; import org.neo4j.kernel.impl.store.NeoStores; diff --git a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java index 85ab2bdfa075c..50e8158c5a94f 100644 --- a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java +++ b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java @@ -86,7 +86,7 @@ import org.neo4j.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandle.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandle.java index d72a3c0932009..4905e34dfa51a 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandle.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransactionHandle.java @@ -36,7 +36,6 @@ import org.neo4j.kernel.DeadlockDetectedException; import org.neo4j.kernel.GraphDatabaseQueryService; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.query.QueryExecutionEngine; import org.neo4j.kernel.impl.query.QueryExecutionKernelException; import org.neo4j.kernel.impl.query.TransactionalContext; diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalTxManagementKernelTransaction.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalTxManagementKernelTransaction.java index 04703e896a626..3da54303257ac 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalTxManagementKernelTransaction.java +++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalTxManagementKernelTransaction.java @@ -24,7 +24,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.coreapi.InternalTransaction; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; diff --git a/community/server/src/test/java/org/neo4j/server/rest/domain/GraphDbHelper.java b/community/server/src/test/java/org/neo4j/server/rest/domain/GraphDbHelper.java index e628dddbd7e32..09cea5b0845ba 100644 --- a/community/server/src/test/java/org/neo4j/server/rest/domain/GraphDbHelper.java +++ b/community/server/src/test/java/org/neo4j/server/rest/domain/GraphDbHelper.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.server.database.Database; diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Rollback.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Rollback.java index 633c2f03b2507..a04406afabd07 100644 --- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Rollback.java +++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/Rollback.java @@ -23,7 +23,7 @@ import org.neo4j.helpers.Service; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.shell.App; import org.neo4j.shell.AppCommandParser; import org.neo4j.shell.Continuation; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TransactionApplier.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TransactionApplier.java index bc27306944d81..2340713db03d5 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TransactionApplier.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/catchup/tx/TransactionApplier.java @@ -25,7 +25,7 @@ import org.neo4j.com.storecopy.TransactionObligationFulfiller; import org.neo4j.graphdb.DependencyResolver; import org.neo4j.io.pagecache.tracing.cursor.context.VersionContextSupplier; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenHolder.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenHolder.java index 9407a1ffd6f44..3c5b771732c6e 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenHolder.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenHolder.java @@ -27,7 +27,7 @@ import org.neo4j.causalclustering.core.replication.Replicator; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.state.TxState; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenStateMachine.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenStateMachine.java index c4c5dab834743..dedf1ca5931c6 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenStateMachine.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/token/ReplicatedTokenStateMachine.java @@ -19,7 +19,6 @@ */ package org.neo4j.causalclustering.core.state.machines.token; -import java.io.IOException; import java.util.Collection; import java.util.function.Consumer; @@ -27,7 +26,7 @@ import org.neo4j.causalclustering.core.state.machines.StateMachine; import org.neo4j.io.pagecache.tracing.cursor.context.VersionContext; import org.neo4j.io.pagecache.tracing.cursor.context.VersionContextSupplier; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.locking.LockGroup; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplayableCommitProcess.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplayableCommitProcess.java index 4b7fec4d6623d..d51a54bd178fc 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplayableCommitProcess.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplayableCommitProcess.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicLong; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionCommitProcess.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionCommitProcess.java index dd27dc8852a32..2fb3dd4098c62 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionCommitProcess.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionCommitProcess.java @@ -23,7 +23,7 @@ import java.util.concurrent.Future; import org.neo4j.causalclustering.core.replication.Replicator; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachine.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachine.java index ad7bf30a24fe8..edc52b18de0d7 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachine.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachine.java @@ -27,7 +27,7 @@ import org.neo4j.causalclustering.core.state.machines.locks.ReplicatedLockTokenStateMachine; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier; import org.neo4j.io.pagecache.tracing.cursor.context.VersionContextSupplier; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionQueue; import org.neo4j.kernel.impl.api.TransactionToApply; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/BatchingTxApplierTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/BatchingTxApplierTest.java index df3520670e211..6650833736289 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/BatchingTxApplierTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/tx/BatchingTxApplierTest.java @@ -29,7 +29,7 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.transaction.CommittedTransactionRepresentation; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/CommitProcessStateMachineCollaborationTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/CommitProcessStateMachineCollaborationTest.java index 7affe379844e6..09b74ec90e20e 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/CommitProcessStateMachineCollaborationTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/CommitProcessStateMachineCollaborationTest.java @@ -27,7 +27,7 @@ import org.neo4j.causalclustering.core.state.machines.locks.ReplicatedLockTokenStateMachine; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.transaction.log.PhysicalTransactionRepresentation; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplayableCommitProcessTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplayableCommitProcessTest.java index f7dcdd8a3ba70..b990ab93faffd 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplayableCommitProcessTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplayableCommitProcessTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.transaction.tracing.CommitEvent; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachineTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachineTest.java index c343d848c1eaf..a78c4cc63ffa4 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachineTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionStateMachineTest.java @@ -30,7 +30,7 @@ import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.locking.Locks; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/Cluster.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/Cluster.java index 14b5dff2f9f4f..82121e3b557c8 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/Cluster.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/Cluster.java @@ -487,8 +487,8 @@ private boolean isLockOnFollower( Throwable e ) private boolean isLockExpired( Throwable e ) { return e instanceof TransactionFailureException && - e.getCause() instanceof org.neo4j.kernel.api.exceptions.TransactionFailureException && - ((org.neo4j.kernel.api.exceptions.TransactionFailureException) e.getCause()).status() == + e.getCause() instanceof org.neo4j.internal.kernel.api.exceptions.TransactionFailureException && + ((org.neo4j.internal.kernel.api.exceptions.TransactionFailureException) e.getCause()).status() == LockSessionExpired; } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterDiscoveryIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterDiscoveryIT.java index 3b32c7a8925a6..f7c21ad14534e 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterDiscoveryIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterDiscoveryIT.java @@ -34,7 +34,7 @@ import org.neo4j.internal.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java index 7bc48489b6edc..f26249c54944e 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterOverviewIT.java @@ -51,7 +51,7 @@ import org.neo4j.internal.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.test.causalclustering.ClusterRule; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/InstalledProtocolsProcedureIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/InstalledProtocolsProcedureIT.java index 6670507b1e2fe..d69b8d58d233d 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/InstalledProtocolsProcedureIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/InstalledProtocolsProcedureIT.java @@ -38,7 +38,7 @@ import org.neo4j.internal.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; import org.neo4j.test.causalclustering.ClusterRule; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java index 9329a6ca324f5..b3e150bc54d4e 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ReadReplicaReplicationIT.java @@ -49,7 +49,6 @@ import org.neo4j.causalclustering.discovery.Cluster; import org.neo4j.causalclustering.discovery.ClusterMember; import org.neo4j.causalclustering.discovery.CoreClusterMember; -import org.neo4j.causalclustering.discovery.HazelcastDiscoveryServiceFactory; import org.neo4j.causalclustering.discovery.ReadReplica; import org.neo4j.causalclustering.readreplica.ReadReplicaGraphDatabase; import org.neo4j.function.ThrowingSupplier; @@ -65,7 +64,7 @@ import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.monitoring.PageCacheCounters; import org.neo4j.kernel.AvailabilityGuard; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.txtracking.TransactionIdTracker; import org.neo4j.kernel.impl.factory.GraphDatabaseFacade; diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/TransactionBatchCommitter.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/TransactionBatchCommitter.java index 4c1bfe0cbe3bf..9b7e593c75146 100644 --- a/enterprise/com/src/main/java/org/neo4j/com/storecopy/TransactionBatchCommitter.java +++ b/enterprise/com/src/main/java/org/neo4j/com/storecopy/TransactionBatchCommitter.java @@ -21,7 +21,7 @@ import org.neo4j.kernel.api.KernelTransactionHandle; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.KernelTransactions; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionQueue; diff --git a/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java b/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java index df510b4f5bd42..e3c0a82e87d71 100644 --- a/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java +++ b/enterprise/com/src/test/java/org/neo4j/com/storecopy/TransactionCommittingResponseUnpackerTest.java @@ -33,7 +33,6 @@ import org.neo4j.com.TransactionStreamResponse; import org.neo4j.com.storecopy.TransactionCommittingResponseUnpacker.Dependencies; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.KernelTransactions; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterTransactionCommitProcess.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterTransactionCommitProcess.java index 230f1765262cd..5ff3f492dd54f 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterTransactionCommitProcess.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterTransactionCommitProcess.java @@ -19,7 +19,7 @@ */ package org.neo4j.kernel.ha; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.ha.transaction.TransactionPropagator; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveTransactionCommitProcess.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveTransactionCommitProcess.java index 68dacd81baaa5..bf015e406230f 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveTransactionCommitProcess.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveTransactionCommitProcess.java @@ -23,7 +23,7 @@ import org.neo4j.com.RequestContext; import org.neo4j.com.Response; import org.neo4j.graphdb.TransientTransactionFailureException; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.ha.com.RequestContextFactory; import org.neo4j.kernel.ha.com.master.Master; import org.neo4j.kernel.impl.api.TransactionCommitProcess; 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 db1890385dffd..3ddb26e4509e6 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 @@ -30,7 +30,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.NeoStoreDataSource; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.ha.TransactionChecksumLookup; import org.neo4j.kernel.ha.com.master.MasterImpl; import org.neo4j.kernel.ha.id.IdAllocation; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/Master.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/Master.java index 2edfb45983f25..90deb66d4c1cd 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/Master.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/Master.java @@ -22,7 +22,7 @@ import org.neo4j.com.RequestContext; import org.neo4j.com.Response; import org.neo4j.com.storecopy.StoreWriter; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.ha.id.IdAllocation; import org.neo4j.kernel.ha.lock.LockResult; import org.neo4j.kernel.impl.store.StoreId; diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java index a658d2ff54b47..c06e074e37538 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java @@ -33,7 +33,7 @@ import org.neo4j.com.storecopy.StoreWriter; import org.neo4j.kernel.DeadlockDetectedException; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.ha.id.IdAllocation; import org.neo4j.kernel.ha.lock.LockResult; @@ -74,7 +74,7 @@ public interface SPI StoreId storeId(); long applyPreparedTransaction( TransactionRepresentation preparedTransaction ) - throws org.neo4j.kernel.api.exceptions.TransactionFailureException; + throws TransactionFailureException; Integer createRelationshipType( String name ); @@ -156,7 +156,7 @@ public Response allocateIds( RequestContext context, IdType idType @Override public Response commit( RequestContext context, TransactionRepresentation preparedTransaction ) - throws org.neo4j.kernel.api.exceptions.TransactionFailureException + throws TransactionFailureException { assertCorrectEpoch( context ); @@ -199,7 +199,7 @@ public Response commit( RequestContext context, TransactionRepresentation } private Response commit0( RequestContext context, TransactionRepresentation preparedTransaction ) - throws org.neo4j.kernel.api.exceptions.TransactionFailureException + throws TransactionFailureException { long txId = spi.applyPreparedTransaction( preparedTransaction ); return spi.packTransactionObligationResponse( context, txId ); diff --git a/enterprise/ha/src/test/java/org/neo4j/ha/ClusterTransactionIT.java b/enterprise/ha/src/test/java/org/neo4j/ha/ClusterTransactionIT.java index 211a7bf9bc29d..cf4b6dc55ac50 100644 --- a/enterprise/ha/src/test/java/org/neo4j/ha/ClusterTransactionIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/ha/ClusterTransactionIT.java @@ -27,7 +27,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.ha.HaSettings; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/LabelIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/LabelIT.java index 55b87acd70a75..3a4b368364b2c 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/LabelIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/LabelIT.java @@ -26,7 +26,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; import org.neo4j.kernel.impl.ha.ClusterManager; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java index 3cf9d37359a41..cb24a0dbe84ca 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java @@ -41,7 +41,7 @@ import org.neo4j.com.TransactionNotPresentOnMasterException; import org.neo4j.com.TransactionObligationResponse; import org.neo4j.com.storecopy.StoreWriter; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.ha.cluster.ConversationSPI; import org.neo4j.kernel.ha.cluster.DefaultConversationSPI; diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java index 81841dd003e74..171f9a695ce58 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplTest.java @@ -36,6 +36,7 @@ import org.neo4j.com.Response; import org.neo4j.com.TransactionNotPresentOnMasterException; import org.neo4j.com.TransactionObligationResponse; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.DeadlockDetectedException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.ha.HaSettings; @@ -97,7 +98,7 @@ public void givenStartedAndInaccessibleWhenNewLockSessionThrowException() instance.newLockSession( new RequestContext( 0, 1, 2, 0, 0 ) ); fail(); } - catch ( org.neo4j.kernel.api.exceptions.TransactionFailureException e ) + catch ( TransactionFailureException e ) { // Ok } diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/SlaveLocksClientTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/SlaveLocksClientTest.java index ff199c001ae64..2359149922407 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/SlaveLocksClientTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/SlaveLocksClientTest.java @@ -36,7 +36,7 @@ import org.neo4j.graphdb.TransientFailureException; import org.neo4j.kernel.AvailabilityGuard; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.ha.com.RequestContextFactory; import org.neo4j.kernel.ha.com.master.Master; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java index 3c524183552cb..a9ca13c349cce 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java @@ -45,7 +45,7 @@ import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java index f51f26b32b2f3..cfbe5cd711ff0 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java @@ -39,7 +39,7 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.ConstraintViolationTransactionFailureException; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; import org.neo4j.test.assertion.Assert; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java index ec2a47daaf310..84d00f9c326c1 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java @@ -37,7 +37,7 @@ import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.SilentTokenNameLookup; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException; diff --git a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/HalfAppliedConstraintRecoveryIT.java b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/HalfAppliedConstraintRecoveryIT.java index ab8e35fbb3463..27e2eb9e319f4 100644 --- a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/HalfAppliedConstraintRecoveryIT.java +++ b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/HalfAppliedConstraintRecoveryIT.java @@ -37,7 +37,7 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.helpers.collection.Iterables; import org.neo4j.io.pagecache.IOLimiter; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.impl.api.TransactionCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply; import org.neo4j.kernel.impl.api.index.IndexingService; diff --git a/tools/src/main/java/org/neo4j/tools/applytx/ApplyTransactionsCommand.java b/tools/src/main/java/org/neo4j/tools/applytx/ApplyTransactionsCommand.java index 6d10c8fdbbf3e..82d4fedbf91dc 100644 --- a/tools/src/main/java/org/neo4j/tools/applytx/ApplyTransactionsCommand.java +++ b/tools/src/main/java/org/neo4j/tools/applytx/ApplyTransactionsCommand.java @@ -32,7 +32,7 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.io.pagecache.impl.muninn.StandalonePageCacheFactory; -import org.neo4j.kernel.api.exceptions.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.TransactionRepresentationCommitProcess; import org.neo4j.kernel.impl.api.TransactionToApply;