[VP7iRcuF] Introduce helper methods from neo4j (#187)

* Copy over relevant parts of org.neo4j.internal.helpers.collection to reduce dependencies of internal Neo4j APIs

* Use Pair from apache instead of Neo4j

* Remove unused benchmarking code related to auto-indexing which does not exist in Neo4j anymore.

Author: Lojjs

common/build.gradle

@@ -84,6 +84,7 @@ dependencies {
     testImplementation group: 'org.neo4j', name: 'neo4j-kernel', version: neo4jVersionEffective, classifier: "tests"
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
+    testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.1'
 
     configurations.all {
         exclude group: 'org.slf4j', module: 'slf4j-nop'

common/src/jmh/java/apoc/AsyncIndexingGraphDatabaseState.java

@@ -1,13 +1,13 @@
 package apoc.algo;
 
 import apoc.path.RelationshipTypeAndDirections;
+import org.apache.commons.lang3.tuple.Pair;
 import org.neo4j.graphalgo.EstimateEvaluator;
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.PathExpander;
 import org.neo4j.graphdb.PathExpanderBuilder;
 import org.neo4j.graphdb.RelationshipType;
-import org.neo4j.internal.helpers.collection.Pair;
 import org.neo4j.values.storable.PointValue;
 
 public class PathFindingUtils {
@@ -62,17 +62,17 @@ public static PathExpander<Double> buildPathExpander(String relationshipsAndDire
         PathExpanderBuilder builder = PathExpanderBuilder.empty();
         for (Pair<RelationshipType, Direction> pair : RelationshipTypeAndDirections
                 .parse(relationshipsAndDirections)) {
-            if (pair.first() == null) {
-                if (pair.other() == null) {
+            if (pair.getLeft() == null) {
+                if (pair.getRight() == null) {
                     builder = PathExpanderBuilder.allTypesAndDirections();
                 } else {
-                    builder = PathExpanderBuilder.allTypes(pair.other());
+                    builder = PathExpanderBuilder.allTypes(pair.getRight());
                 }
             } else {
-                if (pair.other() == null) {
-                    builder = builder.add(pair.first());
+                if (pair.getRight() == null) {
+                    builder = builder.add(pair.getLeft());
                 } else {
-                    builder = builder.add(pair.first(), pair.other());
+                    builder = builder.add(pair.getLeft(), pair.getRight());
                 }
             }
         }

common/src/jmh/java/apoc/GraphDatabaseState.java

@@ -1,7 +1,7 @@
 package apoc.convert;
 
-import org.neo4j.internal.helpers.collection.Iterators;
-
+import apoc.util.collection.Iterables;
+import apoc.util.collection.Iterators;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,8 +19,8 @@ public static List convertToList(Object list) {
         if (list == null) return null;
         else if (list instanceof List) return (List) list;
         else if (list instanceof Collection) return new ArrayList((Collection)list);
-        else if (list instanceof Iterable) return Iterators.addToCollection(((Iterable)list).iterator(),(List)new ArrayList<>(100));
-        else if (list instanceof Iterator) return Iterators.addToCollection((Iterator)list,(List)new ArrayList<>(100));
+        else if (list instanceof Iterable) return Iterables.asList((Iterable)list);
+        else if (list instanceof Iterator) return Iterators.asList((Iterator)list);
         else if (list.getClass().isArray()) {
             final Object[] objectArray;
             if (list.getClass().getComponentType().isPrimitive()) {

common/src/jmh/java/apoc/IndexTrackingGraphDatabaseState.java

@@ -4,6 +4,7 @@
 import apoc.export.util.ExportFormat;
 import apoc.export.util.Reporter;
 import apoc.util.Util;
+import apoc.util.collection.Iterables;
 import org.apache.commons.lang3.StringUtils;
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.GraphDatabaseService;
@@ -12,7 +13,6 @@
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.Transaction;
-import org.neo4j.internal.helpers.collection.Iterables;
 
 import java.io.PrintWriter;
 import java.util.*;

common/src/jmh/java/apoc/IndexUpdateBenchmarks.java

@@ -2,10 +2,10 @@
 
 import apoc.export.util.FormatUtils;
 import apoc.util.Util;
+import apoc.util.collection.Iterables;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
-import org.neo4j.internal.helpers.collection.Iterables;
 import org.neo4j.values.storable.DurationValue;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;