From d4611966e5e6e2eaa5efe94da5b3b9b83a06aec4 Mon Sep 17 00:00:00 2001 From: Pontus Melke Date: Tue, 13 Mar 2018 10:08:13 +0100 Subject: [PATCH] Use TokenWrite in integration tests --- .../neo4j/kernel/impl/api/index/IndexIT.java | 12 ++++----- .../integrationtest/BuiltInProceduresIT.java | 4 +-- .../KernelIntegrationTest.java | 7 +++-- .../NodeGetUniqueFromIndexSeekIT.java | 10 +++---- .../UniquenessConstraintValidationIT.java | 12 ++++----- .../AbstractConstraintCreationIT.java | 10 +++---- .../NodeKeyConstraintCreationIT.java | 6 ++--- ...PropertyExistenceConstraintCreationIT.java | 6 ++--- .../PropertyConstraintValidationIT.java | 26 ++++++++++--------- ...PropertyExistenceConstraintCreationIT.java | 6 ++--- .../UniquenessConstraintCreationIT.java | 6 ++--- 11 files changed, 53 insertions(+), 52 deletions(-) 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 e624a65b8caa1..4c5be9e12e9f1 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,6 +35,7 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.helpers.collection.Iterables; import org.neo4j.helpers.collection.Iterators; +import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; @@ -42,7 +43,6 @@ 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.kernel.api.index.PropertyAccessor; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; @@ -75,7 +75,7 @@ public class IndexIT extends KernelIntegrationTest @Before public void createLabelAndProperty() throws Exception { - TokenWriteOperations tokenWrites = tokenWriteOperationsInNewTransaction(); + TokenWrite tokenWrites = tokenWriteInNewTransaction(); labelId = tokenWrites.labelGetOrCreateForName( LABEL ); propertyKeyId = tokenWrites.propertyKeyGetOrCreateForName( PROPERTY_KEY ); int propertyKeyId2 = tokenWrites.propertyKeyGetOrCreateForName( PROPERTY_KEY2 ); @@ -94,8 +94,8 @@ public void tearDown() @Test public void createIndexForAnotherLabelWhileHoldingSharedLockOnOtherLabel() throws KernelException { - TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction(); - int label2 = tokenWriteOperations.labelGetOrCreateForName( "Label2" ); + TokenWrite tokenWrite = tokenWriteInNewTransaction(); + int label2 = tokenWrite.labelGetOrCreateForName( "Label2" ); DataWriteOperations dataWriteOperations = dataWriteOperationsInNewTransaction(); long nodeId = dataWriteOperations.nodeCreate(); @@ -108,8 +108,8 @@ public void createIndexForAnotherLabelWhileHoldingSharedLockOnOtherLabel() throw @Test( timeout = 10_000 ) public void createIndexesForDifferentLabelsConcurrently() throws Throwable { - TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction(); - int label2 = tokenWriteOperations.labelGetOrCreateForName( "Label2" ); + TokenWrite tokenWrite = tokenWriteInNewTransaction(); + int label2 = tokenWrite.labelGetOrCreateForName( "Label2" ); LabelSchemaDescriptor anotherLabelDescriptor = SchemaDescriptorFactory.forLabel( label2, propertyKeyId ); schemaWriteOperationsInNewTransaction().indexCreate( anotherLabelDescriptor ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java index 62898f81c6929..2e1a34d022d73 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java @@ -31,11 +31,11 @@ import org.neo4j.collection.RawIterator; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.MapUtil; +import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.exceptions.ProcedureException; import org.neo4j.kernel.api.ResourceTracker; import org.neo4j.kernel.api.Statement; import org.neo4j.kernel.api.StubResourceManager; -import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.security.AnonymousContext; import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory; import org.neo4j.kernel.internal.Version; @@ -81,7 +81,7 @@ public void listAllLabels() throws Throwable public void listPropertyKeys() throws Throwable { // Given - TokenWriteOperations ops = tokenWriteOperationsInNewTransaction(); + TokenWrite ops = tokenWriteInNewTransaction(); ops.propertyKeyGetOrCreateForName( "MyProp" ); commit(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java index dc32dd018f50a..7fad8e4c9d674 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java @@ -27,6 +27,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; import org.neo4j.internal.kernel.api.Procedures; +import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.security.LoginContext; import org.neo4j.kernel.api.DataWriteOperations; @@ -35,7 +36,6 @@ 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.kernel.api.dbms.DbmsOperations; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.security.AnonymousContext; @@ -72,11 +72,10 @@ protected Statement statementInNewTransaction( LoginContext loginContext ) throw return statement; } - protected TokenWriteOperations tokenWriteOperationsInNewTransaction() throws KernelException + protected TokenWrite tokenWriteInNewTransaction() throws KernelException { transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AnonymousContext.writeToken() ); - statement = transaction.acquireStatement(); - return statement.tokenWriteOperations(); + return transaction.tokenWrite(); } protected DataWriteOperations dataWriteOperationsInNewTransaction() throws KernelException 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 759b4be960a31..20e7447f93ef3 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,6 +23,7 @@ import org.junit.Test; import org.neo4j.graphdb.Transaction; +import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.internal.kernel.api.security.LoginContext; @@ -30,7 +31,6 @@ 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.kernel.api.exceptions.index.IndexNotApplicableKernelException; import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException; import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException; @@ -52,10 +52,10 @@ public class NodeGetUniqueFromIndexSeekIT extends KernelIntegrationTest @Before public void createKeys() throws Exception { - TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction(); - this.labelId = tokenWriteOperations.labelGetOrCreateForName( "Person" ); - this.propertyId1 = tokenWriteOperations.propertyKeyGetOrCreateForName( "foo" ); - this.propertyId2 = tokenWriteOperations.propertyKeyGetOrCreateForName( "bar" ); + TokenWrite tokenWrite = tokenWriteInNewTransaction(); + this.labelId = tokenWrite.labelGetOrCreateForName( "Person" ); + this.propertyId1 = tokenWrite.propertyKeyGetOrCreateForName( "foo" ); + this.propertyId2 = tokenWrite.propertyKeyGetOrCreateForName( "bar" ); commit(); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationIT.java index 828830d26f88c..e6a092b98e5f7 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationIT.java @@ -21,13 +21,13 @@ import org.junit.Test; +import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.TokenWrite; +import org.neo4j.internal.kernel.api.exceptions.KernelException; 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.internal.kernel.api.TokenNameLookup; -import org.neo4j.kernel.api.TokenWriteOperations; -import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; @@ -392,9 +392,9 @@ private void createConstraint( String label, String propertyKey ) throws KernelE { int labelId; int propertyKeyId; - TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction(); - labelId = tokenWriteOperations.labelGetOrCreateForName( label ); - propertyKeyId = tokenWriteOperations.propertyKeyGetOrCreateForName( propertyKey ); + TokenWrite tokenWrite = tokenWriteInNewTransaction(); + labelId = tokenWrite.labelGetOrCreateForName( label ); + propertyKeyId = tokenWrite.propertyKeyGetOrCreateForName( propertyKey ); commit(); SchemaWriteOperations schemaWriteOperations = schemaWriteOperationsInNewTransaction(); 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 7a741d8086e86..414dd7e31d1fe 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,13 +38,13 @@ import org.neo4j.graphdb.schema.IndexDefinition; import org.neo4j.graphdb.schema.Schema; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.internal.kernel.api.TokenWrite; 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.kernel.api.ReadOperations; import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException; @@ -75,7 +75,7 @@ public abstract class AbstractConstraintCreationIT { @Override - int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException + int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException { - return tokenWriteOperations.labelGetOrCreateForName( name ); + return tokenWrite.labelGetOrCreateForName( name ); } @Override 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 a253c30d28a39..1350c83a4efd4 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,12 +27,12 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.ResourceIterator; +import org.neo4j.internal.kernel.api.TokenWrite; 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.kernel.api.exceptions.schema.DropConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException; import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; @@ -51,9 +51,9 @@ public class NodePropertyExistenceConstraintCreationIT extends AbstractConstraintCreationIT { @Override - int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException + int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException { - return tokenWriteOperations.labelGetOrCreateForName( name ); + return tokenWrite.labelGetOrCreateForName( name ); } @Override diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java index 21d76af098f84..02f6ff3b2c393 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java @@ -33,12 +33,12 @@ import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; +import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.exceptions.KernelException; 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.kernel.api.exceptions.ConstraintViolationTransactionFailureException; import org.neo4j.kernel.api.exceptions.Status; import org.neo4j.kernel.api.exceptions.TransactionFailureException; @@ -55,8 +55,10 @@ import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forLabel; import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forRelType; import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.NodeKeyConstraintValidationIT; -import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.NodePropertyExistenceConstraintValidationIT; -import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.RelationshipPropertyExistenceConstraintValidationIT; +import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT + .NodePropertyExistenceConstraintValidationIT; +import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT + .RelationshipPropertyExistenceConstraintValidationIT; @RunWith( Suite.class ) @SuiteClasses( { @@ -71,9 +73,9 @@ public static class NodeKeyConstraintValidationIT extends NodePropertyExistenceC @Override void createConstraint( String key, String property ) throws KernelException { - TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction(); - int label = tokenWriteOperations.labelGetOrCreateForName( key ); - int propertyKey = tokenWriteOperations.propertyKeyGetOrCreateForName( property ); + TokenWrite tokenWrite = tokenWriteInNewTransaction(); + int label = tokenWrite.labelGetOrCreateForName( key ); + int propertyKey = tokenWrite.propertyKeyGetOrCreateForName( property ); commit(); SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction(); @@ -137,9 +139,9 @@ public void shouldAllowNoopLabelUpdate() throws Exception @Override void createConstraint( String key, String property ) throws KernelException { - TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction(); - int label = tokenWriteOperations.labelGetOrCreateForName( key ); - int propertyKey = tokenWriteOperations.propertyKeyGetOrCreateForName( property ); + TokenWrite tokenWrite = tokenWriteInNewTransaction(); + int label = tokenWrite.labelGetOrCreateForName( key ); + int propertyKey = tokenWrite.propertyKeyGetOrCreateForName( property ); commit(); SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction(); @@ -218,9 +220,9 @@ public static class RelationshipPropertyExistenceConstraintValidationIT @Override void createConstraint( String key, String property ) throws KernelException { - TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction(); - int relTypeId = tokenWriteOperations.relationshipTypeGetOrCreateForName( key ); - int propertyKeyId = tokenWriteOperations.propertyKeyGetOrCreateForName( property ); + TokenWrite tokenWrite = tokenWriteInNewTransaction(); + int relTypeId = tokenWrite.relationshipTypeGetOrCreateForName( key ); + int propertyKeyId = tokenWrite.propertyKeyGetOrCreateForName( property ); commit(); SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction(); 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 b704a55b0e5e7..eda353023d9e1 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.TokenWrite; 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.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory; import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor; @@ -37,9 +37,9 @@ public class RelationshipPropertyExistenceConstraintCreationIT extends AbstractConstraintCreationIT { @Override - int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException + int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException { - return tokenWriteOperations.relationshipTypeGetOrCreateForName( name ); + return tokenWrite.relationshipTypeGetOrCreateForName( name ); } @Override 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 12db969139518..1db3124fe5e95 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 @@ -28,6 +28,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.ResourceIterator; import org.neo4j.internal.kernel.api.TokenNameLookup; +import org.neo4j.internal.kernel.api.TokenWrite; import org.neo4j.internal.kernel.api.exceptions.KernelException; import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; @@ -38,7 +39,6 @@ import org.neo4j.kernel.api.SchemaWriteOperations; import org.neo4j.kernel.api.SilentTokenNameLookup; import org.neo4j.kernel.api.Statement; -import org.neo4j.kernel.api.TokenWriteOperations; import org.neo4j.kernel.api.exceptions.TransactionFailureException; import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException; import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException; @@ -72,9 +72,9 @@ public class UniquenessConstraintCreationIT private SchemaIndexDescriptor uniqueIndex; @Override - int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException + int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException { - return tokenWriteOperations.labelGetOrCreateForName( KEY ); + return tokenWrite.labelGetOrCreateForName( KEY ); } @Override