Remove usages of SchemaWriteOperations

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelSchemaStateFlushingTest.java

@@ -135,10 +135,9 @@ public void shouldInvalidateSchemaStateOnDropConstraint() throws Exception
     private ConstraintDescriptor createConstraint() throws KernelException
     {
 
-        try ( KernelTransaction transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED );
-              Statement statement = transaction.acquireStatement() )
+        try ( KernelTransaction transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ) )
         {
-            ConstraintDescriptor descriptor = statement.schemaWriteOperations().uniquePropertyConstraintCreate(
+            ConstraintDescriptor descriptor = transaction.schemaWrite().uniquePropertyConstraintCreate(
                     SchemaDescriptorFactory.forLabel( 1, 1 ) );
             transaction.success();
             return descriptor;
@@ -147,10 +146,9 @@ private ConstraintDescriptor createConstraint() throws KernelException
 
     private void dropConstraint( ConstraintDescriptor descriptor ) throws KernelException
     {
-        try ( KernelTransaction transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED );
-              Statement statement = transaction.acquireStatement() )
+        try ( KernelTransaction transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ) )
         {
-            statement.schemaWriteOperations().constraintDrop( descriptor );
+            transaction.schemaWrite().constraintDrop( descriptor );
             transaction.success();
         }
     }

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTest.java

@@ -27,7 +27,7 @@
 
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException;
-import org.neo4j.kernel.api.Statement;
+import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.factory.CommunityEditionModule;
@@ -54,12 +54,13 @@ public void shouldNotAllowCreationOfConstraintsWhenInHA() throws Exception
         ThreadToStatementContextBridge stmtBridge =
                 db.getDependencyResolver().resolveDependency( ThreadToStatementContextBridge.class );
 
-        try ( Transaction ignored = db.beginTx();
-                Statement statement = stmtBridge.get() )
+        try ( Transaction ignored = db.beginTx() )
         {
+            KernelTransaction ktx =
+                    stmtBridge.getKernelTransactionBoundToThisThread( true );
             try
             {
-                statement.schemaWriteOperations().uniquePropertyConstraintCreate( forLabel( 1, 1 ) );
+                ktx.schemaWrite().uniquePropertyConstraintCreate( forLabel( 1, 1 ) );
                 fail( "expected exception here" );
             }
             catch ( InvalidTransactionTypeKernelException e )

community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/CompositeUniquenessConstraintValidationIT.java

@@ -29,7 +29,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.io.IOException;
 import java.util.Arrays;
 
 import org.neo4j.graphdb.Node;
@@ -38,7 +37,6 @@
 import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.api.InwardKernel;
 import org.neo4j.kernel.api.KernelTransaction;
-import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException;
 import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory;
@@ -100,7 +98,6 @@ public CompositeUniquenessConstraintValidationIT( TestParams params )
     }
 
     private KernelTransaction transaction;
-    private Statement statement;
     private GraphDatabaseAPI graphDatabaseAPI;
     protected InwardKernel kernel;
 
@@ -112,7 +109,7 @@ public void setup() throws Exception
         kernel = graphDatabaseAPI.getDependencyResolver().resolveDependency( InwardKernel.class );
 
         newTransaction();
-        statement.schemaWriteOperations().uniquePropertyConstraintCreate( forLabel( label, propertyIds() ) );
+        transaction.schemaWrite().uniquePropertyConstraintCreate( forLabel( label, propertyIds() ) );
         commit();
     }
 
@@ -125,7 +122,7 @@ public void clean() throws Exception
         }
 
         newTransaction();
-        statement.schemaWriteOperations()
+        transaction.schemaWrite()
                 .constraintDrop( ConstraintDescriptorFactory.uniqueForLabel( label, propertyIds() ) );
         commit();
 
@@ -147,7 +144,7 @@ public void shouldAllowRemoveAndAddConflictingDataInOneTransaction_DeleteNode()
 
         // when
         newTransaction();
-        statement.dataWriteOperations().nodeDelete( node );
+        transaction.dataWrite().nodeDelete( node );
         long newNode = createLabeledNode( label );
         setProperties( newNode, aValues );
 
@@ -163,7 +160,7 @@ public void shouldAllowRemoveAndAddConflictingDataInOneTransaction_RemoveLabel()
 
         // when
         newTransaction();
-        statement.dataWriteOperations().nodeRemoveLabel( node, label );
+        transaction.dataWrite().nodeRemoveLabel( node, label );
         long newNode = createLabeledNode( label );
         setProperties( newNode, aValues );
 
@@ -179,7 +176,7 @@ public void shouldAllowRemoveAndAddConflictingDataInOneTransaction_RemovePropert
 
         // when
         newTransaction();
-        statement.dataWriteOperations().nodeRemoveProperty( node, 0 );
+        transaction.dataWrite().nodeRemoveProperty( node, 0 );
         long newNode = createLabeledNode( label );
         setProperties( newNode, aValues );
 
@@ -195,7 +192,7 @@ public void shouldAllowRemoveAndAddConflictingDataInOneTransaction_ChangePropert
 
         // when
         newTransaction();
-        statement.dataWriteOperations().nodeSetProperty( node, 0, Values.of( "Alive!" ) );
+        transaction.dataWrite().nodeSetProperty( node, 0, Values.of( "Alive!" ) );
         long newNode = createLabeledNode( label );
         setProperties( newNode, aValues );
 
@@ -320,13 +317,10 @@ private void newTransaction() throws KernelException
             fail( "tx already opened" );
         }
         transaction = kernel.newTransaction( KernelTransaction.Type.implicit, LoginContext.AUTH_DISABLED );
-        statement = transaction.acquireStatement();
     }
 
     protected void commit() throws TransactionFailureException
     {
-        statement.close();
-        statement = null;
         transaction.success();
         try
         {
@@ -340,24 +334,24 @@ protected void commit() throws TransactionFailureException
 
     private long createLabeledNode( int labelId ) throws KernelException
     {
-        long node = statement.dataWriteOperations().nodeCreate();
-        statement.dataWriteOperations().nodeAddLabel( node, labelId );
+        long node = transaction.dataWrite().nodeCreate();
+        transaction.dataWrite().nodeAddLabel( node, labelId );
         return node;
     }
 
     private void addLabel( long nodeId, int labelId ) throws KernelException
     {
-        statement.dataWriteOperations().nodeAddLabel( nodeId, labelId );
+        transaction.dataWrite().nodeAddLabel( nodeId, labelId );
     }
 
     private void setProperty( long nodeId, int propertyId, Object value ) throws KernelException
     {
-        statement.dataWriteOperations().nodeSetProperty( nodeId, propertyId, Values.of( value ) );
+        transaction.dataWrite().nodeSetProperty( nodeId, propertyId, Values.of( value ) );
     }
 
     private long createNode() throws KernelException
     {
-        return statement.dataWriteOperations().nodeCreate();
+        return transaction.dataWrite().nodeCreate();
     }
 
     private long createNodeWithLabelAndProps( int labelId, Object[] propertyValues )

community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/AbstractNodeValueIndexCursorTest.java

@@ -21,9 +21,9 @@
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.internal.kernel.api.NodeValueIndexCursorTestBase;
-import org.neo4j.kernel.api.SchemaWriteOperations;
-import org.neo4j.kernel.api.Statement;
-import org.neo4j.kernel.api.TokenWriteOperations;
+import org.neo4j.internal.kernel.api.SchemaWrite;
+import org.neo4j.internal.kernel.api.TokenWrite;
+import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
@@ -35,16 +35,14 @@ protected void createCompositeIndex( GraphDatabaseService graphDb, String label,
             throws Exception
     {
         GraphDatabaseAPI internal = (GraphDatabaseAPI) graphDb;
-        try ( Statement statement = internal.getDependencyResolver()
-                .resolveDependency( ThreadToStatementContextBridge.class ).get() )
-        {
-            SchemaWriteOperations schemaWriteOperations =
-                    statement.schemaWriteOperations();
-            TokenWriteOperations token = statement.tokenWriteOperations();
-            schemaWriteOperations.indexCreate(
-                    SchemaDescriptorFactory.forLabel( token.labelGetOrCreateForName( "Person" ),
-                            token.propertyKeyGetOrCreateForName( "firstname" ),
-                            token.propertyKeyGetOrCreateForName( "surname" ) ) );
-        }
+        KernelTransaction ktx = internal.getDependencyResolver()
+                .resolveDependency( ThreadToStatementContextBridge.class )
+                .getKernelTransactionBoundToThisThread( true );
+        SchemaWrite schemaWrite = ktx.schemaWrite();
+        TokenWrite token = ktx.tokenWrite();
+        schemaWrite.indexCreate(
+                SchemaDescriptorFactory.forLabel( token.labelGetOrCreateForName( "Person" ),
+                        token.propertyKeyGetOrCreateForName( "firstname" ),
+                        token.propertyKeyGetOrCreateForName( "surname" ) ) );
     }
 }