diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledCursorUtils.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledCursorUtils.java index 6a67251fbf9cf..60d0d5770cf6a 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledCursorUtils.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledCursorUtils.java @@ -25,10 +25,10 @@ import org.neo4j.internal.kernel.api.PropertyCursor; import org.neo4j.internal.kernel.api.Read; import org.neo4j.internal.kernel.api.RelationshipScanCursor; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.helpers.RelationshipSelectionCursor; import org.neo4j.internal.kernel.api.helpers.RelationshipSelections; import org.neo4j.kernel.api.StatementConstants; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.storageengine.api.EntityType; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledExpandUtils.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledExpandUtils.java index 73e8791a8efed..163390b72efb9 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledExpandUtils.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/CompiledExpandUtils.java @@ -23,9 +23,9 @@ import org.neo4j.internal.kernel.api.CursorFactory; import org.neo4j.internal.kernel.api.NodeCursor; import org.neo4j.internal.kernel.api.Read; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.helpers.RelationshipSelectionCursor; import org.neo4j.kernel.api.ReadOperations; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; public abstract class CompiledExpandUtils { diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala index 0cca68087908f..77359c4b1275d 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala @@ -41,13 +41,13 @@ import org.neo4j.graphdb.RelationshipType._ import org.neo4j.graphdb._ import org.neo4j.graphdb.security.URLAccessValidationError import org.neo4j.graphdb.traversal.{Evaluators, TraversalDescription, Uniqueness} +import org.neo4j.internal.kernel.api import org.neo4j.internal.kernel.api.{IndexQuery, InternalIndexState} import org.neo4j.kernel.GraphDatabaseQueryService import org.neo4j.kernel.api.exceptions.schema.{AlreadyConstrainedException, AlreadyIndexedException} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory -import org.neo4j.kernel.api.{exceptions, _} import org.neo4j.kernel.impl.core.EmbeddedProxySPI import org.neo4j.values.storable.Values @@ -273,7 +273,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) try { tc.statement.dataWriteOperations().nodeDelete(obj.getId) } catch { - case _: exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... } } @@ -281,7 +281,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) try { tc.statement.dataWriteOperations().nodeDetachDelete(obj.getId) } catch { - case _: exceptions.EntityNotFoundException => // the node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => // the node has been deleted by another transaction, oh well... 0 } } @@ -297,35 +297,35 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) override def next(): Int = try { inner.next() } catch { - case _: exceptions.EntityNotFoundException => null.asInstanceOf[Int] + case _: api.exceptions.EntityNotFoundException => null.asInstanceOf[Int] } } } catch { - case _: exceptions.EntityNotFoundException => Iterator.empty + case _: api.exceptions.EntityNotFoundException => Iterator.empty } def getProperty(id: Long, propertyKeyId: Int): Any = try { tc.statement.readOperations().nodeGetProperty(id, propertyKeyId).asObject() } catch { - case _: exceptions.EntityNotFoundException => null.asInstanceOf[Int] + case _: api.exceptions.EntityNotFoundException => null.asInstanceOf[Int] } def hasProperty(id: Long, propertyKey: Int): Boolean = try { tc.statement.readOperations().nodeHasProperty(id, propertyKey) } catch { - case _: exceptions.EntityNotFoundException => false + case _: api.exceptions.EntityNotFoundException => false } def removeProperty(id: Long, propertyKeyId: Int): Unit = try { tc.statement.dataWriteOperations().nodeRemoveProperty(id, propertyKeyId) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } def setProperty(id: Long, propertyKeyId: Int, value: Any): Unit = try { tc.statement.dataWriteOperations().nodeSetProperty(id, propertyKeyId, Values.of(value)) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } override def getById(id: Long): Node = @@ -352,7 +352,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) try { tc.statement.dataWriteOperations().relationshipDelete(obj.getId) } catch { - case _: exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... } } @@ -367,35 +367,35 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) override def next(): Int = try { inner.next() } catch { - case _: exceptions.EntityNotFoundException => null.asInstanceOf[Int] + case _: api.exceptions.EntityNotFoundException => null.asInstanceOf[Int] } } } catch { - case _: exceptions.EntityNotFoundException => Iterator.empty + case _: api.exceptions.EntityNotFoundException => Iterator.empty } override def getProperty(id: Long, propertyKeyId: Int): Any = try { tc.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asObject() } catch { - case _: exceptions.EntityNotFoundException => null + case _: api.exceptions.EntityNotFoundException => null } override def hasProperty(id: Long, propertyKey: Int): Boolean = try { tc.statement.readOperations().relationshipHasProperty(id, propertyKey) } catch { - case _: exceptions.EntityNotFoundException => false + case _: api.exceptions.EntityNotFoundException => false } override def removeProperty(id: Long, propertyKeyId: Int): Unit = try { tc.statement.dataWriteOperations().relationshipRemoveProperty(id, propertyKeyId) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } override def setProperty(id: Long, propertyKeyId: Int, value: Any): Unit = try { tc.statement.dataWriteOperations().relationshipSetProperty(id, propertyKeyId, Values.of(value)) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } override def getById(id: Long): Relationship = @@ -403,7 +403,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) tc.statement.readOperations().relationshipCursorById(id) proxySpi.newRelationshipProxy(id) } catch { - case e: exceptions.EntityNotFoundException => + case e: api.exceptions.EntityNotFoundException => throw new EntityNotFoundException(s"Relationship with id $id", e) } @@ -617,7 +617,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper) try { tc.statement.dataWriteOperations().nodeDetachDelete(node.getId) } catch { - case _: exceptions.EntityNotFoundException => // the node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => // the node has been deleted by another transaction, oh well... 0 } } diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala index 49223803ba796..51c435ca390ff 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala @@ -44,8 +44,10 @@ import org.neo4j.graphdb.RelationshipType._ import org.neo4j.graphdb._ import org.neo4j.graphdb.security.URLAccessValidationError import org.neo4j.graphdb.traversal.{Evaluators, TraversalDescription, Uniqueness} +import org.neo4j.internal.kernel.api import org.neo4j.internal.kernel.api.{IndexQuery, InternalIndexState} import org.neo4j.kernel.GraphDatabaseQueryService +import org.neo4j.kernel.api._ import org.neo4j.kernel.api.dbms.DbmsOperations import org.neo4j.kernel.api.exceptions.ProcedureException import org.neo4j.kernel.api.exceptions.schema.{AlreadyConstrainedException, AlreadyIndexedException} @@ -53,7 +55,6 @@ import org.neo4j.kernel.api.proc.{QualifiedName => KernelQualifiedName} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory -import org.neo4j.kernel.api.{exceptions, _} import org.neo4j.kernel.impl.core.EmbeddedProxySPI import org.neo4j.kernel.impl.locking.ResourceTypes import org.neo4j.kernel.impl.util.ValueUtils @@ -110,7 +111,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) override def getLabelsForNode(node: Long) = try { JavaConversionSupport.asScala(txContext.statement.readOperations().nodeGetLabels(node)) } catch { - case e: exceptions.EntityNotFoundException => + case e: api.exceptions.EntityNotFoundException => if (nodeOps.isDeletedInThisTx(node)) throw new EntityNotFoundException(s"Node with id $node has been deleted in this transaction", e) else @@ -297,20 +298,20 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) try { txContext.statement.dataWriteOperations().nodeDelete(obj.getId) } catch { - case _: exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... } } override def propertyKeyIds(id: Long): Iterator[Int] = try { JavaConversionSupport.asScalaENFXSafe(txContext.statement.readOperations().nodeGetPropertyKeys(id)) } catch { - case _: exceptions.EntityNotFoundException => Iterator.empty + case _: api.exceptions.EntityNotFoundException => Iterator.empty } override def getProperty(id: Long, propertyKeyId: Int): Any = try { txContext.statement.readOperations().nodeGetProperty(id, propertyKeyId).asObject() } catch { - case e: exceptions.EntityNotFoundException => + case e: api.exceptions.EntityNotFoundException => if (isDeletedInThisTx(id)) throw new EntityNotFoundException(s"Node with id $id has been deleted in this transaction", e) else @@ -320,14 +321,14 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) override def hasProperty(id: Long, propertyKey: Int): Boolean = try { txContext.statement.readOperations().nodeHasProperty(id, propertyKey) } catch { - case _: exceptions.EntityNotFoundException => false + case _: api.exceptions.EntityNotFoundException => false } override def removeProperty(id: Long, propertyKeyId: Int): Unit = { try { txContext.statement.dataWriteOperations().nodeRemoveProperty(id, propertyKeyId) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } } @@ -335,7 +336,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) try { txContext.statement.dataWriteOperations().nodeSetProperty(id, propertyKeyId, Values.of(value) ) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } } @@ -372,20 +373,20 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) try { txContext.statement.dataWriteOperations().relationshipDelete(obj.getId) } catch { - case _: exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... } } override def propertyKeyIds(id: Long): Iterator[Int] = try { JavaConversionSupport.asScalaENFXSafe(txContext.statement.readOperations().relationshipGetPropertyKeys(id)) } catch { - case _: exceptions.EntityNotFoundException => Iterator.empty + case _: api.exceptions.EntityNotFoundException => Iterator.empty } override def getProperty(id: Long, propertyKeyId: Int): Any = try { txContext.statement.readOperations().relationshipGetProperty(id, propertyKeyId).asObject() } catch { - case e: exceptions.EntityNotFoundException => + case e: api.exceptions.EntityNotFoundException => if (isDeletedInThisTx(id)) throw new EntityNotFoundException(s"Relationship with id $id has been deleted in this transaction", e) else @@ -395,14 +396,14 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) override def hasProperty(id: Long, propertyKey: Int): Boolean = try { txContext.statement.readOperations().relationshipHasProperty(id, propertyKey) } catch { - case _: exceptions.EntityNotFoundException => false + case _: api.exceptions.EntityNotFoundException => false } override def removeProperty(id: Long, propertyKeyId: Int): Unit = { try { txContext.statement.dataWriteOperations().relationshipRemoveProperty(id, propertyKeyId) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } } @@ -410,7 +411,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) try { txContext.statement.dataWriteOperations().relationshipSetProperty(id, propertyKeyId, Values.of(value) ) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } } @@ -419,7 +420,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) txContext.statement.readOperations().relationshipCursorById(id) entityAccessor.newRelationshipProxy(id) } catch { - case e: exceptions.EntityNotFoundException => + case e: api.exceptions.EntityNotFoundException => throw new EntityNotFoundException(s"Relationship with id $id", e) } @@ -706,7 +707,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper) try { txContext.statement.dataWriteOperations().nodeDetachDelete(node.getId) } catch { - case _: exceptions.EntityNotFoundException => 0 // node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => 0 // node has been deleted by another transaction, oh well... } } diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/CompiledExpandUtilsTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/CompiledExpandUtilsTest.java index 68d15fba8e490..e3fc0cfcbfbf8 100644 --- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/CompiledExpandUtilsTest.java +++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/CompiledExpandUtilsTest.java @@ -25,8 +25,8 @@ import org.neo4j.internal.kernel.api.CursorFactory; import org.neo4j.internal.kernel.api.NodeCursor; import org.neo4j.internal.kernel.api.Read; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.ReadOperations; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledCursorUtilsTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledCursorUtilsTest.scala index 1dd009c8830ad..59a843afced98 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledCursorUtilsTest.scala +++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/codegen/CompiledCursorUtilsTest.scala @@ -22,8 +22,8 @@ package org.neo4j.cypher.internal.codegen import org.mockito.Mockito.when import org.neo4j.cypher.internal.codegen.CompiledCursorUtils.{nodeGetProperty, nodeHasLabel, relationshipGetProperty} import org.neo4j.cypher.internal.util.v3_4.test_helpers.CypherFunSuite +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException import org.neo4j.internal.kernel.api.{NodeCursor, PropertyCursor, Read, RelationshipScanCursor} -import org.neo4j.kernel.api.exceptions.EntityNotFoundException import org.neo4j.kernel.impl.newapi.Labels import org.neo4j.values.storable.Values.{NO_VALUE, stringValue} diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/JavaConversionSupport.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/JavaConversionSupport.scala index 41880a9c5b182..79356cf1b972e 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/JavaConversionSupport.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/JavaConversionSupport.scala @@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.runtime.interpreted import org.neo4j.collection.primitive.{PrimitiveIntIterator, PrimitiveLongIterator} import org.neo4j.cypher.internal.util.v3_4.EntityNotFoundException -import org.neo4j.kernel.api +import org.neo4j.internal.kernel.api.exceptions object JavaConversionSupport { @@ -45,7 +45,7 @@ object JavaConversionSupport { try { _next = Some(f(more())) } catch { - case _: api.exceptions.EntityNotFoundException => // IGNORE + case _: exceptions.EntityNotFoundException => // IGNORE case _: EntityNotFoundException => // IGNORE } } diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala index 52ea929616db5..1ef67cf7a7285 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContext.scala @@ -41,10 +41,12 @@ import org.neo4j.graphalgo.impl.path.ShortestPath.ShortestPathPredicate import org.neo4j.graphdb._ import org.neo4j.graphdb.security.URLAccessValidationError import org.neo4j.graphdb.traversal.{Evaluators, TraversalDescription, Uniqueness} +import org.neo4j.internal.kernel.api import org.neo4j.internal.kernel.api._ import org.neo4j.internal.kernel.api.helpers.RelationshipSelections.{allCursor, incomingCursor, outgoingCursor} import org.neo4j.internal.kernel.api.helpers._ import org.neo4j.kernel.GraphDatabaseQueryService +import org.neo4j.kernel.api._ import org.neo4j.kernel.api.exceptions.ProcedureException import org.neo4j.kernel.api.exceptions.schema.{AlreadyConstrainedException, AlreadyIndexedException} import org.neo4j.kernel.api.proc.CallableUserAggregationFunction.Aggregator @@ -52,7 +54,6 @@ import org.neo4j.kernel.api.proc.{QualifiedName => KernelQualifiedName} import org.neo4j.kernel.api.schema.SchemaDescriptorFactory import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory -import org.neo4j.kernel.api.{exceptions, _} import org.neo4j.kernel.guard.TerminationGuard import org.neo4j.kernel.impl.api.RelationshipVisitor import org.neo4j.kernel.impl.api.operations.KeyReadOperations @@ -505,7 +506,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona try { writes().nodeDelete(id) } catch { - case _: exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... } } @@ -559,7 +560,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona try { writes().nodeRemoveProperty(id, propertyKeyId) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } } @@ -567,7 +568,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona try { writes().nodeSetProperty(id, propertyKeyId, value) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } } @@ -633,7 +634,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona try { writes().relationshipDelete(id) } catch { - case _: exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => // node has been deleted by another transaction, oh well... } } @@ -687,7 +688,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona try { writes().relationshipRemoveProperty(id, propertyKeyId) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } } @@ -695,7 +696,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona try { writes().relationshipSetProperty(id, propertyKeyId, value) } catch { - case _: exceptions.EntityNotFoundException => //ignore + case _: api.exceptions.EntityNotFoundException => //ignore } } @@ -1059,7 +1060,7 @@ sealed class TransactionBoundQueryContext(val transactionalContext: Transactiona try { transactionalContext.statement.dataWriteOperations().nodeDetachDelete(node) } catch { - case _: exceptions.EntityNotFoundException => 0 // node has been deleted by another transaction, oh well... + case _: api.exceptions.EntityNotFoundException => 0 // node has been deleted by another transaction, oh well... } } diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Write.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Write.java index 3da01654dc72a..284e6e7993f8e 100644 --- a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Write.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/Write.java @@ -19,6 +19,7 @@ */ package org.neo4j.internal.kernel.api; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; @@ -40,7 +41,7 @@ public interface Write * @param node the internal id of the node to delete * @return returns true if it deleted a node or false if no node was found for this id */ - boolean nodeDelete( long node ) throws AutoIndexingKernelException; + boolean nodeDelete( long node ) throws AutoIndexingKernelException, EntityNotFoundException; /** * Create a relationship between two nodes. @@ -49,13 +50,13 @@ public interface Write * @param targetNode the target internal node id * @return the internal id of the created relationship */ - long relationshipCreate( long sourceNode, int relationshipType, long targetNode ) throws KernelException; + long relationshipCreate( long sourceNode, int relationshipType, long targetNode ) throws EntityNotFoundException; /** * Delete a relationship * @param relationship the internal id of the relationship to delete */ - boolean relationshipDelete( long relationship ) throws AutoIndexingKernelException; + boolean relationshipDelete( long relationship ) throws AutoIndexingKernelException, EntityNotFoundException;; /** * Add a label to a node @@ -72,7 +73,7 @@ public interface Write * @param nodeLabel the internal id of the label to remove * @return {@code true} if node was removed otherwise {@code false} */ - boolean nodeRemoveLabel( long node, int nodeLabel ) throws KernelException; + boolean nodeRemoveLabel( long node, int nodeLabel ) throws EntityNotFoundException; /** * Set a property on a node @@ -90,7 +91,7 @@ Value nodeSetProperty( long node, int propertyKey, Value value ) * @param propertyKey the property key id * @return The removed value, or Values.NO_VALUE if the node did not have the property before */ - Value nodeRemoveProperty( long node, int propertyKey ) throws KernelException; + Value nodeRemoveProperty( long node, int propertyKey ) throws EntityNotFoundException, AutoIndexingKernelException; /** * Set a property on a relationship @@ -99,7 +100,7 @@ Value nodeSetProperty( long node, int propertyKey, Value value ) * @param value the value to set * @return The replaced value, or Values.NO_VALUE if the relationship did not have the property before */ - Value relationshipSetProperty( long relationship, int propertyKey, Value value ) throws KernelException; + Value relationshipSetProperty( long relationship, int propertyKey, Value value ) throws EntityNotFoundException, AutoIndexingKernelException; /** * Remove a property from a relationship @@ -107,7 +108,7 @@ Value nodeSetProperty( long node, int propertyKey, Value value ) * @param propertyKey the property key id * @return The removed value, or Values.NO_VALUE if the relationship did not have the property before */ - Value relationshipRemoveProperty( long relationship, int propertyKey ) throws KernelException; + Value relationshipRemoveProperty( long relationship, int propertyKey ) throws EntityNotFoundException, AutoIndexingKernelException; /** * Set a property on the graph diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/EntityNotFoundException.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/EntityNotFoundException.java similarity index 94% rename from community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/EntityNotFoundException.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/EntityNotFoundException.java index eebbedd831198..e611d0dd58b58 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/EntityNotFoundException.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/exceptions/EntityNotFoundException.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; import org.neo4j.storageengine.api.EntityType; public class EntityNotFoundException extends KernelException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/DataWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/DataWriteOperations.java index a24ccbe6e5d7e..04ef05e68f8ed 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/DataWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/DataWriteOperations.java @@ -20,12 +20,12 @@ package org.neo4j.kernel.api; import org.neo4j.internal.kernel.api.ExplicitIndexWrite; +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.explicitindex.AutoIndexingKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.values.storable.Value; public interface DataWriteOperations extends ExplicitIndexWrite 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 523ae4beb2e02..7647451e25683 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,13 +32,13 @@ import org.neo4j.graphdb.Direction; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; 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.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/PropertyAccessor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/PropertyAccessor.java index f8911c6557695..b82919dda5f71 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/PropertyAccessor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/PropertyAccessor.java @@ -19,7 +19,7 @@ */ package org.neo4j.kernel.api.index; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.values.storable.Value; /** diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/RelationshipChangeVisitorAdapter.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/RelationshipChangeVisitorAdapter.java index 882c104bca5e1..24a80833d9948 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/RelationshipChangeVisitorAdapter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/RelationshipChangeVisitorAdapter.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.api.txstate; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.storageengine.api.StoreReadLayer; import org.neo4j.storageengine.api.txstate.DiffSetsVisitor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionCountingStateVisitor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionCountingStateVisitor.java index 23c2048a5a849..4f92ae8e534f8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionCountingStateVisitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionCountingStateVisitor.java @@ -24,8 +24,8 @@ import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.collection.primitive.PrimitiveIntVisitor; import org.neo4j.cursor.Cursor; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.CountsRecordState; import org.neo4j.kernel.impl.api.RelationshipDataExtractor; import org.neo4j.storageengine.api.NodeItem; 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 6958fd79152a0..765ef562fcae7 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 @@ -33,6 +33,7 @@ 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.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException; @@ -42,7 +43,6 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.StatementConstants; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; 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/api/LockingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java index 8dd2478154f4e..73192c78e3973 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LockingStatementOperations.java @@ -26,6 +26,7 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.InternalIndexState; +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.explicitindex.AutoIndexingKernelException; @@ -35,7 +36,6 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LookupFilter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LookupFilter.java index 808de5519f2f6..75cbcf69f1950 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LookupFilter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/LookupFilter.java @@ -27,7 +27,7 @@ import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.cursor.Cursor; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.impl.api.operations.EntityOperations; import org.neo4j.storageengine.api.NodeItem; 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 5cc5e11796295..871024866254c 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 @@ -36,6 +36,7 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; +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.LabelNotFoundKernelException; @@ -62,7 +63,6 @@ import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.StatementConstants; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; 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 a9ce8cef8139a..d9394eae5002f 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 @@ -32,6 +32,7 @@ import org.neo4j.graphdb.NotFoundException; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; @@ -48,7 +49,6 @@ import org.neo4j.kernel.api.ExplicitIndex; import org.neo4j.kernel.api.ExplicitIndexHits; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; 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/TwoPhaseNodeForRelationshipLocking.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TwoPhaseNodeForRelationshipLocking.java index 3dfec85dac20f..daed1090713e4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TwoPhaseNodeForRelationshipLocking.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/TwoPhaseNodeForRelationshipLocking.java @@ -26,8 +26,8 @@ import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.cursor.Cursor; import org.neo4j.function.ThrowingConsumer; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.KernelException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; import org.neo4j.kernel.impl.locking.ResourceTypes; import org.neo4j.storageengine.api.Direction; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexStoreView.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexStoreView.java index ae5ca78359c1f..2f755ce366e09 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexStoreView.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexStoreView.java @@ -23,7 +23,6 @@ import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.helpers.collection.Visitor; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java index 1b50b0e75a798..22a22b4a39d5d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityReadOperations.java @@ -25,8 +25,8 @@ import org.neo4j.collection.primitive.PrimitiveLongResourceIterator; import org.neo4j.cursor.Cursor; import org.neo4j.internal.kernel.api.IndexQuery; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.StatementConstants; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; 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/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityWriteOperations.java index b28e407ea3406..b2fdd55d841c1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/EntityWriteOperations.java @@ -19,11 +19,11 @@ */ package org.neo4j.kernel.impl.api.operations; +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.explicitindex.AutoIndexingKernelException; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/ExplicitIndexWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/ExplicitIndexWriteOperations.java index 7f9c67f2fc209..565a8268cd929 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/ExplicitIndexWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/ExplicitIndexWriteOperations.java @@ -21,8 +21,8 @@ import java.util.Map; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.KernelStatement; public interface ExplicitIndexWriteOperations diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java index 07284dfa13603..2f6dce8697c6e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdater.java @@ -26,7 +26,6 @@ import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.cursor.Cursor; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeLoadingIterator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeLoadingIterator.java index b1f011da788b5..82087fe1f13d8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeLoadingIterator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeLoadingIterator.java @@ -23,7 +23,7 @@ import org.neo4j.cursor.Cursor; import org.neo4j.function.ThrowingLongFunction; import org.neo4j.helpers.collection.PrefetchingIterator; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.storageengine.api.NodeItem; public class NodeLoadingIterator extends PrefetchingIterator> 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 db9a3420931ab..87f41f6e1f782 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,18 +33,18 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.InternalIndexState; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.AssertOpen; import org.neo4j.kernel.api.ReadOperations; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; 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.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/NodeProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeProxy.java index 6b0816f3f1248..6fc8850414e14 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 @@ -43,6 +43,7 @@ import org.neo4j.internal.kernel.api.NodeCursor; import org.neo4j.internal.kernel.api.PropertyCursor; import org.neo4j.internal.kernel.api.TokenRead; +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.LabelNotFoundKernelException; @@ -53,9 +54,8 @@ import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.ReadOperations; -import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.SilentTokenNameLookup; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; @@ -119,6 +119,11 @@ public void delete() throw new IllegalStateException( "Auto indexing encountered a failure while deleting the node: " + e.getMessage(), e ); } + catch ( EntityNotFoundException e ) + { + throw new NotFoundException( "Unable to delete node[" + + getId() + "] since it is already deleted." ); + } } @Override @@ -617,10 +622,6 @@ public void removeLabel( Label label ) transaction.dataWrite().nodeRemoveLabel( getId(), labelId ); } } - catch ( LabelNotFoundKernelException e ) - { - //just ignore - } catch ( EntityNotFoundException e ) { throw new NotFoundException( "No node with id " + getId() + " found.", e ); 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 3464683245f11..0711b062816cb 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 @@ -38,16 +38,14 @@ import org.neo4j.internal.kernel.api.PropertyCursor; import org.neo4j.internal.kernel.api.RelationshipScanCursor; import org.neo4j.internal.kernel.api.TokenRead; +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.schema.ConstraintValidationException; import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.SilentTokenNameLookup; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; @@ -155,6 +153,11 @@ public void delete() throw new IllegalStateException( "Auto indexing encountered a failure while deleting the relationship: " + e.getMessage(), e ); } + catch ( EntityNotFoundException e ) + { + throw new NotFoundException( "Unable to delete relationship[" + + getId() + "] since it is already deleted." ); + } } @Override @@ -432,11 +435,6 @@ public void setProperty( String key, Object value ) { transaction.dataWrite().relationshipSetProperty( id, propertyKeyId, Values.of( value, false ) ); } - catch ( ConstraintValidationException e ) - { - throw new ConstraintViolationException( - e.getUserMessage( new SilentTokenNameLookup( transaction.tokenRead() ) ), e ); - } catch ( IllegalArgumentException e ) { // Trying to set an illegal value is a critical error - fail this transaction diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/ExplicitIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/ExplicitIndexProxy.java index 2f1182ab9470c..47dc44dea2e22 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/ExplicitIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/ExplicitIndexProxy.java @@ -29,13 +29,13 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.IndexHits; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.ExplicitIndexHits; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.explicitindex.AbstractIndexHits; 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 c74b24eea299e..632a10affe0bd 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 @@ -35,10 +35,10 @@ import org.neo4j.graphdb.event.PropertyEntry; 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.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; import org.neo4j.kernel.api.KernelTransaction; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.KernelTransactionImplementation; import org.neo4j.kernel.impl.core.EmbeddedProxySPI; import org.neo4j.kernel.impl.core.NodeProxy; 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 6cfa0470befcc..5efa00c42972c 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 @@ -64,6 +64,7 @@ import org.neo4j.internal.kernel.api.RelationshipScanCursor; import org.neo4j.internal.kernel.api.TokenRead; import org.neo4j.internal.kernel.api.Write; +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.schema.ConstraintValidationException; @@ -73,7 +74,6 @@ import org.neo4j.kernel.GraphDatabaseQueryService; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.configuration.Config; 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 5df90599893fd..68e340961be6c 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 @@ -35,6 +35,7 @@ import org.neo4j.internal.kernel.api.SchemaRead; import org.neo4j.internal.kernel.api.Token; import org.neo4j.internal.kernel.api.Write; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException; @@ -42,7 +43,6 @@ import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.StatementConstants; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; @@ -171,7 +171,7 @@ public long relationshipCreate( long sourceNode, int relationshipType, long targ } @Override - public boolean relationshipDelete( long relationship ) throws AutoIndexingKernelException + public boolean relationshipDelete( long relationship ) throws AutoIndexingKernelException, EntityNotFoundException { ktx.assertOpen(); @@ -360,7 +360,8 @@ public boolean nodeRemoveLabel( long node, int nodeLabel ) throws EntityNotFound @Override public Value nodeSetProperty( long node, int propertyKey, Value value ) - throws KernelException + throws EntityNotFoundException, ConstraintValidationException, AutoIndexingKernelException + { acquireExclusiveNodeLock( node ); ktx.assertOpen(); @@ -433,7 +434,8 @@ public Value nodeRemoveProperty( long node, int propertyKey ) } @Override - public Value relationshipSetProperty( long relationship, int propertyKey, Value value ) throws KernelException + public Value relationshipSetProperty( long relationship, int propertyKey, Value value ) + throws EntityNotFoundException, AutoIndexingKernelException { acquireExclusiveRelationshipLock( relationship ); ktx.assertOpen(); @@ -459,7 +461,8 @@ public Value relationshipSetProperty( long relationship, int propertyKey, Value } @Override - public Value relationshipRemoveProperty( long relationship, int propertyKey ) throws KernelException + public Value relationshipRemoveProperty( long relationship, int propertyKey ) + throws EntityNotFoundException, AutoIndexingKernelException { acquireExclusiveRelationshipLock( relationship ); ktx.assertOpen(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/DynamicIndexStoreView.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/DynamicIndexStoreView.java index d8a3476c42073..72941ae659bce 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/DynamicIndexStoreView.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/DynamicIndexStoreView.java @@ -25,7 +25,7 @@ import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.helpers.collection.Visitor; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.impl.api.index.IndexStoreView; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreView.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreView.java index 6fad2e91c6910..a5f5e58223023 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreView.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreView.java @@ -23,7 +23,7 @@ import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.helpers.collection.Visitor; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.impl.api.CountsAccessor; import org.neo4j.kernel.impl.api.index.IndexStoreView; 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 ab0132ebf20d2..d68adfca185e7 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 @@ -30,17 +30,17 @@ import org.neo4j.cursor.Cursor; import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.InternalIndexState; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; +import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.AssertOpen; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; 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.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/api/CompositeIndexingIT.java b/community/kernel/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java index 7201f3e5e974e..ad91c5ffd1570 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/CompositeIndexingIT.java @@ -39,10 +39,10 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/NodePropertyAccessor.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/NodePropertyAccessor.java index 9fbfe4204209c..0efafb6eb005e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/NodePropertyAccessor.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/NodePropertyAccessor.java @@ -23,7 +23,6 @@ import java.util.Map; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java index 6459c3d3734f1..1876b9e9f232f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/LockingStatementOperationsTest.java @@ -26,6 +26,7 @@ import java.util.Optional; import org.neo4j.helpers.collection.Iterators; +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.explicitindex.AutoIndexingKernelException; @@ -33,7 +34,6 @@ import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracer; import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TwoPhaseNodeForRelationshipLockingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TwoPhaseNodeForRelationshipLockingTest.java index 4b88b4d8b507b..3b0ea1d404ff6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TwoPhaseNodeForRelationshipLockingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/TwoPhaseNodeForRelationshipLockingTest.java @@ -30,8 +30,8 @@ import org.neo4j.cursor.Cursor; import org.neo4j.function.ThrowingConsumer; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.KernelException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; import org.neo4j.kernel.impl.locking.LockTracer; import org.neo4j.kernel.impl.locking.Locks; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java index 53db5f6035ccd..c4cf176a0cb1d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexStatisticsTest.java @@ -46,10 +46,10 @@ import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; 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/inmemory/UniqueInMemoryIndex.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java index e7d48070ef607..2015372e4c1c0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java @@ -19,13 +19,12 @@ */ package org.neo4j.kernel.impl.api.index.inmemory; -import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Set; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; 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 a92409be75f38..9d9f009fc7e6b 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 @@ -37,6 +37,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.TransactionFailureException; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; @@ -44,7 +45,6 @@ import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.Statement; 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.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java index f92475bb8b54a..35ce011f5daab 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java @@ -24,10 +24,10 @@ import java.util.Collections; import java.util.Iterator; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.storageengine.api.Token; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java index 1ae3528991685..31a5a7acb3e1f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/LabelTransactionStateTest.java @@ -31,8 +31,8 @@ import org.neo4j.collection.primitive.PrimitiveIntCollections; import org.neo4j.collection.primitive.PrimitiveLongCollections; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.AssertOpen; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java index d61d03e89ec64..e0480bc041ba9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeLoadingIteratorTest.java @@ -29,7 +29,7 @@ import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.cursor.Cursor; import org.neo4j.function.ThrowingLongFunction; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.storageengine.api.EntityType; import org.neo4j.storageengine.api.NodeItem; 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 101547d2d106d..3f23ec3d13dc0 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 @@ -45,6 +45,7 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.mockfs.UncloseableDelegatingFileSystemAbstraction; import org.neo4j.helpers.collection.Pair; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.OpenMode; import org.neo4j.io.fs.StoreChannel; @@ -53,7 +54,6 @@ 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.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.properties.PropertyKeyValue; import org.neo4j.kernel.api.txstate.TransactionState; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java index 4aa3fecaa1a7e..d06d1d2bf82d6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/storeview/NeoStoreIndexStoreViewTest.java @@ -36,10 +36,10 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Visitor; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; 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 449ed910d0742..fcb3dd0a6feef 100644 --- a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java +++ b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java @@ -47,6 +47,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.internal.kernel.api.IndexQuery; import org.neo4j.internal.kernel.api.InternalIndexState; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; 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; @@ -62,7 +63,6 @@ import org.neo4j.kernel.api.ResourceTracker; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.dbms.DbmsOperations; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.exceptions.RelationshipTypeIdNotFoundKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/codegen/Templates.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/codegen/Templates.scala index fc10be8bff676..89c3ea68ef416 100644 --- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/codegen/Templates.scala +++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_4/codegen/Templates.scala @@ -38,8 +38,7 @@ import org.neo4j.cypher.internal.util.v3_4.{CypherExecutionException, TaskCloser import org.neo4j.cypher.internal.v3_4.codegen.QueryExecutionTracer import org.neo4j.graphdb.Direction import org.neo4j.internal.kernel.api._ -import org.neo4j.internal.kernel.api.exceptions.KernelException -import org.neo4j.kernel.api.exceptions.EntityNotFoundException +import org.neo4j.internal.kernel.api.exceptions.{EntityNotFoundException, KernelException} import org.neo4j.kernel.api.{ReadOperations, StatementTokenNameLookup} import org.neo4j.kernel.impl.api.RelationshipDataExtractor import org.neo4j.kernel.impl.core.EmbeddedProxySPI diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/ClusterLocksIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/ClusterLocksIT.java index 0aa7e52126fdf..b4e8d0c5ae2ab 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/ClusterLocksIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/lock/ClusterLocksIT.java @@ -34,8 +34,8 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.TransactionTerminatedException; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.internal.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.DeadlockDetectedException; -import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.ha.HaSettings; import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase; import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;