Merge branch '4.1' of github.com:neo4j-contrib/neo4j-apoc-procedures …

…into 4.1
neo4j-contrib · Oct 1, 2021 · 5775c43 · 5775c43
2 parents 2996031 + fbc7334
commit 5775c43
Show file tree

Hide file tree

Showing 604 changed files with 12,611 additions and 8,007 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -27,4 +27,4 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew build --continue
+        run: ./gradlew build
diff --git a/40_notes.adoc b/40_notes.adoc
@@ -8,7 +8,7 @@ All freetext/fulltext stuff has been removed in favour of 3.5+ productized fullt
 apoc.index.relatedNodes (index feature ootb)
 apoc.index.orderedRange (index feature ootb)
 
-apoc.algo.* (use separate graph algo apackage instead)
+apoc.algo.* (use separate graph algo package instead)
 
 apoc.static.get (proc deleted, function exists)
 apoc.static.getAll (proc deleted, function exists)

diff --git a/build.gradle b/build.gradle
@@ -28,8 +28,7 @@ repositories {
     /*maven {  // this contains the neo4j 4.0.0-beta jars
     url "https://neo4j.bintray.com/community/"
 }*/
-    jcenter()
-    //mavenCentral()
+    mavenCentral()
     maven {
         url "https://repo.gradle.org/gradle/libs-releases"
     }
@@ -44,8 +43,7 @@ subprojects {
         /*maven {  // this contains the neo4j 4.0.0-beta jars
         url "https://neo4j.bintray.com/community/"
     }*/
-        jcenter()
-        //mavenCentral()
+        mavenCentral()
         maven {
             url "https://repo.gradle.org/gradle/libs-releases"
         }
@@ -86,7 +84,12 @@ subprojects {
             setFailOnNoMatchingTests(false)
         }
 
-        ignoreFailures(true)
+        // in TC we don't have the CI env so we can manage it in this way
+        if (System.env.TEAMCITY_VERSION != null) {
+            ignoreFailures(true)
+        }
+        testLogging.showStandardStreams = true
+        testLogging.exceptionFormat = 'full'
     }
 
     configurations {

diff --git a/core/build.gradle b/core/build.gradle
@@ -36,13 +36,12 @@ generateGrammarSource {
 }
 
 dependencies {
+
     testCompile project(':test-utils')
+    apt project(':processor')
 
-//    apt 'net.biville.florent:neo4j-sproc-compiler:1.2'  // temporarily disabled until byte[] is supported by sproc compiler
-    apt group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective	
+    apt group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective
     compile group: 'commons-codec', name: 'commons-codec', version: '1.14'
-    compileOnly group: 'com.sun.mail', name: 'javax.mail', version: '1.6.0'
-    testCompile group: 'com.sun.mail', name: 'javax.mail', version: '1.6.0'
     compile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'
     compile group: 'net.minidev', name: 'json-smart', version: '2.4.2'
     compile group: 'org.hdrhistogram', name: 'HdrHistogram', version: '2.1.9'
@@ -112,8 +111,8 @@ dependencies {
 
     testCompile group: 'org.apache.hive', name: 'hive-jdbc', version: '1.2.2', withoutServers
 
-    compileOnly group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '2.7.5', withoutServers
-    compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '2.7.5', withoutServers
+    compileOnly group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.3.1', withoutServers
+    compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.1', withoutServers
 
     compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
     // explicit update comomns.io version
@@ -135,8 +134,9 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
 
-    // there is a compatibility problem between the Guava Library used by HDFS, Google Cloud Storage and Reflections; the only version that fits for all is the following
-    compile group: 'com.google.guava', name: 'guava', version: '20.0'
+    compile group: 'com.google.guava', name: 'guava', version: '27.0-jre'
+
+    compile group: 'xerces', name: 'xercesImpl', version: '2.12.1'
 
     configurations.all {
         exclude group: 'org.slf4j', module: 'slf4j-nop'

diff --git a/core/src/main/java/apoc/CoreApocGlobalComponents.java b/core/src/main/java/apoc/CoreApocGlobalComponents.java
@@ -21,7 +21,8 @@ public Map<String,Lifecycle> getServices(GraphDatabaseAPI db, ApocExtensionFacto
                 dependencies.apocConfig(),
                 dependencies.log().getUserLog(TriggerHandler.class),
                 dependencies.globalProceduresRegistry(),
-                dependencies.pools())
+                dependencies.pools(),
+                dependencies.scheduler())
         );
     }
 

diff --git a/core/src/main/java/apoc/SystemLabels.java b/core/src/main/java/apoc/SystemLabels.java
@@ -8,5 +8,5 @@ public enum SystemLabels implements Label {
     Procedure,
     Function,
     ApocUuid,
-    ApocTrigger
+    ApocTriggerMeta, ApocTrigger
 }
diff --git a/core/src/main/java/apoc/algo/PathFinding.java b/core/src/main/java/apoc/algo/PathFinding.java
diff --git a/core/src/main/java/apoc/atomic/util/AtomicUtils.java b/core/src/main/java/apoc/atomic/util/AtomicUtils.java
@@ -10,8 +10,12 @@ public class AtomicUtils {
 	public static Number sum(Number oldValue, Number number){
 		if(oldValue instanceof Long)
 			return oldValue.longValue() + number.longValue();
+		if(oldValue instanceof Integer)
+			return oldValue.intValue() + number.intValue();
 		if(oldValue instanceof Double)
 			return oldValue.doubleValue() + number.doubleValue();
+		if(oldValue instanceof Float)
+			return oldValue.floatValue() + number.floatValue();
 		if(oldValue instanceof Short)
 			return oldValue.shortValue() + number.shortValue();
 		if(oldValue instanceof Byte)
@@ -22,8 +26,12 @@ public static Number sum(Number oldValue, Number number){
 	public static Number sub(Number oldValue, Number number){
 		if(oldValue instanceof Long)
 			return oldValue.longValue() - number.longValue();
+		if(oldValue instanceof Integer)
+			return oldValue.intValue() - number.intValue();
 		if(oldValue instanceof Double)
 			return oldValue.doubleValue() - number.doubleValue();
+		if(oldValue instanceof Float)
+			return oldValue.floatValue() - number.floatValue();
 		if(oldValue instanceof Short)
 			return oldValue.shortValue() - number.shortValue();
 		if(oldValue instanceof Byte)

diff --git a/core/src/main/java/apoc/coll/Coll.java b/core/src/main/java/apoc/coll/Coll.java
@@ -3,6 +3,7 @@
 import apoc.result.ListResult;
 import com.google.common.util.concurrent.AtomicDouble;
 import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation;
 import org.apache.commons.math3.util.Combinations;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
@@ -51,6 +52,16 @@ public class Coll {
 
     @Context public Transaction tx;
 
+    @UserFunction
+    @Description("apoc.coll.stdev(list, isBiasCorrected) - returns the sample or population standard deviation with isBiasCorrected true or false respectively. For example apoc.coll.stdev([10, 12, 23]) return 7")
+    public Number stdev(@Name("list") List<Number> list, @Name(value = "isBiasCorrected", defaultValue = "true") boolean isBiasCorrected) {
+        if (list == null || list.isEmpty()) return null;
+        final double stdev = new StandardDeviation(isBiasCorrected)
+                .evaluate(list.stream().mapToDouble(Number::doubleValue).toArray());
+        if ((long) stdev == stdev) return (long) stdev;
+        return stdev;
+    }
+
     @UserFunction
     @Description("apoc.coll.runningTotal(list1) - returns an accumulative array. For example apoc.coll.runningTotal([1,2,3.5]) return [1,3,6.5]")
     public List<Number> runningTotal(@Name("list") List<Number> list) {

diff --git a/core/src/main/java/apoc/convert/Json.java b/core/src/main/java/apoc/convert/Json.java
@@ -82,9 +82,9 @@ private Map<String, Object> mapWithOptionalProps(Map<String,Object> mapEntity, M
     public org.neo4j.graphdb.GraphDatabaseService db;
 
     @UserFunction("apoc.json.path")
-    @Description("apoc.json.path('{json}','json-path')")
-    public Object path(@Name("json") String json, @Name(value = "path",defaultValue = "$") String path) {
-        return JsonUtil.parse(json,path,Object.class);
+    @Description("apoc.json.path('{json}' [,'json-path' , 'path-options'])")
+    public Object path(@Name("json") String json, @Name(value = "path",defaultValue = "$") String path, @Name(value = "pathOptions", defaultValue = "null") List<String> pathOptions) {
+        return JsonUtil.parse(json, path, Object.class, pathOptions);
     }
     @UserFunction("apoc.convert.toJson")
     @Description("apoc.convert.toJson([1,2,3]) or toJson({a:42,b:\"foo\",c:[1,2,3]}) or toJson(NODE/REL/PATH)")
@@ -107,29 +107,29 @@ public void setJsonProperty(@Name("node") Node node, @Name("key") String key, @N
     }
 
     @UserFunction// ("apoc.json.getJsonProperty")
-    @Description("apoc.convert.getJsonProperty(node,key[,'json-path']) - converts serialized JSON in property back to original object")
-    public Object getJsonProperty(@Name("node") Node node, @Name("key") String key,@Name(value = "path",defaultValue = "") String path) {
+    @Description("apoc.convert.getJsonProperty(node,key[,'json-path', 'path-options']) - converts serialized JSON in property back to original object")
+    public Object getJsonProperty(@Name("node") Node node, @Name("key") String key,@Name(value = "path",defaultValue = "") String path, @Name(value = "pathOptions", defaultValue = "null") List<String> pathOptions) {
         String value = (String) node.getProperty(key, null);
-        return JsonUtil.parse(value, path, Object.class);
+        return JsonUtil.parse(value, path, Object.class, pathOptions);
     }
 
     @UserFunction// ("apoc.json.getJsonPropertyMap")
-    @Description("apoc.convert.getJsonPropertyMap(node,key[,'json-path']) - converts serialized JSON in property back to map")
-    public Map<String,Object> getJsonPropertyMap(@Name("node") Node node, @Name("key") String key,@Name(value = "path",defaultValue = "") String path) {
+    @Description("apoc.convert.getJsonPropertyMap(node,key[,'json-path', 'path-options']) - converts serialized JSON in property back to map")
+    public Map<String,Object> getJsonPropertyMap(@Name("node") Node node, @Name("key") String key,@Name(value = "path",defaultValue = "") String path, @Name(value = "pathOptions", defaultValue = "null") List<String> pathOptions) {
         String value = (String) node.getProperty(key, null);
-        return JsonUtil.parse(value, path, Map.class);
+        return JsonUtil.parse(value, path, Map.class, pathOptions);
     }
 
     @UserFunction
-    @Description("apoc.convert.fromJsonMap('{\"a\":42,\"b\":\"foo\",\"c\":[1,2,3]}'[,'json-path'])")
-    public Map<String,Object> fromJsonMap(@Name("map") String value,@Name(value = "path",defaultValue = "") String path) {
-        return JsonUtil.parse(value, path, Map.class);
+    @Description("apoc.convert.fromJsonMap('{\"a\":42,\"b\":\"foo\",\"c\":[1,2,3]}'[,'json-path', 'path-options'])")
+    public Map<String,Object> fromJsonMap(@Name("map") String value,@Name(value = "path",defaultValue = "") String path, @Name(value = "pathOptions", defaultValue = "null") List<String> pathOptions) {
+        return JsonUtil.parse(value, path, Map.class, pathOptions);
     }
 
     @UserFunction
-    @Description("apoc.convert.fromJsonList('[1,2,3]'[,'json-path'])")
-    public List<Object> fromJsonList(@Name("list") String value, @Name(value = "path",defaultValue = "") String path) {
-        return JsonUtil.parse(value, path, List.class);
+    @Description("apoc.convert.fromJsonList('[1,2,3]'[,'json-path', 'path-options'])")
+    public List<Object> fromJsonList(@Name("list") String value, @Name(value = "path",defaultValue = "") String path, @Name(value = "pathOptions", defaultValue = "null") List<String> pathOptions) {
+        return JsonUtil.parse(value, path, List.class, pathOptions);
     }
 
     @Procedure("apoc.convert.toTree")

diff --git a/core/src/main/java/apoc/create/Create.java b/core/src/main/java/apoc/create/Create.java
@@ -220,6 +220,30 @@ public Stream<VirtualPathResult> virtualPath(@Name("labelsN") List<String> label
         return Stream.of(new VirtualPathResult(from, rel, to));
     }
 
+    @Procedure
+    @Description("apoc.create.clonePathToVirtual")
+    public Stream<PathResult> clonePathToVirtual(@Name("path") Path path) {
+        return Stream.of(createVirtualPath(path));
+    }
+
+    @Procedure
+    @Description("apoc.create.clonePathsToVirtual")
+    public Stream<PathResult> clonePathsToVirtual(@Name("paths") List<Path> paths) {
+        return paths.stream().map(this::createVirtualPath);
+    }
+
+    private PathResult createVirtualPath(Path path) {
+        final Iterable<Relationship> relationships = path.relationships();
+        final Node first = path.startNode();
+        VirtualPath virtualPath = new VirtualPath(new VirtualNode(first, Iterables.asList(first.getPropertyKeys())));
+        for (Relationship rel : relationships) {
+            VirtualNode start = VirtualNode.from(rel.getStartNode());
+            VirtualNode end = VirtualNode.from(rel.getEndNode());
+            virtualPath.addRel(VirtualRelationship.from(start, end, rel));
+        }
+        return new PathResult(virtualPath);
+    }
+
     private <T extends Entity> T setProperties(T pc, Map<String, Object> p) {
         if (p == null) return pc;
         for (Map.Entry<String, Object> entry : p.entrySet()) {