Prefix cursor implementations with Default

community/cypher/interpreted-runtime/src/test/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionBoundQueryContextTest.scala

@@ -42,7 +42,7 @@ import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge
 import org.neo4j.kernel.impl.coreapi.{InternalTransaction, PropertyContainerLocker}
 import org.neo4j.kernel.impl.factory.CanWrite
 import org.neo4j.kernel.impl.locking.LockTracer
-import org.neo4j.kernel.impl.newapi.Cursors
+import org.neo4j.kernel.impl.newapi.DefaultCursors
 import org.neo4j.kernel.impl.proc.Procedures
 import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo
 import org.neo4j.kernel.impl.query.{Neo4jTransactionalContext, Neo4jTransactionalContextFactory}
@@ -86,7 +86,7 @@ class TransactionBoundQueryContextTest extends CypherFunSuite {
 
     val bridge = mock[ThreadToStatementContextBridge]
     val transaction = mock[KernelTransaction]
-    when(transaction.cursors()).thenReturn(new Cursors())
+    when(transaction.cursors()).thenReturn(new DefaultCursors())
     when(bridge.getKernelTransactionBoundToThisThread(true)).thenReturn(transaction)
     val tc = new Neo4jTransactionalContext(graph, null, null, bridge, locker, outerTx, statement, null)
     val transactionalContext = TransactionalContextWrapper(tc)
@@ -109,7 +109,7 @@ class TransactionBoundQueryContextTest extends CypherFunSuite {
     when(outerTx.securityContext()).thenReturn(AUTH_DISABLED)
     val bridge = mock[ThreadToStatementContextBridge]
     val transaction = mock[KernelTransaction]
-    when(transaction.cursors()).thenReturn(new Cursors())
+    when(transaction.cursors()).thenReturn(new DefaultCursors())
     when(bridge.getKernelTransactionBoundToThisThread(true)).thenReturn(transaction)
     val tc = new Neo4jTransactionalContext(graph, null, null, bridge, locker, outerTx, statement, null)
     val transactionalContext = TransactionalContextWrapper(tc)
@@ -212,7 +212,7 @@ class TransactionBoundQueryContextTest extends CypherFunSuite {
     // GIVEN
     val bridge = mock[ThreadToStatementContextBridge]
     val transaction = mock[KernelTransaction]
-    when(transaction.cursors()).thenReturn(new Cursors())
+    when(transaction.cursors()).thenReturn(new DefaultCursors())
     when(bridge.getKernelTransactionBoundToThisThread(true)).thenReturn(transaction)
     val tc = new Neo4jTransactionalContext(graph, null, null, bridge, locker, outerTx, statement, null)
     val transactionalContext = TransactionalContextWrapper(tc)

community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java

@@ -82,8 +82,8 @@
 import org.neo4j.kernel.impl.locking.ReentrantLockService;
 import org.neo4j.kernel.impl.locking.StatementLocksFactory;
 import org.neo4j.kernel.impl.logging.LogService;
-import org.neo4j.kernel.impl.newapi.Cursors;
 import org.neo4j.kernel.impl.newapi.KernelToken;
+import org.neo4j.kernel.impl.newapi.DefaultCursors;
 import org.neo4j.kernel.impl.proc.Procedures;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.id.IdController;
@@ -669,7 +669,7 @@ private NeoStoreKernelModule buildKernel( LogFiles logFiles, TransactionAppender
                 constraintIndexCreator, statementOperationParts, schemaWriteGuard, transactionHeaderInformationFactory,
                 transactionCommitProcess, indexConfigStore, explicitIndexProviderLookup, hooks, transactionMonitor,
                 availabilityGuard, tracers, storageEngine, procedures, transactionIdStore, clock,
-                cpuClockRef, heapAllocationRef, accessCapability, token, new Cursors(), autoIndexing, explicitIndexStore ) );
+                cpuClockRef, heapAllocationRef, accessCapability, token, new DefaultCursors(), autoIndexing, explicitIndexStore ) );
 
         buildTransactionMonitor( kernelTransactions, clock, config );
 

community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java

@@ -74,7 +74,7 @@
 import org.neo4j.kernel.impl.locking.Locks;
 import org.neo4j.kernel.impl.locking.StatementLocks;
 import org.neo4j.kernel.impl.newapi.AllStoreHolder;
-import org.neo4j.kernel.impl.newapi.Cursors;
+import org.neo4j.kernel.impl.newapi.DefaultCursors;
 import org.neo4j.kernel.impl.newapi.IndexTxStateUpdater;
 import org.neo4j.kernel.impl.newapi.KernelToken;
 import org.neo4j.kernel.impl.newapi.Operations;
@@ -180,7 +180,7 @@ public KernelTransactionImplementation( StatementOperationParts statementOperati
             TransactionMonitor transactionMonitor, Supplier<ExplicitIndexTransactionState> explicitIndexTxStateSupplier,
             Pool<KernelTransactionImplementation> pool, Clock clock, AtomicReference<CpuClock> cpuClockRef, AtomicReference<HeapAllocation> heapAllocationRef,
             TransactionTracer transactionTracer, LockTracer lockTracer, PageCursorTracerSupplier cursorTracerSupplier,
-            StorageEngine storageEngine, AccessCapability accessCapability, KernelToken token, Cursors cursors, AutoIndexing autoIndexing,
+            StorageEngine storageEngine, AccessCapability accessCapability, KernelToken token, DefaultCursors cursors, AutoIndexing autoIndexing,
             ExplicitIndexStore explicitIndexStore )
     {
         this.statementOperations = statementOperations;

community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java

@@ -45,7 +45,7 @@
 import org.neo4j.kernel.impl.index.IndexConfigStore;
 import org.neo4j.kernel.impl.locking.StatementLocks;
 import org.neo4j.kernel.impl.locking.StatementLocksFactory;
-import org.neo4j.kernel.impl.newapi.Cursors;
+import org.neo4j.kernel.impl.newapi.DefaultCursors;
 import org.neo4j.kernel.impl.newapi.KernelToken;
 import org.neo4j.kernel.impl.proc.Procedures;
 import org.neo4j.kernel.impl.store.TransactionId;
@@ -93,7 +93,7 @@ public class KernelTransactions extends LifecycleAdapter implements Supplier<Ker
     private final SystemNanoClock clock;
     private final ReentrantReadWriteLock newTransactionsLock = new ReentrantReadWriteLock();
     private final MonotonicCounter userTransactionIdCounter = MonotonicCounter.newAtomicMonotonicCounter();
-    private final Cursors cursors;
+    private final DefaultCursors cursors;
     private final KernelToken token;
     private final AutoIndexing autoIndexing;
     private final ExplicitIndexStore explicitIndexStore;
@@ -135,7 +135,7 @@ public KernelTransactions( StatementLocksFactory statementLocksFactory,
             StorageEngine storageEngine, Procedures procedures, TransactionIdStore transactionIdStore,
             SystemNanoClock clock,
             AtomicReference<CpuClock> cpuClockRef, AtomicReference<HeapAllocation> heapAllocationRef, AccessCapability accessCapability,
-            KernelToken token, Cursors cursors,
+            KernelToken token, DefaultCursors cursors,
             AutoIndexing autoIndexing,
             ExplicitIndexStore explicitIndexStore )
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/AllStoreHolder.java

@@ -28,6 +28,7 @@
 import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.internal.kernel.api.CapableIndexReference;
 import org.neo4j.internal.kernel.api.IndexCapability;
+import org.neo4j.internal.kernel.api.IndexReference;
 import org.neo4j.internal.kernel.api.InternalIndexState;
 import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
@@ -79,7 +80,7 @@ public class AllStoreHolder extends Read
     public AllStoreHolder( StorageEngine engine,
             StorageStatement statement,
             KernelTransactionImplementation ktx,
-            Cursors cursors,
+            DefaultCursors cursors,
             ExplicitIndexStore explicitIndexStore )
     {
         super( cursors, ktx );
@@ -121,7 +122,7 @@ long graphPropertiesReference()
     }
 
     @Override
-    IndexReader indexReader( org.neo4j.internal.kernel.api.IndexReference index ) throws IndexNotFoundKernelException
+    IndexReader indexReader( IndexReference index ) throws IndexNotFoundKernelException
     {
         IndexDescriptor indexDescriptor = index.isUnique() ?
                                           IndexDescriptorFactory.uniqueForLabel( index.label(), index.properties() ) :
@@ -346,15 +347,15 @@ long relationshipHighMark()
     }
 
     @Override
-    TextValue string( PropertyCursor cursor, long reference, PageCursor page )
+    TextValue string( DefaultPropertyCursor cursor, long reference, PageCursor page )
     {
         ByteBuffer buffer = cursor.buffer = properties.loadString( reference, cursor.buffer, page );
         buffer.flip();
         return Values.stringValue( UTF8.decode( buffer.array(), 0, buffer.limit() ) );
     }
 
     @Override
-    ArrayValue array( PropertyCursor cursor, long reference, PageCursor page )
+    ArrayValue array( DefaultPropertyCursor cursor, long reference, PageCursor page )
     {
         ByteBuffer buffer = cursor.buffer = properties.loadArray( reference, cursor.buffer, page );
         buffer.flip();

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultCapableIndexReference.java

@@ -19,12 +19,13 @@
  */
 package org.neo4j.kernel.impl.newapi;
 
+import org.neo4j.internal.kernel.api.CapableIndexReference;
 import org.neo4j.internal.kernel.api.IndexCapability;
 import org.neo4j.internal.kernel.api.IndexOrder;
 import org.neo4j.internal.kernel.api.IndexValueCapability;
 import org.neo4j.values.storable.ValueGroup;
 
-class DefaultCapableIndexReference implements org.neo4j.internal.kernel.api.CapableIndexReference
+class DefaultCapableIndexReference implements CapableIndexReference
 {
     private final int label;
     private final int[] properties;

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultCursors.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2002-2018 "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 <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.kernel.impl.newapi;
+
+import org.neo4j.internal.kernel.api.CursorFactory;
+
+public class DefaultCursors implements CursorFactory
+{
+    @Override
+    public DefaultNodeCursor allocateNodeCursor()
+    {
+        return new DefaultNodeCursor( );
+    }
+
+    @Override
+    public DefaultRelationshipScanCursor allocateRelationshipScanCursor()
+    {
+        return new DefaultRelationshipScanCursor( );
+    }
+
+    @Override
+    public DefaultRelationshipTraversalCursor allocateRelationshipTraversalCursor()
+    {
+        return new DefaultRelationshipTraversalCursor( allocateRelationshipGroupCursor() );
+    }
+
+    @Override
+    public DefaultPropertyCursor allocatePropertyCursor()
+    {
+        return new DefaultPropertyCursor( );
+    }
+
+    @Override
+    public DefaultRelationshipGroupCursor allocateRelationshipGroupCursor()
+    {
+        return new DefaultRelationshipGroupCursor( );
+    }
+
+    @Override
+    public DefaultNodeValueIndexCursor allocateNodeValueIndexCursor()
+    {
+        return new DefaultNodeValueIndexCursor( );
+    }
+
+    @Override
+    public DefaultNodeLabelIndexCursor allocateNodeLabelIndexCursor()
+    {
+        return new DefaultNodeLabelIndexCursor( );
+    }
+
+    @Override
+    public DefaultNodeExplicitIndexCursor allocateNodeExplicitIndexCursor()
+    {
+        return new DefaultNodeExplicitIndexCursor( );
+    }
+
+    @Override
+    public DefaultRelationshipExplicitIndexCursor allocateRelationshipExplicitIndexCursor()
+    {
+        return new DefaultRelationshipExplicitIndexCursor( );
+    }
+}

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeCursor.java → community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeCursor.java

@@ -24,6 +24,7 @@
 import org.neo4j.collection.primitive.Primitive;
 import org.neo4j.collection.primitive.PrimitiveIntSet;
 import org.neo4j.internal.kernel.api.LabelSet;
+import org.neo4j.internal.kernel.api.NodeCursor;
 import org.neo4j.internal.kernel.api.PropertyCursor;
 import org.neo4j.internal.kernel.api.RelationshipGroupCursor;
 import org.neo4j.internal.kernel.api.RelationshipTraversalCursor;
@@ -36,7 +37,7 @@
 
 import static java.util.Collections.emptySet;
 
-class NodeCursor extends NodeRecord implements org.neo4j.internal.kernel.api.NodeCursor
+class DefaultNodeCursor extends NodeRecord implements NodeCursor
 {
     private Read read;
     private RecordCursor<DynamicRecord> labelCursor;
@@ -46,7 +47,7 @@ class NodeCursor extends NodeRecord implements org.neo4j.internal.kernel.api.Nod
     private HasChanges hasChanges = HasChanges.MAYBE;
     private Set<Long> addedNodes;
 
-    NodeCursor()
+    DefaultNodeCursor()
     {
         super( NO_ID );
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeExplicitIndexCursor.java → community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeExplicitIndexCursor.java

@@ -24,15 +24,15 @@
 
 import static org.neo4j.kernel.impl.store.record.AbstractBaseRecord.NO_ID;
 
-class NodeExplicitIndexCursor extends IndexCursor<ExplicitIndexProgressor>
+class DefaultNodeExplicitIndexCursor extends IndexCursor<ExplicitIndexProgressor>
         implements org.neo4j.internal.kernel.api.NodeExplicitIndexCursor, ExplicitClient
 {
     private Read read;
     private int expectedSize;
     private long node;
     private float score;
 
-    NodeExplicitIndexCursor()
+    DefaultNodeExplicitIndexCursor()
     {
         node = NO_ID;
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/NodeLabelIndexCursor.java → community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/DefaultNodeLabelIndexCursor.java

@@ -26,23 +26,24 @@
 import org.neo4j.collection.primitive.PrimitiveLongIterator;
 import org.neo4j.internal.kernel.api.LabelSet;
 import org.neo4j.internal.kernel.api.NodeCursor;
+import org.neo4j.internal.kernel.api.NodeLabelIndexCursor;
 import org.neo4j.kernel.impl.index.labelscan.LabelScanValueIndexProgressor;
 import org.neo4j.storageengine.api.schema.IndexProgressor;
 import org.neo4j.storageengine.api.schema.IndexProgressor.NodeLabelClient;
 import org.neo4j.storageengine.api.txstate.ReadableDiffSets;
 
 import static org.neo4j.kernel.impl.store.record.AbstractBaseRecord.NO_ID;
 
-class NodeLabelIndexCursor extends IndexCursor<LabelScanValueIndexProgressor>
-        implements org.neo4j.internal.kernel.api.NodeLabelIndexCursor, NodeLabelClient
+class DefaultNodeLabelIndexCursor extends IndexCursor<LabelScanValueIndexProgressor>
+        implements NodeLabelIndexCursor, NodeLabelClient
 {
     private Read read;
     private long node;
     private LabelSet labels;
     private PrimitiveLongIterator added;
     private Set<Long> removed;
 
-    NodeLabelIndexCursor()
+    DefaultNodeLabelIndexCursor()
     {
         node = NO_ID;
     }