From 208f73d16c82d111261de7624614e176e9968917 Mon Sep 17 00:00:00 2001 From: fickludd Date: Wed, 17 Jan 2018 22:54:39 +0100 Subject: [PATCH] Move IllegalTokenName and TooManyLabelsException to Kernel API module --- .../org/neo4j/internal/kernel/api/TokenWrite.java | 15 ++++++++------- .../schema/IllegalTokenNameException.java | 2 +- .../exceptions/schema/SchemaKernelException.java | 4 ++-- .../exceptions/schema/TooManyLabelsException.java | 2 +- .../neo4j/kernel/api/TokenWriteOperations.java | 4 ++-- .../schema/AlreadyConstrainedException.java | 1 + .../schema/AlreadyIndexedException.java | 1 + .../schema/CreateConstraintFailureException.java | 1 + .../schema/DropConstraintFailureException.java | 1 + .../schema/DropIndexFailureException.java | 1 + .../schema/IndexBelongsToConstraintException.java | 1 + .../schema/MalformedSchemaRuleException.java | 1 + .../schema/NoSuchConstraintException.java | 1 + .../exceptions/schema/NoSuchIndexException.java | 1 + ...epeatedPropertyInCompositeSchemaException.java | 1 + .../exceptions/schema/SchemaRuleException.java | 1 + .../kernel/builtinprocs/TokenProcedures.java | 4 ++-- ...ataIntegrityValidatingStatementOperations.java | 8 ++++---- .../neo4j/kernel/impl/api/OperationsFacade.java | 4 ++-- .../api/StateHandlingStatementOperations.java | 5 ++--- .../impl/api/operations/KeyWriteOperations.java | 4 ++-- .../impl/api/state/ConstraintIndexCreator.java | 6 +++--- .../neo4j/kernel/impl/api/store/StorageLayer.java | 2 +- .../kernel/impl/core/DefaultLabelIdCreator.java | 4 ++-- .../impl/core/DefaultPropertyTokenCreator.java | 2 +- .../impl/core/DefaultRelationshipTypeCreator.java | 2 +- .../kernel/impl/core/GraphPropertiesProxy.java | 2 +- .../core/IsolatedTransactionTokenCreator.java | 4 ++-- .../org/neo4j/kernel/impl/core/NodeProxy.java | 4 ++-- .../neo4j/kernel/impl/core/RelationshipProxy.java | 2 +- .../coreapi/schema/InternalSchemaActions.java | 4 ++-- .../impl/coreapi/schema/PropertyNameUtils.java | 2 +- .../kernel/impl/coreapi/schema/SchemaImpl.java | 4 ++-- .../kernel/impl/factory/GraphDatabaseFacade.java | 2 +- .../neo4j/kernel/impl/newapi/AllStoreHolder.java | 5 ----- .../org/neo4j/kernel/impl/newapi/KernelToken.java | 12 ++++++------ .../neo4j/storageengine/api/StoreReadLayer.java | 2 +- ...ntegrityValidatingStatementOperationsTest.java | 4 ++-- .../org/neo4j/kernel/impl/api/index/IndexIT.java | 2 +- .../impl/api/index/IndexPopulationJobTest.java | 4 ++-- .../kernel/impl/api/integrationtest/KernelIT.java | 2 +- .../KernelExceptionUserMessageMatcher.java | 2 +- 42 files changed, 71 insertions(+), 65 deletions(-) rename community/{kernel/src/main/java/org/neo4j => kernel-api/src/main/java/org/neo4j/internal}/kernel/api/exceptions/schema/IllegalTokenNameException.java (95%) rename community/{kernel/src/main/java/org/neo4j => kernel-api/src/main/java/org/neo4j/internal}/kernel/api/exceptions/schema/SchemaKernelException.java (94%) rename community/{kernel/src/main/java/org/neo4j => kernel-api/src/main/java/org/neo4j/internal}/kernel/api/exceptions/schema/TooManyLabelsException.java (95%) diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/TokenWrite.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/TokenWrite.java index 974386582623c..6cdfb31916dd0 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/TokenWrite.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/TokenWrite.java @@ -19,7 +19,8 @@ */ package org.neo4j.internal.kernel.api; -import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; public interface TokenWrite { @@ -27,19 +28,19 @@ public interface TokenWrite * Returns a label id for a label name. If the label doesn't exist prior to * this call it gets created. */ - int labelGetOrCreateForName( String labelName ) throws KernelException; + int labelGetOrCreateForName( String labelName ) throws IllegalTokenNameException, TooManyLabelsException; /** * Returns a property key id for a property key. If the key doesn't exist prior to * this call it gets created. */ - int propertyKeyGetOrCreateForName( String propertyKeyName ) throws KernelException; + int propertyKeyGetOrCreateForName( String propertyKeyName ) throws IllegalTokenNameException; - int relationshipTypeGetOrCreateForName( String relationshipTypeName ) throws KernelException; + int relationshipTypeGetOrCreateForName( String relationshipTypeName ) throws IllegalTokenNameException; - void labelCreateForName( String labelName, int id ) throws KernelException; + void labelCreateForName( String labelName, int id ) throws IllegalTokenNameException, TooManyLabelsException; - void propertyKeyCreateForName( String propertyKeyName, int id ) throws KernelException; + void propertyKeyCreateForName( String propertyKeyName, int id ) throws IllegalTokenNameException; - void relationshipTypeCreateForName( String relationshipTypeName, int id ) throws KernelException; + void relationshipTypeCreateForName( String relationshipTypeName, int id ) throws IllegalTokenNameException; } diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IllegalTokenNameException.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/IllegalTokenNameException.java similarity index 95% rename from community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IllegalTokenNameException.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/IllegalTokenNameException.java index ddf05bbacece3..28df461880211 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IllegalTokenNameException.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/IllegalTokenNameException.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.exceptions.schema; +package org.neo4j.internal.kernel.api.exceptions.schema; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/SchemaKernelException.java similarity index 94% rename from community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/SchemaKernelException.java index faf9f49380e9a..cafae5ae6ef85 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/SchemaKernelException.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.exceptions.schema; +package org.neo4j.internal.kernel.api.exceptions.schema; import java.util.Arrays; import java.util.stream.Collectors; @@ -53,7 +53,7 @@ public SchemaKernelException( Status statusCode, String message ) super( statusCode, message ); } - static String messageWithLabelAndPropertyName( TokenNameLookup tokenNameLookup, String formatString, + protected static String messageWithLabelAndPropertyName( TokenNameLookup tokenNameLookup, String formatString, LabelSchemaDescriptor descriptor ) { int[] propertyIds = descriptor.getPropertyIds(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/TooManyLabelsException.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/TooManyLabelsException.java similarity index 95% rename from community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/TooManyLabelsException.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/TooManyLabelsException.java index f7375f810e2f0..c32b688f87ee4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/TooManyLabelsException.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/schema/TooManyLabelsException.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.exceptions.schema; +package org.neo4j.internal.kernel.api.exceptions.schema; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/TokenWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/TokenWriteOperations.java index 83175d43de596..61bbe991bb18b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/TokenWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/TokenWriteOperations.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.api; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; public interface TokenWriteOperations { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java index b3037ad1bdd7f..c000840023bdc 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java index 7f4841a5e2a9f..942a8360da6fa 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java index 3c2f237e46e20..254726b5bf7fb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java @@ -21,6 +21,7 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java index a70e25c6b02cf..8b7e62902128f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java @@ -21,6 +21,7 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java index 38e4b9c3c2962..1635d3c6d09c0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java @@ -21,6 +21,7 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java index 8ec73d5bef17f..d8cd81a3f4049 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java index c00ce73f45a84..e8b8cf96af6d8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/MalformedSchemaRuleException.java @@ -19,6 +19,7 @@ */ package org.neo4j.kernel.api.exceptions.schema; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.kernel.api.exceptions.Status; /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java index 1f73e73fdf4a7..a47fd854de1ed 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java index f57044d374b45..13b653c898c5c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RepeatedPropertyInCompositeSchemaException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RepeatedPropertyInCompositeSchemaException.java index cc79fd4790578..df818d313e883 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RepeatedPropertyInCompositeSchemaException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RepeatedPropertyInCompositeSchemaException.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java index 221ae2bc419cb..80e4d785912f8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java @@ -20,6 +20,7 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.exceptions.Status; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/TokenProcedures.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/TokenProcedures.java index d32af4c62b0f2..f2e72c48bfdc8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/TokenProcedures.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/TokenProcedures.java @@ -21,8 +21,8 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.procedure.Context; import org.neo4j.procedure.Description; import org.neo4j.procedure.Name; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java index 70f7b663a7986..7bb9378756247 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java @@ -32,13 +32,13 @@ import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.exceptions.schema.IndexBelongsToConstraintException; import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException; import org.neo4j.kernel.api.exceptions.schema.NoSuchIndexException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; -import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException.OperationContext; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException.OperationContext; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; @@ -49,7 +49,7 @@ import org.neo4j.kernel.impl.api.operations.SchemaReadOperations; import org.neo4j.kernel.impl.api.operations.SchemaWriteOperations; -import static org.neo4j.kernel.api.exceptions.schema.SchemaKernelException.OperationContext.CONSTRAINT_CREATION; +import static org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException.OperationContext.CONSTRAINT_CREATION; import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.UNIQUE; public class DataIntegrityValidatingStatementOperations implements diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java index 98f2d20ba2ca5..9714a09f208bf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/OperationsFacade.java @@ -69,11 +69,11 @@ import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.proc.BasicContext; import org.neo4j.kernel.api.proc.CallableUserAggregationFunction; 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 18ac83784e6ca..c72d50cc03465 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 @@ -28,7 +28,6 @@ import org.neo4j.collection.primitive.PrimitiveIntIterator; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.collection.primitive.PrimitiveIntStack; -import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.cursor.Cursor; @@ -58,10 +57,10 @@ import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.index.SchemaIndexProvider; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyWriteOperations.java index 6d8410785a13e..681ee3af963f7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyWriteOperations.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.impl.api.operations; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.impl.api.KernelStatement; public interface KeyWriteOperations 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 dd198d0653dc4..7fff1e9a7f514 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 @@ -35,8 +35,8 @@ import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; -import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; -import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException.OperationContext; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException.OperationContext; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.index.PropertyAccessor; @@ -53,7 +53,7 @@ import static org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException.Phase.VERIFICATION; import static org.neo4j.internal.kernel.api.security.SecurityContext.AUTH_DISABLED; -import static org.neo4j.kernel.api.exceptions.schema.SchemaKernelException.OperationContext.CONSTRAINT_CREATION; +import static org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException.OperationContext.CONSTRAINT_CREATION; import static org.neo4j.kernel.impl.locking.ResourceTypes.LABEL; public class ConstraintIndexCreator diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java index e86a7132800a8..97eeeb44c3d2e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/StorageLayer.java @@ -44,7 +44,7 @@ import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.properties.PropertyKeyIdIterator; import org.neo4j.kernel.api.schema.index.IndexDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java index cd66e19242a13..523f1a98d0f09 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java @@ -23,8 +23,8 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import org.neo4j.kernel.impl.store.id.IdType; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java index 8321518506aae..372d28b982830 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java @@ -23,7 +23,7 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import org.neo4j.kernel.impl.store.id.IdType; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java index b95f825276156..42409ade04fa8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java @@ -23,7 +23,7 @@ import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import org.neo4j.kernel.impl.store.id.IdType; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java index da1b5e64b8a94..27069b832c7ab 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; import org.neo4j.kernel.api.exceptions.PropertyNotFoundException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; import org.neo4j.storageengine.api.EntityType; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java index 726dcda7f482a..cdcb96a2e22dd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java @@ -26,8 +26,8 @@ import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.internal.kernel.api.Transaction.Type; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.impl.store.id.IdGeneratorFactory; import static org.neo4j.internal.kernel.api.security.SecurityContext.AUTH_DISABLED; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java index 4be04f0224ae8..8e274f2fc34f1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java @@ -56,8 +56,8 @@ import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; import org.neo4j.storageengine.api.EntityType; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java index dda9c79d53a1b..95d3b7dc73e02 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipProxy.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.api.StatementTokenNameLookup; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.PropertyNotFoundException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/InternalSchemaActions.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/InternalSchemaActions.java index 35fd1c4a46481..ec8d45fe575cb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/InternalSchemaActions.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/InternalSchemaActions.java @@ -27,8 +27,8 @@ import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; /** * Implementations are used to configure {@link IndexCreatorImpl} and {@link BaseNodeConstraintCreator} for re-use diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/PropertyNameUtils.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/PropertyNameUtils.java index b78f4527f971e..ed7281f7bdcdd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/PropertyNameUtils.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/PropertyNameUtils.java @@ -28,7 +28,7 @@ import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; public class PropertyNameUtils { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java index 9d763ba7c789a..8c54ae93cbf44 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java @@ -56,10 +56,10 @@ import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; 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 ce120a76c0ba3..d4f2aabc74bf6 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 @@ -71,7 +71,7 @@ import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java index 7b7f2a9bdb395..fe98d1863bf89 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java @@ -29,10 +29,6 @@ import org.neo4j.internal.kernel.api.CapableIndexReference; import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.InternalIndexState; -import org.neo4j.internal.kernel.api.Token; -import org.neo4j.internal.kernel.api.exceptions.KernelException; -import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; -import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaUtil; @@ -40,7 +36,6 @@ import org.neo4j.io.pagecache.PageCursor; import org.neo4j.kernel.api.ExplicitIndex; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java index 80c6b58cd6ccd..b6118cda7d8b4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/KernelToken.java @@ -23,8 +23,8 @@ import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.storageengine.api.StorageEngine; import org.neo4j.storageengine.api.StoreReadLayer; @@ -50,13 +50,13 @@ public int propertyKeyGetOrCreateForName( String propertyKeyName ) throws Illega } @Override - public int relationshipTypeGetOrCreateForName( String relationshipTypeName ) throws KernelException + public int relationshipTypeGetOrCreateForName( String relationshipTypeName ) throws IllegalTokenNameException { throw new UnsupportedOperationException( "not implemented" ); } @Override - public void labelCreateForName( String labelName, int id ) throws KernelException + public void labelCreateForName( String labelName, int id ) throws IllegalTokenNameException, TooManyLabelsException { throw new UnsupportedOperationException( "not implemented" ); } @@ -74,13 +74,13 @@ public int labelGetForName( String name ) } @Override - public void propertyKeyCreateForName( String propertyKeyName, int id ) throws KernelException + public void propertyKeyCreateForName( String propertyKeyName, int id ) throws IllegalTokenNameException { throw new UnsupportedOperationException( "not implemented" ); } @Override - public void relationshipTypeCreateForName( String relationshipTypeName, int id ) throws KernelException + public void relationshipTypeCreateForName( String relationshipTypeName, int id ) throws IllegalTokenNameException { throw new UnsupportedOperationException( "not implemented" ); } diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java index 10679926cbc08..7c4ffedbb68b6 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/StoreReadLayer.java @@ -40,7 +40,7 @@ import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java index f091b832115d9..5d8c359eed469 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java @@ -31,11 +31,11 @@ import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.exceptions.schema.IndexBelongsToConstraintException; import org.neo4j.kernel.api.exceptions.schema.NoSuchIndexException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; -import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java index d9b310c685783..49bcb5952f2da 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java @@ -43,7 +43,7 @@ import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; 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 b2cf3263f13e5..a651051a358a5 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 @@ -48,8 +48,8 @@ import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; +import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; 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/KernelIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java index a1ac0968b3e46..a43257dcac2a7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIT.java @@ -46,7 +46,7 @@ import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.internal.GraphDatabaseAPI; diff --git a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/KernelExceptionUserMessageMatcher.java b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/KernelExceptionUserMessageMatcher.java index f44293b9c49c7..62c29eec99850 100644 --- a/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/KernelExceptionUserMessageMatcher.java +++ b/community/kernel/src/test/java/org/neo4j/test/mockito/matcher/KernelExceptionUserMessageMatcher.java @@ -23,7 +23,7 @@ import org.hamcrest.Description; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; public class KernelExceptionUserMessageMatcher extends BaseMatcher {