diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java index 38b2c13a09640..6d1d34214952a 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/SchemaRecordCheck.java @@ -25,10 +25,10 @@ import org.neo4j.consistency.checking.index.IndexAccessors; import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.store.RecordAccess; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaProcessor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaProcessor; import org.neo4j.kernel.impl.store.SchemaRuleAccess; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/MandatoryProperties.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/MandatoryProperties.java index a01e59877ce7b..6ca6348acc1da 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/MandatoryProperties.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/MandatoryProperties.java @@ -29,9 +29,9 @@ import org.neo4j.consistency.RecordType; import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.report.ConsistencyReporter; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaProcessor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaProcessor; import org.neo4j.kernel.impl.store.SchemaStorage; import org.neo4j.kernel.impl.store.StoreAccess; import org.neo4j.kernel.impl.store.record.ConstraintRule; diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java index 233a39b4eb045..a98ef3ce2a5f7 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java @@ -35,9 +35,9 @@ import org.neo4j.consistency.checking.index.IndexAccessors; import org.neo4j.consistency.report.ConsistencyReport; import org.neo4j.consistency.store.RecordAccess; -import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.impl.api.LookupFilter; import org.neo4j.kernel.impl.store.record.IndexRule; import org.neo4j.kernel.impl.store.record.NodeRecord; diff --git a/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java b/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java index 99b76d9d0eb86..1342d5bbf1106 100644 --- a/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java +++ b/community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java @@ -52,9 +52,9 @@ import org.neo4j.consistency.store.synthetic.CountsEntry; import org.neo4j.consistency.store.synthetic.IndexEntry; import org.neo4j.consistency.store.synthetic.LabelScanDocument; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.labelscan.NodeLabelRange; -import org.neo4j.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.store.record.AbstractBaseRecord; import org.neo4j.kernel.impl.store.record.DynamicRecord; diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/SchemaDescriptorTranslation.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/SchemaDescriptorTranslation.scala index bf47df818df46..02dccaa126bc1 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/SchemaDescriptorTranslation.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/SchemaDescriptorTranslation.scala @@ -20,7 +20,7 @@ package org.neo4j.cypher.internal.spi.v3_1 import org.neo4j.cypher.internal.compiler.v3_1.spi.SchemaTypes -import org.neo4j.kernel.api.schema.SchemaDescriptor +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor import org.neo4j.kernel.api.schema.constaints.{ConstraintDescriptorFactory, NodeExistenceConstraintDescriptor, RelExistenceConstraintDescriptor, UniquenessConstraintDescriptor => KernelUniquenessConstraint} import org.neo4j.kernel.api.schema.index.{IndexDescriptorFactory, IndexDescriptor => KernelIndexDescriptor} diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/LabelSchemaDescriptor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/LabelSchemaDescriptor.java new file mode 100644 index 0000000000000..09af13b9181de --- /dev/null +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/LabelSchemaDescriptor.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2002-2017 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.neo4j.internal.kernel.api.schema; + +public interface LabelSchemaDescriptor extends SchemaDescriptor, LabelSchemaSupplier +{ + int getLabelId(); + + int getPropertyId(); +} diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/LabelSchemaSupplier.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/LabelSchemaSupplier.java similarity index 95% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/LabelSchemaSupplier.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/LabelSchemaSupplier.java index f45f1feb0728b..f9983e5d2d504 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/LabelSchemaSupplier.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/LabelSchemaSupplier.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema; +package org.neo4j.internal.kernel.api.schema; public interface LabelSchemaSupplier extends SchemaDescriptor.Supplier { diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/RelationTypeSchemaDescriptor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/RelationTypeSchemaDescriptor.java new file mode 100644 index 0000000000000..b96af5e0787ef --- /dev/null +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/RelationTypeSchemaDescriptor.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2002-2017 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.neo4j.internal.kernel.api.schema; + +public interface RelationTypeSchemaDescriptor extends SchemaDescriptor +{ + int getRelTypeId(); + + int getPropertyId(); +} diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaComputer.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaComputer.java similarity index 97% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaComputer.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaComputer.java index f3e6779922f15..92405903b3b55 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaComputer.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaComputer.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema; +package org.neo4j.internal.kernel.api.schema; /** * A SchemaComputer computes values of type R from SchemaDescriptors. To get the concrete type of the target schema diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaDescriptor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaDescriptor.java similarity index 91% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaDescriptor.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaDescriptor.java index e8cf49c02c08f..1a57b6a27833b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaDescriptor.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaDescriptor.java @@ -17,12 +17,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema; +package org.neo4j.internal.kernel.api.schema; import java.util.function.Predicate; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.impl.locking.ResourceTypes; import org.neo4j.storageengine.api.lock.ResourceType; /** @@ -76,8 +75,6 @@ public interface SchemaDescriptor /** * Id of underlying schema descriptor key. * Key is part of schema unit that determines which resources with specified properties are applicable. - * So far {@link ResourceTypes#LABEL label} and {@link ResourceTypes#RELATIONSHIP_TYPE relationship type} - * are supported as keys types. * @return id of underlying key */ int keyId(); @@ -85,8 +82,6 @@ public interface SchemaDescriptor /** * Type of underlying schema descriptor key. * Key is part of schema unit that determines which resources with specified properties are applicable. - * So far {@link ResourceTypes#LABEL label} and {@link ResourceTypes#RELATIONSHIP_TYPE relationship type} - * are supported as keys types. * @return type of underlying key */ ResourceType keyType(); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaDescriptorPredicates.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaDescriptorPredicates.java similarity index 98% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaDescriptorPredicates.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaDescriptorPredicates.java index ad1f1cc25fe48..0a2557eaf584c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaDescriptorPredicates.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaDescriptorPredicates.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema; +package org.neo4j.internal.kernel.api.schema; import java.util.Optional; import java.util.function.Predicate; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaProcessor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaProcessor.java similarity index 96% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaProcessor.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaProcessor.java index d8c02638d09fe..925f659871f3b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaProcessor.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaProcessor.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema; +package org.neo4j.internal.kernel.api.schema; /** * A SchemaProcessor performs from side-effect processing on a SchemaDescriptor. To get the concrete type of the diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaUtil.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaUtil.java similarity index 98% rename from community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaUtil.java rename to community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaUtil.java index fd104cb57afd2..fc1e3b1834943 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/SchemaUtil.java +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/SchemaUtil.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.schema; +package org.neo4j.internal.kernel.api.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; diff --git a/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/constraints/ConstraintDescriptor.java b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/constraints/ConstraintDescriptor.java new file mode 100644 index 0000000000000..5e7852fe7bf64 --- /dev/null +++ b/community/kernel-api/src/main/java/org/neo4j/internal/kernel/api/schema/constraints/ConstraintDescriptor.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2002-2017 "Neo Technology," + * Network Engine for Objects in Lund AB [http://neotechnology.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.neo4j.internal.kernel.api.schema.constraints; + +import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; + +public interface ConstraintDescriptor extends SchemaDescriptor.Supplier +{ + enum Type + { + UNIQUE( true, false ), + EXISTS( false, true ), + UNIQUE_EXISTS( true, true ); + + private final boolean isUnique; + private final boolean mustExist; + + Type( boolean isUnique, boolean mustExist ) + { + this.isUnique = isUnique; + this.mustExist = mustExist; + } + + public boolean enforcesUniqueness() + { + return isUnique; + } + + public boolean enforcesPropertyExistence() + { + return mustExist; + } + } + + SchemaDescriptor schema(); + + Type type(); + + boolean enforcesUniqueness(); + + boolean enforcesPropertyExistence(); + + String userDescription( TokenNameLookup tokenNameLookup ); + + /** + * Checks whether a constraint descriptor Supplier supplies this constraint descriptor. + * @param supplier supplier to get a constraint descriptor from + * @return true if the supplied constraint descriptor equals this constraint descriptor + */ + boolean isSame( Supplier supplier ); + + interface Supplier + { + ConstraintDescriptor getConstraintDescriptor(); + } + + String prettyPrint( TokenNameLookup tokenNameLookup ); +} diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java similarity index 100% rename from community/kernel/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java rename to community/kernel-api/src/main/java/org/neo4j/storageengine/api/lock/ResourceType.java diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java b/community/kernel-api/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java similarity index 100% rename from community/kernel/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java rename to community/kernel-api/src/main/java/org/neo4j/storageengine/api/lock/WaitStrategy.java 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 70cfb1b9f38d2..67e76f5006ac8 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 @@ -34,6 +34,9 @@ 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; @@ -46,9 +49,6 @@ import org.neo4j.kernel.api.proc.ProcedureSignature; import org.neo4j.kernel.api.proc.QualifiedName; import org.neo4j.kernel.api.proc.UserFunctionSignature; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.operations.KeyReadOperations; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/SchemaWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/api/SchemaWriteOperations.java index 00a9a1cedeead..67135e663150e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/SchemaWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/SchemaWriteOperations.java @@ -19,15 +19,15 @@ */ package org.neo4j.kernel.api; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java index 9bfd4d955ae50..726ed28c07663 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictException.java @@ -21,8 +21,8 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueTuple; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java index 2130f708f8b7a..dc3fe8baa8090 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/index/IndexPopulationFailedKernelException.java @@ -22,8 +22,8 @@ import java.util.Arrays; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; public class IndexPopulationFailedKernelException extends KernelException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java index 3ee2df4a56ba2..b3037ad1bdd7f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyConstrainedException.java @@ -20,9 +20,9 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java index e2a7eac94f387..7f4841a5e2a9f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/AlreadyIndexedException.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; public class AlreadyIndexedException extends SchemaKernelException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationException.java index f4176e52ef3b8..bf9145bfc0a5f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/ConstraintValidationException.java @@ -21,9 +21,9 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.SchemaUtil; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; /** * Constraint verification happens when a new constraint is created, and the database verifies that existing diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java index 3a8501f42baf0..3c2f237e46e20 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/CreateConstraintFailureException.java @@ -21,8 +21,8 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; public class CreateConstraintFailureException extends SchemaKernelException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java index ae388061442b4..a70e25c6b02cf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropConstraintFailureException.java @@ -21,8 +21,8 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; public class DropConstraintFailureException extends SchemaKernelException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java index 33d23e41bba03..38e4b9c3c2962 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DropIndexFailureException.java @@ -21,9 +21,9 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaUtil; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java index f6cd29943b7cf..4d86d2cdfd52d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateSchemaRuleException.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.api.exceptions.schema; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.SchemaDescriptor; import org.neo4j.storageengine.api.schema.SchemaRule; public class DuplicateSchemaRuleException extends SchemaRuleException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java index f9dc187f69189..8ec73d5bef17f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/IndexBelongsToConstraintException.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java index 2445a0efd3a99..1f73e73fdf4a7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchConstraintException.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java index 12f497f83384a..f57044d374b45 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NoSuchIndexException.java @@ -20,9 +20,9 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaUtil; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceException.java index 4ad8c3cae190d..71e64723af89f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/NodePropertyExistenceException.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceException.java index 6413016747a62..edd423adc722c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RelationshipPropertyExistenceException.java @@ -20,7 +20,7 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RepeatedPropertyInCompositeSchemaException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RepeatedPropertyInCompositeSchemaException.java index 07185e2f7be20..cc79fd4790578 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RepeatedPropertyInCompositeSchemaException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/RepeatedPropertyInCompositeSchemaException.java @@ -20,9 +20,9 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaUtil; public class RepeatedPropertyInCompositeSchemaException extends SchemaKernelException { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java index edc6d5b6f1e6a..faf9f49380e9a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java @@ -24,8 +24,8 @@ import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; /** * Signals that some constraint has been violated, for example a name containing invalid characters or length. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java index b3f8ed0ad44ef..221ae2bc419cb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleException.java @@ -20,9 +20,9 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaUtil; import org.neo4j.storageengine.api.schema.SchemaRule; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java index bd26b58ff3133..0920f281bd141 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaRuleNotFoundException.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.api.exceptions.schema; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.exceptions.Status; -import org.neo4j.kernel.api.schema.SchemaDescriptor; import org.neo4j.storageengine.api.schema.SchemaRule; public class SchemaRuleNotFoundException extends SchemaRuleException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintException.java index ad50162466409..ebe250634368c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UnableToValidateConstraintException.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.api.exceptions.schema; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.SchemaUtil; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyValueValidationException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyValueValidationException.java index a6e3c35cf08ec..0cdd47f89d55f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyValueValidationException.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/UniquePropertyValueValidationException.java @@ -24,8 +24,8 @@ import java.util.Set; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; public class UniquePropertyValueValidationException extends ConstraintValidationException diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexEntryUpdate.java b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexEntryUpdate.java index 7f081fb086350..b231101395d49 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexEntryUpdate.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexEntryUpdate.java @@ -21,8 +21,8 @@ import java.util.Arrays; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; -import org.neo4j.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.impl.api.index.UpdateMode; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/LabelSchemaDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/LabelSchemaDescriptor.java index 105343365aa42..7fcd9fdb9853e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/LabelSchemaDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/LabelSchemaDescriptor.java @@ -22,10 +22,13 @@ import java.util.Arrays; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.SchemaComputer; +import org.neo4j.internal.kernel.api.schema.SchemaProcessor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.impl.locking.ResourceTypes; import org.neo4j.storageengine.api.lock.ResourceType; -public class LabelSchemaDescriptor implements SchemaDescriptor, LabelSchemaSupplier +public class LabelSchemaDescriptor implements org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor { private final int labelId; private final int[] propertyIds; @@ -55,6 +58,7 @@ public String userDescription( TokenNameLookup tokenNameLookup ) SchemaUtil.niceProperties( tokenNameLookup, propertyIds ) ); } + @Override public int getLabelId() { return labelId; @@ -78,6 +82,7 @@ public int[] getPropertyIds() return propertyIds; } + @Override public int getPropertyId() { if ( propertyIds.length != 1 ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/RelationTypeSchemaDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/RelationTypeSchemaDescriptor.java index a47c1795075f9..078ab84420373 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/RelationTypeSchemaDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/RelationTypeSchemaDescriptor.java @@ -22,10 +22,13 @@ import java.util.Arrays; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.SchemaComputer; +import org.neo4j.internal.kernel.api.schema.SchemaProcessor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.impl.locking.ResourceTypes; import org.neo4j.storageengine.api.lock.ResourceType; -public class RelationTypeSchemaDescriptor implements SchemaDescriptor +public class RelationTypeSchemaDescriptor implements org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor { private final int relTypeId; private final int[] propertyIds; @@ -55,6 +58,7 @@ public String userDescription( TokenNameLookup tokenNameLookup ) SchemaUtil.niceProperties( tokenNameLookup, propertyIds ) ); } + @Override public int getRelTypeId() { return relTypeId; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/ConstraintDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/ConstraintDescriptor.java index f7487c8a55299..b04da4406f969 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/ConstraintDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/ConstraintDescriptor.java @@ -20,7 +20,6 @@ package org.neo4j.kernel.api.schema.constaints; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.SchemaDescriptor; import static java.lang.String.format; @@ -28,38 +27,8 @@ * Internal representation of a graph constraint, including the schema unit it targets (eg. label-property combination) * and the how that schema unit is constrained (eg. "has to exist", or "must be unique"). */ -public abstract class ConstraintDescriptor implements SchemaDescriptor.Supplier +public abstract class ConstraintDescriptor implements org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor { - public enum Type - { - UNIQUE( true, false ), - EXISTS( false, true ), - UNIQUE_EXISTS( true, true ); - - private final boolean isUnique; - private final boolean mustExist; - - Type( boolean isUnique, boolean mustExist ) - { - this.isUnique = isUnique; - this.mustExist = mustExist; - } - - private boolean enforcesUniqueness() - { - return isUnique; - } - - private boolean enforcesPropertyExistence() - { - return mustExist; - } - } - - public interface Supplier - { - ConstraintDescriptor getConstraintDescriptor(); - } private final ConstraintDescriptor.Type type; @@ -71,18 +40,18 @@ public interface Supplier // METHODS @Override - public abstract SchemaDescriptor schema(); - public Type type() { return type; } + @Override public boolean enforcesUniqueness() { return type.enforcesUniqueness(); } + @Override public boolean enforcesPropertyExistence() { return type.enforcesPropertyExistence(); @@ -92,16 +61,13 @@ public boolean enforcesPropertyExistence() * @param tokenNameLookup used for looking up names for token ids. * @return a user friendly description of this constraint. */ + @Override public String userDescription( TokenNameLookup tokenNameLookup ) { return format( "Constraint( %s, %s )", type.name(), schema().userDescription( tokenNameLookup ) ); } - /** - * Checks whether a constraint descriptor Supplier supplies this constraint descriptor. - * @param supplier supplier to get a constraint descriptor from - * @return true if the supplied constraint descriptor equals this constraint descriptor - */ + @Override public final boolean isSame( Supplier supplier ) { return this.equals( supplier.getConstraintDescriptor() ); @@ -124,10 +90,6 @@ public final int hashCode() return type.hashCode() & schema().hashCode(); } - // PRETTY PRINTING - - public abstract String prettyPrint( TokenNameLookup tokenNameLookup ); - String escapeLabelOrRelTyp( String name ) { if ( name.contains( ":" ) ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/ConstraintDescriptorFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/ConstraintDescriptorFactory.java index f811123611cae..5911bf084c85d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/ConstraintDescriptorFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/ConstraintDescriptorFactory.java @@ -19,12 +19,12 @@ */ package org.neo4j.kernel.api.schema.constaints; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaComputer; -import org.neo4j.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaComputer; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.SchemaUtil; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/IndexBackedConstraintDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/IndexBackedConstraintDescriptor.java index ccd5f8848e8a5..d3e39d251a178 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/IndexBackedConstraintDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/IndexBackedConstraintDescriptor.java @@ -20,9 +20,9 @@ package org.neo4j.kernel.api.schema.constaints; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; -import org.neo4j.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/NodeExistenceConstraintDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/NodeExistenceConstraintDescriptor.java index 003eda244c031..e27a763e4740f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/NodeExistenceConstraintDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/NodeExistenceConstraintDescriptor.java @@ -20,9 +20,9 @@ package org.neo4j.kernel.api.schema.constaints; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; -import org.neo4j.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; public class NodeExistenceConstraintDescriptor extends ConstraintDescriptor implements LabelSchemaSupplier { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/NodeKeyConstraintDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/NodeKeyConstraintDescriptor.java index 6a3677bd3e926..1e0c0879d7208 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/NodeKeyConstraintDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/NodeKeyConstraintDescriptor.java @@ -19,7 +19,8 @@ */ package org.neo4j.kernel.api.schema.constaints; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; + +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; public class NodeKeyConstraintDescriptor extends IndexBackedConstraintDescriptor { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/RelExistenceConstraintDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/RelExistenceConstraintDescriptor.java index 37b0a8841decd..bae13ec784951 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/RelExistenceConstraintDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/RelExistenceConstraintDescriptor.java @@ -20,7 +20,7 @@ package org.neo4j.kernel.api.schema.constaints; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; public class RelExistenceConstraintDescriptor extends ConstraintDescriptor { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/UniquenessConstraintDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/UniquenessConstraintDescriptor.java index a0aa5e4645f67..ad231e1a99ae0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/UniquenessConstraintDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/constaints/UniquenessConstraintDescriptor.java @@ -19,7 +19,8 @@ */ package org.neo4j.kernel.api.schema.constaints; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; + +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; public class UniquenessConstraintDescriptor extends IndexBackedConstraintDescriptor { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java index 7ce6b2a4cbf5e..f66b48af9401d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptor.java @@ -25,9 +25,9 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; -import org.neo4j.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import static java.lang.String.format; import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Filter.GENERAL; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java index 03e8446a6b3d7..2bf130f87c017 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/index/IndexDescriptorFactory.java @@ -19,7 +19,8 @@ */ package org.neo4j.kernel.api.schema.index; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; + +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import static org.neo4j.kernel.api.schema.index.IndexDescriptor.Type.GENERAL; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java index d8ff2201ba07f..9d07659ecefd1 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java @@ -19,8 +19,8 @@ */ package org.neo4j.kernel.api.txstate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.txstate.PropertyContainerState; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/SchemaProcedure.java b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/SchemaProcedure.java index 3d74268fd175c..63023e14e9ce6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/SchemaProcedure.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/builtinprocs/SchemaProcedure.java @@ -20,7 +20,6 @@ package org.neo4j.kernel.builtinprocs; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -39,11 +38,11 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.graphdb.Transaction; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.coreapi.schema.PropertyNameUtils; import org.neo4j.kernel.internal.GraphDatabaseAPI; 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 564969e43c8d8..d11850d08b36c 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 @@ -37,6 +37,10 @@ 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.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +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; @@ -52,10 +56,6 @@ import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; import org.neo4j.kernel.api.exceptions.schema.UnableToValidateConstraintException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; @@ -81,10 +81,10 @@ import org.neo4j.values.storable.Values; import static java.lang.String.format; +import static org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates.hasProperty; import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_NODE; import static org.neo4j.kernel.api.StatementConstants.NO_SUCH_PROPERTY_KEY; import static org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException.Phase.VALIDATION; -import static org.neo4j.kernel.api.schema.SchemaDescriptorPredicates.hasProperty; import static org.neo4j.kernel.impl.locking.ResourceTypes.INDEX_ENTRY; import static org.neo4j.kernel.impl.locking.ResourceTypes.indexEntryResourceId; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java index c0bf07008a17e..70f7b663a7986 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperations.java @@ -21,6 +21,10 @@ import java.util.Arrays; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +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.StatementTokenNameLookup; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; @@ -34,12 +38,7 @@ import org.neo4j.kernel.api.exceptions.schema.NoSuchIndexException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException.OperationContext; -import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; 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 b843b89c22cfc..023aef47d9c35 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 @@ -28,6 +28,10 @@ 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.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +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; @@ -41,10 +45,6 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; 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 ad05ebc5b82b8..780bf68ee3850 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 @@ -40,6 +40,10 @@ 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.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.internal.kernel.api.security.AccessMode; import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracer; @@ -78,10 +82,6 @@ import org.neo4j.kernel.api.proc.QualifiedName; import org.neo4j.kernel.api.proc.UserFunctionSignature; import org.neo4j.kernel.api.query.ExecutingQuery; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; 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 7cfdee556fdd3..8093be220b129 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 @@ -39,6 +39,11 @@ 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.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.ExplicitIndex; import org.neo4j.kernel.api.ExplicitIndexHits; @@ -61,11 +66,6 @@ import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.properties.PropertyKeyIdIterator; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaUtil; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java index 99a39666ed652..d7fa61405a991 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractDelegatingIndexProxy.java @@ -25,6 +25,7 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.IndexCapability; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexActivationFailedKernelException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; @@ -34,7 +35,6 @@ import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java index 60af3e30633c5..32a1c91eb673e 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/AbstractSwallowingIndexProxy.java @@ -22,9 +22,9 @@ import java.util.concurrent.Future; import org.neo4j.internal.kernel.api.IndexCapability; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java index a64f6a1e9f313..5a2c3994fd39a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/FlippableIndexProxy.java @@ -29,6 +29,7 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.IndexCapability; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.ExceptionDuringFlipKernelException; import org.neo4j.kernel.api.exceptions.index.FlipFailedKernelException; import org.neo4j.kernel.api.exceptions.index.IndexActivationFailedKernelException; @@ -41,7 +42,6 @@ import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.DelegatingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java index 864621c84abd1..00b425100f20c 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMap.java @@ -31,7 +31,7 @@ import org.neo4j.collection.primitive.PrimitiveIntCollection; import org.neo4j.collection.primitive.PrimitiveIntIterator; import org.neo4j.collection.primitive.PrimitiveIntObjectMap; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; /** * Bundles various mappings to IndexProxy. Used by IndexingService via IndexMapReference. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java index 3bbd48025c107..8b938b4737305 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexMapReference.java @@ -21,8 +21,8 @@ import org.neo4j.collection.primitive.PrimitiveIntCollection; import org.neo4j.function.ThrowingFunction; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; public class IndexMapReference implements IndexMapSnapshotProvider { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationFailure.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationFailure.java index 2a94f97329e91..849e1f0addbb7 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationFailure.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexPopulationFailure.java @@ -20,8 +20,8 @@ package org.neo4j.kernel.impl.api.index; import org.neo4j.helpers.Exceptions; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; public abstract class IndexPopulationFailure { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java index dfad76421974b..16eba9c9a8a17 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexProxy.java @@ -25,6 +25,8 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.IndexCapability; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.kernel.api.exceptions.index.IndexActivationFailedKernelException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; @@ -36,8 +38,6 @@ import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java index 2d5236f5202b9..f4ea749250314 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java @@ -28,9 +28,9 @@ import org.neo4j.helpers.collection.Pair; import org.neo4j.helpers.collection.PrefetchingIterator; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.store.MultipleUnderlyingStorageExceptions; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java index ce223b91e468a..f4d19e0657c2b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java @@ -38,6 +38,7 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexActivationFailedKernelException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; @@ -48,7 +49,6 @@ import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.SchemaState; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingController; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingUpdateService.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingUpdateService.java index e48de7bb39107..e0bd063dbe311 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingUpdateService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingUpdateService.java @@ -21,9 +21,9 @@ import java.io.IOException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.transaction.state.IndexUpdates; public interface IndexingUpdateService diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java index 6f9e7706b0a16..cf0e220143414 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulator.java @@ -35,6 +35,8 @@ import org.neo4j.function.ThrowingConsumer; import org.neo4j.helpers.collection.Pair; import org.neo4j.helpers.collection.Visitor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.kernel.api.exceptions.index.FlipFailedKernelException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; @@ -42,8 +44,6 @@ import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; import org.neo4j.storageengine.api.schema.IndexSample; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java index 906f53d93c769..75cc61377bc93 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/NodeUpdates.java @@ -30,9 +30,9 @@ import org.neo4j.collection.primitive.PrimitiveIntObjectMap; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.values.storable.Value; import static java.lang.String.format; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java index 54c329f62bf12..1476323acea51 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/OnlineIndexProxy.java @@ -25,6 +25,7 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.IndexCapability; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; import org.neo4j.kernel.api.index.IndexAccessor; @@ -32,7 +33,6 @@ import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.UpdateCountingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java index 66a138031cfcf..830a56068c856 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/PopulatingIndexProxy.java @@ -25,6 +25,7 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.IndexCapability; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexActivationFailedKernelException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; @@ -33,7 +34,6 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.storageengine.api.schema.PopulationProgress; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/TentativeConstraintIndexProxy.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/TentativeConstraintIndexProxy.java index 4a6b35134d397..b26f152486657 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/TentativeConstraintIndexProxy.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/TentativeConstraintIndexProxy.java @@ -24,6 +24,7 @@ import java.util.HashSet; import java.util.concurrent.CopyOnWriteArrayList; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException; @@ -31,7 +32,6 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.InternalIndexState; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.impl.api.index.updater.DelegatingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java index 12fc85d1f84de..11c276a9ab2ef 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaReadOperations.java @@ -21,14 +21,14 @@ import java.util.Iterator; +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.Statement; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.storageengine.api.schema.PopulationProgress; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaWriteOperations.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaWriteOperations.java index 5e30d716e8c1f..e9647f42e09b2 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaWriteOperations.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/operations/SchemaWriteOperations.java @@ -19,15 +19,15 @@ */ package org.neo4j.kernel.impl.api.operations; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/schema/NodeSchemaMatcher.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/schema/NodeSchemaMatcher.java index d9ee352590d6d..854d925fa98e8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/schema/NodeSchemaMatcher.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/schema/NodeSchemaMatcher.java @@ -24,8 +24,8 @@ import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.function.ThrowingBiConsumer; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.kernel.impl.api.KernelStatement; import org.neo4j.kernel.impl.api.operations.EntityReadOperations; import org.neo4j.storageengine.api.NodeItem; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java index b2ef4505904ab..b4c6c998bd0a8 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/ConstraintIndexCreator.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.function.Supplier; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; @@ -39,7 +40,6 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; @@ -50,9 +50,9 @@ import org.neo4j.kernel.impl.api.operations.SchemaReadOperations; import org.neo4j.kernel.impl.locking.Locks.Client; +import static org.neo4j.internal.kernel.api.security.SecurityContext.AUTH_DISABLED; import static org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException.Phase.VERIFICATION; import static org.neo4j.kernel.api.exceptions.schema.SchemaKernelException.OperationContext.CONSTRAINT_CREATION; -import static org.neo4j.internal.kernel.api.security.SecurityContext.AUTH_DISABLED; import static org.neo4j.kernel.impl.locking.ResourceTypes.LABEL; public class ConstraintIndexCreator diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java index 335459f519a3a..c1ebfe04a9330 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxState.java @@ -36,12 +36,12 @@ import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.cursor.Cursor; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptorPredicates; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.RelationshipChangeVisitorAdapter; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java index becd0e3a00ee6..3ac4c147dec23 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java @@ -31,10 +31,10 @@ import java.util.function.Function; import org.neo4j.helpers.collection.Iterators; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptorPredicates; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.constraints.ConstraintSemantics; import org.neo4j.kernel.impl.store.record.ConstraintRule; 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 0ce96abd66432..9a7f9b3ad95b3 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 @@ -34,6 +34,9 @@ import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; +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; @@ -44,9 +47,6 @@ import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.properties.PropertyKeyIdIterator; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; import org.neo4j.kernel.impl.api.RelationshipVisitor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/constraints/ConstraintSemantics.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/constraints/ConstraintSemantics.java index 6d50b9bc3c078..95cea48dbf7ee 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/constraints/ConstraintSemantics.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/constraints/ConstraintSemantics.java @@ -23,10 +23,10 @@ import java.util.function.BiPredicate; import org.neo4j.cursor.Cursor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; import org.neo4j.kernel.impl.store.record.ConstraintRule; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/constraints/StandardConstraintSemantics.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/constraints/StandardConstraintSemantics.java index 2b5465d9c4d1d..c522c1945e3be 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/constraints/StandardConstraintSemantics.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/constraints/StandardConstraintSemantics.java @@ -23,11 +23,11 @@ import java.util.function.BiPredicate; import org.neo4j.cursor.Cursor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; 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 5983664db6a5e..b78f4527f971e 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 @@ -25,10 +25,10 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.exceptions.schema.IllegalTokenNameException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; public class PropertyNameUtils { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/schema/SchemaImpl.java index afe45570a3871..b2966aa964318 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 @@ -42,6 +42,9 @@ import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; @@ -57,10 +60,7 @@ import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.index.InternalIndexState; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcher.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcher.java index a6e9d4b49652d..6b4a5ab9a1194 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcher.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeSchemaMatcher.java @@ -25,8 +25,8 @@ import org.neo4j.collection.primitive.Primitive; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.function.ThrowingBiConsumer; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; /** * This class holds functionality to match LabelSchemaDescriptors to nodes diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java index de80ab29cd93d..a7072c4334487 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/storageengine/impl/recordstorage/TransactionToRecordStateVisitor.java @@ -22,12 +22,12 @@ import java.util.Iterator; import java.util.Set; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DuplicateSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java index a47e58dbabe74..59825d31aa95f 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/SchemaStorage.java @@ -25,12 +25,12 @@ import org.neo4j.function.Predicates; import org.neo4j.helpers.collection.PrefetchingIterator; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.DuplicateSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptorPredicates; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.DynamicRecord; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/ConstraintRule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/ConstraintRule.java index 518a6d785da93..725c5af1b9761 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/ConstraintRule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/ConstraintRule.java @@ -19,12 +19,12 @@ */ package org.neo4j.kernel.impl.store.record; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor; import org.neo4j.storageengine.api.schema.SchemaRule; -import static org.neo4j.kernel.api.schema.SchemaUtil.idTokenNameLookup; +import static org.neo4j.internal.kernel.api.schema.SchemaUtil.idTokenNameLookup; public class ConstraintRule extends SchemaRule implements ConstraintDescriptor.Supplier { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java index 5cc45b3d7c47b..9564114308ae4 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/IndexRule.java @@ -20,12 +20,12 @@ package org.neo4j.kernel.impl.store.record; import org.neo4j.graphdb.Label; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.schema.SchemaRule; -import static org.neo4j.kernel.api.schema.SchemaUtil.idTokenNameLookup; +import static org.neo4j.internal.kernel.api.schema.SchemaUtil.idTokenNameLookup; /** * A {@link Label} can have zero or more index rules which will have data specified in the rules indexed. diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java index dae0617311a66..57d003aa35702 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerialization.java @@ -21,15 +21,15 @@ import java.nio.ByteBuffer; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaComputer; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaProcessor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaComputer; -import org.neo4j.kernel.api.schema.SchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.SchemaProcessor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/IndexUpdatesWork.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/IndexUpdatesWork.java index bcac3a8457c59..47c620790291a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/IndexUpdatesWork.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/command/IndexUpdatesWork.java @@ -27,9 +27,9 @@ import org.neo4j.collection.primitive.PrimitiveLongObjectMap; import org.neo4j.concurrent.Work; import org.neo4j.helpers.collection.NestingIterator; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.api.index.IndexingUpdateService; import org.neo4j.kernel.impl.store.UnderlyingStorageException; import org.neo4j.kernel.impl.transaction.command.Command.NodeCommand; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DirectIndexUpdates.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DirectIndexUpdates.java index a4e36a957749e..8edb80c9ec6e0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DirectIndexUpdates.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/DirectIndexUpdates.java @@ -23,8 +23,8 @@ import java.util.List; import org.neo4j.collection.primitive.PrimitiveLongObjectMap; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.transaction.command.Command.NodeCommand; import org.neo4j.kernel.impl.transaction.command.Command.PropertyCommand; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IndexUpdates.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IndexUpdates.java index 8fdce4d62da66..e1f575af39300 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IndexUpdates.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/IndexUpdates.java @@ -22,8 +22,8 @@ import java.util.List; import org.neo4j.collection.primitive.PrimitiveLongObjectMap; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.transaction.command.Command.NodeCommand; import org.neo4j.kernel.impl.transaction.command.Command.PropertyCommand; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java index 3c5415de0011d..a7630432e26a0 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/OnlineIndexUpdates.java @@ -29,8 +29,8 @@ import org.neo4j.collection.primitive.PrimitiveLongObjectMap; import org.neo4j.collection.primitive.PrimitiveLongSet; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.api.index.IndexingUpdateService; import org.neo4j.kernel.impl.api.index.NodeUpdates; import org.neo4j.kernel.impl.api.index.PropertyPhysicalToLogicalConverter; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java index a479b0012ab52..0f6f61dfbcdfb 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java @@ -26,8 +26,8 @@ import java.util.stream.Collectors; import org.neo4j.helpers.Strings; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java index 116f8bb8285f9..2d46ffbf48dbf 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java @@ -27,8 +27,8 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java index 2d599425adeec..d69f4101bf138 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/GraphDbStructureGuide.java @@ -29,11 +29,11 @@ import org.neo4j.helpers.collection.Visitable; import org.neo4j.internal.kernel.api.TokenNameLookup; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; 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 e7d1912375c67..8917a68f356c8 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 @@ -31,6 +31,9 @@ import org.neo4j.internal.kernel.api.IndexCapability; import org.neo4j.internal.kernel.api.exceptions.LabelNotFoundKernelException; import org.neo4j.internal.kernel.api.exceptions.PropertyKeyIdNotFoundKernelException; +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; @@ -39,9 +42,6 @@ import org.neo4j.kernel.api.exceptions.schema.TooManyLabelsException; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.DegreeVisitor; import org.neo4j.kernel.impl.api.RelationshipVisitor; diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java index bd6bc90cbb2ba..08b740407b3b0 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/schema/SchemaRule.java @@ -19,12 +19,12 @@ */ package org.neo4j.storageengine.api.schema; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaComputer; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaComputer; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.store.record.ConstraintRule; import org.neo4j.kernel.impl.store.record.IndexRule; diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java index 5a65498f921e9..eeb01bcca706a 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/ReadableTransactionState.java @@ -24,10 +24,10 @@ import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.cursor.Cursor; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.RelationshipVisitor; import org.neo4j.kernel.impl.api.store.RelationshipIterator; diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java index 2dca822626e69..fe076ee7f2ffa 100644 --- a/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java +++ b/community/kernel/src/main/java/org/neo4j/storageengine/api/txstate/TxStateVisitor.java @@ -22,10 +22,10 @@ import java.util.Iterator; import java.util.Set; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.RelationshipPropertyExistenceException; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.storageengine.api.StorageProperty; diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java index c61d511ce037c..e25fa4603299e 100644 --- a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java +++ b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java @@ -50,6 +50,8 @@ import org.neo4j.helpers.collection.Visitor; import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector; import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.IOLimiter; import org.neo4j.io.pagecache.PageCache; @@ -66,8 +68,6 @@ import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.LabelScanWriter; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.LabelSchemaSupplier; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictExceptionTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictExceptionTest.java index 5cee2f95b4ab7..562f68683bda2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictExceptionTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/exceptions/index/IndexEntryConflictExceptionTest.java @@ -21,10 +21,10 @@ import org.junit.Test; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaUtil; import org.neo4j.kernel.api.StatementConstants; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.SchemaUtil; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueTuple; import org.neo4j.values.storable.Values; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java index ed717b9ea8433..ee449cb9586ea 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/CompositeIndexAccessorCompatibility.java @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.values.storable.Values; @@ -31,8 +31,8 @@ import static java.util.Collections.singletonList; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; -import static org.neo4j.kernel.api.index.IndexQueryHelper.exact; import static org.neo4j.internal.kernel.api.IndexQuery.exists; +import static org.neo4j.kernel.api.index.IndexQueryHelper.exact; @Ignore( "Not a test. This is a compatibility suite that provides test cases for verifying" + " SchemaIndexProvider implementations. Each index provider that is to be tested by this suite" + diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexQueryHelper.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexQueryHelper.java index 51ec5eea40bf1..73cb8860f7d31 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexQueryHelper.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexQueryHelper.java @@ -20,7 +20,7 @@ package org.neo4j.kernel.api.index; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; 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 6d0aaee2b8fc3..e6f6f2cd23be4 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 @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Map; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/index/NodeUpdatesTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/index/NodeUpdatesTest.java index ae1082272c18c..c4da3b8754343 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/index/NodeUpdatesTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/index/NodeUpdatesTest.java @@ -28,8 +28,8 @@ import java.util.Map; import org.neo4j.collection.primitive.PrimitiveIntIterator; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.properties.PropertyKeyValue; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.impl.api.index.NodeUpdates; import org.neo4j.kernel.impl.api.index.PropertyLoader; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/schema/SchemaProcessorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/schema/SchemaProcessorTest.java index d43a133c64599..1fe114685ead2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/schema/SchemaProcessorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/schema/SchemaProcessorTest.java @@ -25,6 +25,9 @@ import java.util.ArrayList; import java.util.List; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaProcessor; + import static org.hamcrest.MatcherAssert.assertThat; public class SchemaProcessorTest @@ -39,13 +42,13 @@ public void shouldHandleCorrectDescriptorVersions() SchemaProcessor processor = new SchemaProcessor() { @Override - public void processSpecific( LabelSchemaDescriptor schema ) + public void processSpecific( org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor schema ) { callHistory.add( "LabelSchemaDescriptor" ); } @Override - public void processSpecific( RelationTypeSchemaDescriptor schema ) + public void processSpecific( org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor schema ) { callHistory.add( "RelationTypeSchemaDescriptor" ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java index ebdeaf8cb2754..f091b832115d9 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/DataIntegrityValidatingStatementOperationsTest.java @@ -27,6 +27,7 @@ import java.util.Iterator; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.AlreadyIndexedException; import org.neo4j.kernel.api.exceptions.schema.DropIndexFailureException; @@ -35,7 +36,6 @@ import org.neo4j.kernel.api.exceptions.schema.NoSuchIndexException; import org.neo4j.kernel.api.exceptions.schema.RepeatedPropertyInCompositeSchemaException; import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java index 8cc1a8ee7f873..4d006382e8702 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java @@ -26,14 +26,14 @@ import java.util.concurrent.locks.LockSupport; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; -import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.SchemaIndexTestHelper; import org.neo4j.kernel.internal.GraphDatabaseAPI; 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 fd2668370ace8..de19ee18fc4d9 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 @@ -29,11 +29,11 @@ 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.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracer; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java index 37ecb2b711759..b1d1c2ad448da 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeTest.java @@ -25,12 +25,12 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java index 2ffe7922ccbcf..2fe03d6021503 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java @@ -38,6 +38,7 @@ import org.neo4j.internal.kernel.api.TokenRead; import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.Write; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; @@ -54,7 +55,6 @@ import org.neo4j.kernel.api.proc.CallableProcedure; import org.neo4j.kernel.api.proc.CallableUserAggregationFunction; import org.neo4j.kernel.api.proc.CallableUserFunction; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java index 94890fe3e250c..57f68a70859d2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexCRUDIT.java @@ -35,6 +35,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.ReadOperations; @@ -46,7 +47,6 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java index 3713cee66190d..d9b310c685783 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java @@ -35,19 +35,19 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Iterators; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.security.AnonymousContext; -import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.impl.api.integrationtest.KernelIntegrationTest; import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator; import org.neo4j.kernel.internal.GraphDatabaseAPI; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java index a01594dfefdd8..74dc73e86e51d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexMapTest.java @@ -27,7 +27,7 @@ import org.neo4j.collection.primitive.PrimitiveIntCollections; import org.neo4j.collection.primitive.PrimitiveIntSet; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java index b2edd9aea2ab2..07f54d6eb90ee 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexPopulationJobTest.java @@ -40,6 +40,8 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.collection.Pair; import org.neo4j.helpers.collection.Visitor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.Statement; @@ -53,12 +55,10 @@ import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.security.AnonymousContext; -import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.DatabaseSchemaState; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProvider; @@ -97,8 +97,8 @@ import static org.neo4j.helpers.collection.MapUtil.genericMap; import static org.neo4j.helpers.collection.MapUtil.map; import static org.neo4j.internal.kernel.api.IndexCapability.NO_CAPABILITY; -import static org.neo4j.kernel.api.index.IndexEntryUpdate.add; import static org.neo4j.internal.kernel.api.security.SecurityContext.AUTH_DISABLED; +import static org.neo4j.kernel.api.index.IndexEntryUpdate.add; import static org.neo4j.kernel.impl.api.index.IndexingService.NO_MONITOR; import static org.neo4j.kernel.impl.api.index.TestSchemaIndexProviderDescriptor.PROVIDER_DESCRIPTOR; import static org.neo4j.logging.AssertableLogProvider.inLog; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java index c403261b9ef8a..3452ce57b5f60 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexProxyAdapter.java @@ -24,10 +24,10 @@ import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.IndexCapability; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater; import org.neo4j.storageengine.api.schema.IndexReader; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java index e9192ea5bb30a..bb4354f516b3f 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexRecoveryIT.java @@ -37,6 +37,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.Statement; @@ -47,7 +48,6 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.extension.KernelExtensionFactory; 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 ac466257c7467..94872016f601b 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 @@ -47,10 +47,10 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; 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.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java index 3ca59a17e83a2..2bc0dbb50479d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java @@ -51,6 +51,7 @@ import org.neo4j.helpers.collection.Iterators; import org.neo4j.helpers.collection.Visitor; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; @@ -62,7 +63,6 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java index bbe101c1f69b0..75a4740bee99b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorTest.java @@ -31,13 +31,13 @@ import java.util.function.IntPredicate; import org.neo4j.helpers.collection.Visitor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java index a854d4d32afd6..d7fc61644422e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/MultipleIndexPopulatorUpdatesTest.java @@ -30,6 +30,7 @@ import java.util.function.IntPredicate; import org.neo4j.helpers.collection.Visitor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.exceptions.index.IndexPopulationFailedKernelException; import org.neo4j.kernel.api.index.IndexEntryUpdate; @@ -37,7 +38,6 @@ import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/inmemory/UniqueInMemoryIndex.java index da0832e5fac8f..f0e3d9657bee4 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 @@ -24,12 +24,12 @@ import java.util.Map; import java.util.Set; +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; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.api.index.IndexUpdateMode; import org.neo4j.kernel.impl.api.index.updater.UniquePropertyIndexUpdater; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java index 06eeac0be5ef2..d2742fdaa4b0d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java @@ -28,12 +28,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; -import org.neo4j.scheduler.JobScheduler; import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.scheduler.JobScheduler; import org.neo4j.test.DoubleLatch; import static java.util.concurrent.TimeUnit.SECONDS; 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 28db9d0ee04c9..a1ac0968b3e46 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 @@ -38,6 +38,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.TransactionFailureException; import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.KernelTransaction; import org.neo4j.kernel.api.SchemaWriteOperations; @@ -46,7 +47,6 @@ import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.schema.SchemaKernelException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; import org.neo4j.kernel.internal.GraphDatabaseAPI; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java index efc0508d4a926..d2126ecef5455 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java @@ -23,19 +23,19 @@ import org.junit.Test; import org.neo4j.graphdb.Transaction; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementConstants; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; -import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.test.DoubleLatch; 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/state/IndexTxStateUpdaterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdaterTest.java index 6609e72a765de..c6658491fea06 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdaterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexTxStateUpdaterTest.java @@ -29,9 +29,9 @@ import org.neo4j.collection.primitive.PrimitiveIntCollections; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.cursor.Cursor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.properties.PropertyKeyValue; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; @@ -52,8 +52,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.neo4j.helpers.collection.Iterators.filter; -import static org.neo4j.kernel.api.schema.SchemaDescriptorPredicates.hasLabel; -import static org.neo4j.kernel.api.schema.SchemaDescriptorPredicates.hasProperty; +import static org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates.hasLabel; +import static org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates.hasProperty; import static org.neo4j.kernel.impl.api.state.IndexTxStateUpdater.LabelChangeType.ADDED_LABEL; import static org.neo4j.kernel.impl.api.state.IndexTxStateUpdater.LabelChangeType.REMOVED_LABEL; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java index e1011870c0c66..7c38a9d74a2f5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/SchemaTransactionStateTest.java @@ -31,8 +31,8 @@ import java.util.Map; import org.neo4j.helpers.collection.Iterators; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.InternalIndexState; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java index f9ac667276bed..d6af99af53095 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StateHandlingStatementOperationsTest.java @@ -31,15 +31,15 @@ import org.neo4j.cursor.Cursor; import org.neo4j.helpers.collection.Iterables; import org.neo4j.internal.kernel.api.IndexQuery; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.AssertOpen; import org.neo4j.kernel.api.DataWriteOperations; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.explicitindex.AutoIndexOperations; import org.neo4j.kernel.api.explicitindex.AutoIndexing; import org.neo4j.kernel.api.properties.PropertyKeyValue; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java index 77a94edaf7a21..28a9bdf977ef2 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java @@ -38,7 +38,7 @@ import org.neo4j.cursor.Cursor; import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Pair; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java index 2f36b0be21ed5..261144cdc727d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/SchemaCacheTest.java @@ -28,8 +28,8 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Iterators; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerSchemaTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerSchemaTest.java index 7fe6abf45ad81..259dbc4cc6595 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerSchemaTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerSchemaTest.java @@ -25,7 +25,7 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Transaction; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import static org.junit.Assert.assertEquals; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulatorTest.java index 0221d43530796..0cb50eaf5371c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexPopulatorTest.java @@ -25,10 +25,10 @@ import java.io.IOException; import java.util.Collection; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexPopulator; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.index.schema.NativeSelector; import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider.DropAction; import org.neo4j.values.storable.Value; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexTestHelp.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexTestHelp.java index 6f9f87a7c1794..3e922c1621930 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexTestHelp.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexTestHelp.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.concurrent.Callable; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexUpdaterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexUpdaterTest.java index 09ae0d04fdfb0..aee56671ad147 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexUpdaterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/fusion/FusionIndexUpdaterTest.java @@ -24,17 +24,16 @@ import java.io.IOException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.index.schema.NativeSelector; import org.neo4j.values.storable.Value; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; - import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexTestHelp.add; import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexTestHelp.change; import static org.neo4j.kernel.impl.index.schema.fusion.FusionIndexTestHelp.remove; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java index ba7d30d47753a..1c277e58f5a94 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java @@ -28,8 +28,8 @@ import org.neo4j.internal.kernel.api.StubNodeCursor; import org.neo4j.internal.kernel.api.StubPropertyCursor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; @@ -49,8 +49,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.neo4j.helpers.collection.Iterators.filter; -import static org.neo4j.kernel.api.schema.SchemaDescriptorPredicates.hasLabel; -import static org.neo4j.kernel.api.schema.SchemaDescriptorPredicates.hasProperty; +import static org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates.hasLabel; +import static org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates.hasProperty; import static org.neo4j.kernel.impl.newapi.IndexTxStateUpdater.LabelChangeType.ADDED_LABEL; import static org.neo4j.kernel.impl.newapi.IndexTxStateUpdater.LabelChangeType.REMOVED_LABEL; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java index 9c9294055317d..12f175f5d8ce1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/SchemaStorageTest.java @@ -39,12 +39,12 @@ import org.neo4j.graphdb.schema.IndexCreator; import org.neo4j.helpers.collection.Iterators; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.exceptions.schema.DuplicateSchemaRuleException; import org.neo4j.kernel.api.exceptions.schema.SchemaRuleNotFoundException; -import org.neo4j.kernel.api.schema.SchemaDescriptorPredicates; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/ConstraintRuleTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/ConstraintRuleTest.java index e622944ea780b..d38d269020140 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/ConstraintRuleTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/ConstraintRuleTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java index 716edce9eff92..c671cd14a5238 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/record/SchemaRuleSerializationTest.java @@ -26,9 +26,9 @@ import java.util.Base64; import java.util.stream.IntStream; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java index e3fcb0b050f86..86251772d6451 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/Commands.java @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.List; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.index.SchemaIndexProvider; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.store.DynamicNodeLabels; import org.neo4j.kernel.impl.store.PropertyStore; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java index 20079d3b9ccb0..0a398f57482e5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/command/IndexWorkSyncTransactionApplicationStressIT.java @@ -31,9 +31,9 @@ import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongIterator; import org.neo4j.helpers.collection.Visitor; -import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.kernel.api.index.InternalIndexState; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.txstate.TransactionState; import org.neo4j.kernel.impl.api.TransactionQueue; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java index 31877060715b3..25c34870a5691 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/SchemaRuleCommandTest.java @@ -25,8 +25,8 @@ import org.neo4j.concurrent.WorkSync; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptorPredicates; import org.neo4j.kernel.api.labelscan.LabelScanWriter; -import org.neo4j.kernel.api.schema.SchemaDescriptorPredicates; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.impl.api.BatchTransactionApplier; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java index 4b17f18cb94b6..88e1e91f0ea79 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/TransactionRecordStateTest.java @@ -37,10 +37,10 @@ import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.index.IndexEntryUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.impl.api.BatchTransactionApplier; import org.neo4j.kernel.impl.api.CommandVisitor; import org.neo4j.kernel.impl.api.TransactionToApply; 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 f0489fe7c1c79..5c3f2752dcc6a 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 @@ -37,11 +37,11 @@ import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Visitor; 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.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.impl.api.index.NodeUpdates; import org.neo4j.kernel.impl.api.index.StoreScan; diff --git a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java index d931f4b5342eb..4e4bd537e6b9a 100644 --- a/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/kernel/api/impl/schema/populator/UniqueDatabaseIndexPopulatorTest.java @@ -34,6 +34,8 @@ import org.neo4j.collection.primitive.PrimitiveLongCollections; import org.neo4j.collection.primitive.PrimitiveLongIterator; +import org.neo4j.internal.kernel.api.IndexQuery; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.io.IOUtils; import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException; import org.neo4j.kernel.api.impl.index.storage.DirectoryFactory; @@ -44,8 +46,6 @@ import org.neo4j.kernel.api.index.IndexEntryUpdate; import org.neo4j.kernel.api.index.IndexUpdater; import org.neo4j.kernel.api.index.PropertyAccessor; -import org.neo4j.internal.kernel.api.IndexQuery; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; diff --git a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java index 76b6de81bf8ea..830b77982b5c5 100644 --- a/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java +++ b/community/neo4j/src/test/java/org/neo4j/locking/QueryExecutionLocksIT.java @@ -49,6 +49,9 @@ 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.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.GraphDatabaseQueryService; import org.neo4j.kernel.api.ExplicitIndexHits; @@ -69,9 +72,6 @@ import org.neo4j.kernel.api.proc.QualifiedName; import org.neo4j.kernel.api.proc.UserFunctionSignature; import org.neo4j.kernel.api.query.ExecutingQuery; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.txstate.TxStateHolder; import org.neo4j.kernel.impl.api.RelationshipVisitor; diff --git a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java index 3a6ab1a5a963b..74ba56edb9b62 100644 --- a/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java +++ b/community/neo4j/src/test/java/schema/MultiIndexPopulationConcurrentUpdatesIT.java @@ -42,6 +42,7 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.Iterators; import org.neo4j.helpers.collection.Visitor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; @@ -56,7 +57,6 @@ import org.neo4j.kernel.api.index.SchemaIndexProvider; import org.neo4j.kernel.api.labelscan.LabelScanStore; import org.neo4j.kernel.api.labelscan.NodeLabelUpdate; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.configuration.Config; diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseConstraintSemantics.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseConstraintSemantics.java index cbb259428497d..0316dbb0da8e8 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseConstraintSemantics.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseConstraintSemantics.java @@ -23,13 +23,13 @@ import java.util.function.BiPredicate; import org.neo4j.cursor.Cursor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.NodePropertyExistenceException; import org.neo4j.kernel.api.exceptions.schema.RelationshipPropertyExistenceException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics; import org.neo4j.kernel.impl.store.record.ConstraintRule; diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/PropertyExistenceEnforcer.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/PropertyExistenceEnforcer.java index ac6333ab44a5b..e76464c43acb8 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/PropertyExistenceEnforcer.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/PropertyExistenceEnforcer.java @@ -31,14 +31,14 @@ import org.neo4j.collection.primitive.PrimitiveIntObjectMap; import org.neo4j.collection.primitive.PrimitiveIntSet; import org.neo4j.cursor.Cursor; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.SchemaProcessor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.AssertOpen; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.api.exceptions.schema.NodePropertyExistenceException; import org.neo4j.kernel.api.exceptions.schema.RelationshipPropertyExistenceException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; -import org.neo4j.kernel.api.schema.SchemaProcessor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.impl.locking.Lock; import org.neo4j.storageengine.api.NodeItem; import org.neo4j.storageengine.api.PropertyItem; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java index 34ffbae83f49d..75456eaae4d4f 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java @@ -38,19 +38,19 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.SchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException; -import org.neo4j.kernel.api.schema.SchemaDescriptor; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; -import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; import static java.util.Collections.emptySet; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeKeyConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeKeyConstraintCreationIT.java index eec6071fe8897..70bd30b8da561 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeKeyConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeKeyConstraintCreationIT.java @@ -24,10 +24,10 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.ResourceIterator; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.internal.kernel.api.exceptions.KernelException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java index 8aa0db3bc9dbc..a253c30d28a39 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java @@ -27,15 +27,15 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.ResourceIterator; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeExistenceConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipPropertyExistenceConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipPropertyExistenceConstraintCreationIT.java index 6d29e86abe5ee..b704a55b0e5e7 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipPropertyExistenceConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/RelationshipPropertyExistenceConstraintCreationIT.java @@ -23,10 +23,10 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor; import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.internal.kernel.api.exceptions.KernelException; -import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java index abe11de5e04d0..abd1c3aab81b8 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java @@ -27,26 +27,26 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.ResourceIterator; +import org.neo4j.internal.kernel.api.exceptions.KernelException; +import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.api.ReadOperations; import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StatementTokenNameLookup; import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException; -import org.neo4j.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.UniquenessConstraintDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptor; import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory; import org.neo4j.kernel.api.security.AnonymousContext; -import org.neo4j.internal.kernel.api.security.SecurityContext; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; import org.neo4j.kernel.impl.store.NeoStores; import org.neo4j.kernel.impl.store.SchemaStorage; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerSchemaWithPECTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerSchemaWithPECTest.java index 2bfbc2f8b8cd5..8695a53d028d8 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerSchemaWithPECTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/store/StorageLayerSchemaWithPECTest.java @@ -28,8 +28,8 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.RelationshipType; import org.neo4j.helpers.collection.Iterators; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/PropertyExistenceEnforcerTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/PropertyExistenceEnforcerTest.java index 3de5229d120a1..0dd73fc487bf9 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/PropertyExistenceEnforcerTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/enterprise/PropertyExistenceEnforcerTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.function.Function; -import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor; +import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor;