Moves DirectRecordAccess+Set to .internal

community/kernel/pom.xml

@@ -145,6 +145,7 @@ the relevant Commercial Agreement.
           </includes>
           <excludes>
             <exclude>org/neo4j/unsafe/batchinsert/DirectRecordAccess</exclude>
+            <exclude>org/neo4j/unsafe/batchinsert/DirectRecordAccessSet</exclude>
           </excludes>
         </configuration>
       </plugin>

community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/state/RecordChanges.java

@@ -31,11 +31,8 @@
  * deciding when to make a record heavy and when to consider it changed for inclusion in the
  * transaction as a command.
  *
- * @author Mattias Persson
- *
- * @param <KEY>
- * @param <RECORD>
- * @param <ADDITIONAL>
+ * @param <RECORD> type of record
+ * @param <ADDITIONAL> additional payload
  */
 public class RecordChanges<RECORD,ADDITIONAL> implements RecordAccess<RECORD,ADDITIONAL>
 {

community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java

@@ -160,7 +160,6 @@
 import org.neo4j.storageengine.api.schema.SchemaRule;
 import org.neo4j.unsafe.batchinsert.BatchInserter;
 import org.neo4j.unsafe.batchinsert.BatchRelationship;
-import org.neo4j.unsafe.batchinsert.DirectRecordAccessSet;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
 

community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/DirectRecordAccess.java → community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/DirectRecordAccess.java

@@ -17,10 +17,9 @@
  * 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.unsafe.batchinsert;
+package org.neo4j.unsafe.batchinsert.internal;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -234,7 +233,7 @@ public void commit()
         }
 
         List<DirectRecordProxy> directRecordProxies = new ArrayList<>( batch.values() );
-        Collections.sort(directRecordProxies, ( o1, o2 ) -> Long.compare( -o1.getKey(), o2.getKey() ) );
+        directRecordProxies.sort( ( o1, o2 ) -> Long.compare( -o1.getKey(), o2.getKey() ) );
         for ( DirectRecordProxy proxy : directRecordProxies )
         {
             proxy.store();

community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/DirectRecordAccessSet.java → community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/DirectRecordAccessSet.java

@@ -17,7 +17,7 @@
  * 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.unsafe.batchinsert;
+package org.neo4j.unsafe.batchinsert.internal;
 
 import org.neo4j.kernel.impl.store.NeoStores;
 import org.neo4j.kernel.impl.store.PropertyStore;

community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/PropertyCreatorTest.java

@@ -32,7 +32,7 @@
 import org.neo4j.kernel.impl.store.record.Record;
 import org.neo4j.kernel.impl.transaction.state.RecordAccess.Loader;
 import org.neo4j.kernel.impl.transaction.state.RecordAccess.RecordProxy;
-import org.neo4j.unsafe.batchinsert.DirectRecordAccess;
+import org.neo4j.unsafe.batchinsert.internal.DirectRecordAccess;
 import org.neo4j.unsafe.impl.batchimport.store.BatchingIdSequence;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;

community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipCreatorTest.java

@@ -52,7 +52,7 @@
 import org.neo4j.storageengine.api.schema.SchemaRule;
 import org.neo4j.test.rule.DatabaseRule;
 import org.neo4j.test.rule.ImpermanentDatabaseRule;
-import org.neo4j.unsafe.batchinsert.DirectRecordAccessSet;
+import org.neo4j.unsafe.batchinsert.internal.DirectRecordAccessSet;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/RelationshipGroupGetterTest.java

@@ -38,7 +38,7 @@
 import org.neo4j.logging.NullLogProvider;
 import org.neo4j.test.rule.PageCacheRule;
 import org.neo4j.test.rule.fs.EphemeralFileSystemRule;
-import org.neo4j.unsafe.batchinsert.DirectRecordAccess;
+import org.neo4j.unsafe.batchinsert.internal.DirectRecordAccess;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;

community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchedFlushStrategyTest.java

@@ -22,8 +22,6 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import org.neo4j.unsafe.batchinsert.DirectRecordAccessSet;
-
 public class BatchedFlushStrategyTest
 {