Use kernel API in token creator

neo4j · Mar 20, 2018 · 785af8e · 785af8e
1 parent 1732729
commit 785af8e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultLabelIdCreator.java
@@ -21,10 +21,10 @@
 
 import java.util.function.Supplier;
 
-import org.neo4j.kernel.api.InwardKernel;
-import org.neo4j.kernel.api.Statement;
 import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException;
 import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException;
+import org.neo4j.kernel.api.InwardKernel;
+import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.store.id.IdType;
 
@@ -36,10 +36,10 @@ public DefaultLabelIdCreator( Supplier<InwardKernel> kernelSupplier, IdGenerator
     }
 
     @Override
-    protected int createKey( Statement statement, String name ) throws IllegalTokenNameException, TooManyLabelsException
+    protected int createKey( KernelTransaction transaction, String name ) throws IllegalTokenNameException, TooManyLabelsException
     {
         int id = (int) idGeneratorFactory.get( IdType.LABEL_TOKEN ).nextId();
-        statement.tokenWriteOperations().labelCreateForName( name, id );
+        transaction.tokenWrite().labelCreateForName( name, id );
         return id;
     }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultPropertyTokenCreator.java
@@ -21,9 +21,9 @@
 
 import java.util.function.Supplier;
 
-import org.neo4j.kernel.api.InwardKernel;
-import org.neo4j.kernel.api.Statement;
 import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException;
+import org.neo4j.kernel.api.InwardKernel;
+import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.store.id.IdType;
 
@@ -35,10 +35,10 @@ public DefaultPropertyTokenCreator( Supplier<InwardKernel> kernelSupplier, IdGen
     }
 
     @Override
-    protected int createKey( Statement statement, String name ) throws IllegalTokenNameException
+    protected int createKey( KernelTransaction transaction, String name ) throws IllegalTokenNameException
     {
         int id = (int) idGeneratorFactory.get( IdType.PROPERTY_KEY_TOKEN ).nextId();
-        statement.tokenWriteOperations().propertyKeyCreateForName( name, id );
+        transaction.tokenWrite().propertyKeyCreateForName( name, id );
         return id;
     }
 }
diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/core/DefaultRelationshipTypeCreator.java
@@ -21,9 +21,9 @@
 
 import java.util.function.Supplier;
 
-import org.neo4j.kernel.api.InwardKernel;
-import org.neo4j.kernel.api.Statement;
 import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException;
+import org.neo4j.kernel.api.InwardKernel;
+import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.store.id.IdType;
 
@@ -35,11 +35,10 @@ public DefaultRelationshipTypeCreator( Supplier<InwardKernel> kernelSupplier, Id
     }
 
     @Override
-    protected int createKey( Statement statement, String name ) throws IllegalTokenNameException
+    protected int createKey( KernelTransaction transaction, String name ) throws IllegalTokenNameException
     {
         int id = (int) idGeneratorFactory.get( IdType.RELATIONSHIP_TYPE_TOKEN ).nextId();
-        statement.tokenWriteOperations().relationshipTypeCreateForName( name,
+        transaction.tokenWrite().relationshipTypeCreateForName( name, id );
-                id );
         return id;
     }
 }
diff --git a/...nity/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java b/...nity/kernel/src/main/java/org/neo4j/kernel/impl/core/IsolatedTransactionTokenCreator.java
@@ -21,13 +21,13 @@
 
 import java.util.function.Supplier;
 
+import org.neo4j.internal.kernel.api.Transaction.Type;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
+import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException;
+import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException;
 import org.neo4j.kernel.api.InwardKernel;
 import org.neo4j.kernel.api.KernelTransaction;
-import org.neo4j.internal.kernel.api.Transaction.Type;
 import org.neo4j.kernel.api.Statement;
-import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException;
-import org.neo4j.internal.kernel.api.exceptions.schema.TooManyLabelsException;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 
 import static org.neo4j.internal.kernel.api.security.LoginContext.AUTH_DISABLED;
@@ -55,15 +55,15 @@ public synchronized int getOrCreate( String name ) throws KernelException
         InwardKernel kernel = kernelSupplier.get();
         try ( KernelTransaction transaction = kernel.newTransaction( Type.implicit, AUTH_DISABLED ) )
         {
-            try ( Statement statement = transaction.acquireStatement() )
+            try ( Statement ignore = transaction.acquireStatement() )
             {
-                int id = createKey( statement, name );
+                int id = createKey( transaction, name );
                 transaction.success();
                 return id;
             }
         }
     }
 
-    protected abstract int createKey( Statement statement, String name )
+    protected abstract int createKey( KernelTransaction transaction, String name )
             throws IllegalTokenNameException, TooManyLabelsException;
 }