From 7acc5dc7e02399cb43d648eedefef6240f217e5e Mon Sep 17 00:00:00 2001 From: Pontus Melke Date: Thu, 23 Nov 2017 17:27:33 +0100 Subject: [PATCH] Move exception into API --- .../api/exceptions/PropertyKeyIdNotFoundKernelException.java | 4 ++-- .../java/org/neo4j/kernel/api/KeyReadTokenNameLookup.java | 2 +- .../src/main/java/org/neo4j/kernel/api/ReadOperations.java | 2 +- .../java/org/neo4j/kernel/api/StatementTokenNameLookup.java | 2 +- .../kernel/impl/api/ConstraintEnforcingEntityOperations.java | 2 -- .../main/java/org/neo4j/kernel/impl/api/OperationsFacade.java | 4 ++-- .../kernel/impl/api/StateHandlingStatementOperations.java | 2 +- .../impl/api/explicitindex/InternalAutoIndexOperations.java | 2 +- .../neo4j/kernel/impl/api/operations/KeyReadOperations.java | 2 +- .../java/org/neo4j/kernel/impl/api/store/StorageLayer.java | 2 +- .../java/org/neo4j/kernel/impl/core/GraphPropertiesProxy.java | 2 +- .../java/org/neo4j/kernel/impl/core/RelationshipProxy.java | 2 +- .../kernel/impl/coreapi/TxStateTransactionDataSnapshot.java | 2 +- .../neo4j/kernel/impl/coreapi/schema/PropertyNameUtils.java | 4 ++-- .../java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java | 2 +- 15 files changed, 17 insertions(+), 19 deletions(-) rename community/{kernel/src/main/java/org/neo4j => kernel-api/src/main/java/org/neo4j/internal}/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java (91%) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java similarity index 91% rename from community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java index a745e854db5e..664d2275a2dd 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/PropertyKeyIdNotFoundKernelException.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; public class PropertyKeyIdNotFoundKernelException extends KernelException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/KeyReadTokenNameLookup.java b/community/kernel/src/main/java/org/neo4j/kernel/api/KeyReadTokenNameLookup.java index e584cd3d0ebb..e9e94ce8d595 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/KeyReadTokenNameLookup.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/KeyReadTokenNameLookup.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.api; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java index 2e378d328705..0b94b5019133 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/ReadOperations.java @@ -32,10 +32,10 @@ import org.neo4j.graphdb.Direction; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.kernel.api.exceptions.ProcedureException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; 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/api/StatementTokenNameLookup.java b/community/kernel/src/main/java/org/neo4j/kernel/api/StatementTokenNameLookup.java index 03d2ae521c0a..4b409fee7f7f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/StatementTokenNameLookup.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/StatementTokenNameLookup.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.api; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java index 7d799c505249..8bb18357e43b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java @@ -34,8 +34,6 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.IndexQuery.ExactPredicate; -import org.neo4j.internal.kernel.api.exceptions.KernelException; -import org.neo4j.kernel.api.StatementConstants; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.KernelException; 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 0eeccbc55bd3..978313b8e269 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 @@ -34,9 +34,10 @@ import org.neo4j.cursor.Cursor; import org.neo4j.graphdb.Direction; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; import org.neo4j.internal.kernel.api.security.AccessMode; @@ -54,7 +55,6 @@ import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.kernel.api.exceptions.ProcedureException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; 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/api/StateHandlingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java index 69369322d94d..e097fb8497a1 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 @@ -36,6 +36,7 @@ import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; import org.neo4j.kernel.api.DataWriteOperations; @@ -43,7 +44,6 @@ import org.neo4j.kernel.api.ExplicitIndexHits; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/explicitindex/InternalAutoIndexOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/explicitindex/InternalAutoIndexOperations.java index fecc09906203..be17b6432a22 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/explicitindex/InternalAutoIndexOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/explicitindex/InternalAutoIndexOperations.java @@ -27,10 +27,10 @@ import org.neo4j.internal.kernel.api.ExplicitIndexWrite; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; import org.neo4j.kernel.api.DataWriteOperations; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.explicitindex.AutoIndexOperations; import org.neo4j.kernel.impl.core.PropertyKeyTokenHolder; import org.neo4j.kernel.impl.core.TokenNotFoundException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java index d0a704db5f8d..b76a2717d24f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/KeyReadOperations.java @@ -21,10 +21,10 @@ import java.util.Iterator; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementConstants; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.storageengine.api.Token; 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 14f3e750dd58..193c809ae5bd 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 @@ -33,10 +33,10 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.AssertOpen; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; 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 7f20f650b153..611105311755 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 @@ -29,10 +29,10 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.NotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.PropertyNotFoundException; import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; 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 d4116c45fa25..718b493ef2e2 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 @@ -37,10 +37,10 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.PropertyNotFoundException; import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.impl.api.RelationshipVisitor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java index 4690224e109c..cbb3132117f4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TxStateTransactionDataSnapshot.java @@ -36,9 +36,9 @@ import org.neo4j.graphdb.event.TransactionData; import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; import org.neo4j.kernel.impl.core.NodeProxy; import org.neo4j.kernel.impl.core.RelationshipProxy; 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 2632c46838f2..bdfc6eac4882 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 @@ -23,10 +23,10 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.api.ReadOperations; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; +import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; 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 b13c3df51256..d795d00dc338 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 @@ -40,12 +40,12 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.exceptions.LabelNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException;