Extract Progression interface

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/AllNodeProgression.java

@@ -22,7 +22,7 @@
 import org.neo4j.kernel.api.StatementConstants;
 import org.neo4j.kernel.impl.store.NodeStore;
 
-public class AllNodeProgression implements NodeCursor.Progression
+public class AllNodeProgression implements Progression
 {
     private final AllIdIterator allIdIterator;
 

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/NodeCursor.java

@@ -37,28 +37,15 @@
 import org.neo4j.storageengine.api.txstate.ReadableTransactionState;
 
 import static org.neo4j.collection.primitive.PrimitiveIntCollections.asSet;
-import static org.neo4j.kernel.impl.api.store.NodeCursor.Progression.Mode.APPEND;
-import static org.neo4j.kernel.impl.api.store.NodeCursor.Progression.Mode.FETCH;
+import static org.neo4j.kernel.impl.api.store.Progression.Mode.APPEND;
+import static org.neo4j.kernel.impl.api.store.Progression.Mode.FETCH;
 import static org.neo4j.kernel.impl.locking.LockService.NO_LOCK;
 import static org.neo4j.kernel.impl.locking.LockService.NO_LOCK_SERVICE;
 import static org.neo4j.kernel.impl.store.record.RecordLoad.CHECK;
 import static org.neo4j.kernel.impl.util.IoPrimitiveUtils.safeCastLongToInt;
 
 public class NodeCursor implements NodeItem, Cursor<NodeItem>
 {
-    public interface Progression
-    {
-        enum Mode
-        {
-            APPEND,
-            FETCH
-        }
-
-        long nextId();
-
-        Mode mode();
-    }
-
     private final NodeRecord nodeRecord;
     private final Consumer<NodeCursor> instanceCache;
     private final RecordCursors recordCursors;

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/Progression.java

@@ -0,0 +1,33 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.kernel.impl.api.store;
+
+public interface Progression
+{
+    enum Mode
+    {
+        APPEND,
+        FETCH
+    }
+
+    long nextId();
+
+    Mode mode();
+}

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SingleNodeProgression.java

@@ -21,7 +21,7 @@
 
 import org.neo4j.kernel.api.StatementConstants;
 
-public class SingleNodeProgression implements NodeCursor.Progression
+public class SingleNodeProgression implements Progression
 {
     private long nodeId;
 

community/kernel/src/test/java/org/neo4j/kernel/impl/api/store/NodeCursorTest.java

@@ -36,7 +36,7 @@
 import org.neo4j.cursor.Cursor;
 import org.neo4j.kernel.api.StatementConstants;
 import org.neo4j.kernel.impl.api.state.TxState;
-import org.neo4j.kernel.impl.api.store.NodeCursor.Progression.Mode;
+import org.neo4j.kernel.impl.api.store.Progression.Mode;
 import org.neo4j.kernel.impl.locking.Lock;
 import org.neo4j.kernel.impl.store.RecordCursor;
 import org.neo4j.kernel.impl.store.RecordCursors;
@@ -54,8 +54,8 @@
 import static org.mockito.Mockito.when;
 import static org.neo4j.collection.primitive.PrimitiveIntCollections.asArray;
 import static org.neo4j.collection.primitive.PrimitiveIntCollections.asSet;
-import static org.neo4j.kernel.impl.api.store.NodeCursor.Progression.Mode.APPEND;
-import static org.neo4j.kernel.impl.api.store.NodeCursor.Progression.Mode.FETCH;
+import static org.neo4j.kernel.impl.api.store.Progression.Mode.APPEND;
+import static org.neo4j.kernel.impl.api.store.Progression.Mode.FETCH;
 import static org.neo4j.kernel.impl.locking.LockService.NO_LOCK_SERVICE;
 import static org.neo4j.kernel.impl.store.record.RecordLoad.CHECK;
 import static org.neo4j.kernel.impl.transaction.state.NodeLabelsFieldTest.inlinedLabelsLongRepresentation;
@@ -224,7 +224,7 @@ public void shouldCallTheConsumerOnClose()
         MutableBoolean called = new MutableBoolean();
         NodeCursor cursor =
                 new NodeCursor( nodeRecord, c -> called.setTrue(), recordCursors, NO_LOCK_SERVICE );
-        cursor.init( mock( NodeCursor.Progression.class ), mock( ReadableTransactionState.class ) );
+        cursor.init( mock( Progression.class ), mock( ReadableTransactionState.class ) );
         assertFalse( called.booleanValue() );
 
         cursor.close();
@@ -523,9 +523,9 @@ Cursor<NodeItem> initialize( NodeCursor cursor, RecordCursor<NodeRecord> recordC
             return cursor.init( createProgression( ops, mode ), state );
         }
 
-        private NodeCursor.Progression createProgression( Operation[] ops, Mode mode )
+        private Progression createProgression( Operation[] ops, Mode mode )
         {
-            return new NodeCursor.Progression()
+            return new Progression()
             {
                 private int i = 0;