Skip to content

Commit bd555ee

Browse files
committed
Merge remote-tracking branch 'neo4j/3.5' into 3.5
2 parents 2dda3ac + 27e9ebe commit bd555ee

31 files changed

+904
-116
lines changed

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ idea {
2727
}
2828

2929
group = 'org.neo4j.procedure'
30-
version = '3.5.0.8'
30+
version = '3.5.0.9'
3131
archivesBaseName = 'apoc'
3232

3333
jar {
@@ -137,6 +137,10 @@ dependencies {
137137
exclude group: 'com.google.http-client', module: 'google-http-client'
138138
}
139139

140+
testCompile 'org.mock-server:mockserver-netty:3.10.8'
141+
testCompile 'org.mock-server:mockserver-client-java:3.10.8'
142+
143+
140144
def withoutServers = {
141145
// exclude group: 'org.mortbay.jetty'
142146
exclude group: 'org.eclipse.jetty'
@@ -273,7 +277,7 @@ asciidoctor {
273277
sources { include 'index.adoc' }
274278
outputDir = file('build/docs')
275279
attributes 'apoc-version' : version,
276-
'apoc-release' : "3.5.0.8",
280+
'apoc-release' : "3.5.0.9",
277281
'neo4j-version' : neo4jVersionEffective,
278282
'branch' : "3.5"
279283
}

docs/asciidoc/database-integration/mongodb.adoc

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,32 @@
66
This section describes procedures that can be used to interact with MongoDB.
77
--
88

9+
This section includes:
10+
11+
* <<mongodb-procedures>>
12+
* <<mongodb-dependencies>>
13+
* <<mongodb-fields>>
14+
* <<mongodb-examples>>
15+
16+
[[mongodb-procedures]]
17+
== Available Procedures
18+
919
// tag::mongodb[]
1020

11-
[cols="3m,2"]
21+
[separator=¦,opts=header,cols="1,1m,1m,5"]
1222
|===
13-
| CALL apoc.mongodb.get(host-or-key,db,collection,query,[compatibleValues=false|true],skip-or-null,limit-or-null,[extractReferences=false|true],[objectIdAsMap=true|false]) yield value - perform a find operation on mongodb collection | perform a find operation on mongodb collection
14-
| CALL apoc.mongodb.count(host-or-key,db,collection,query) yield value - perform a find operation on mongodb collection | perform a find operation on mongodb collection
15-
| CALL apoc.mongodb.first(host-or-key,db,collection,query,[compatibleValues=false|true],[extractReferences=false|true],[objectIdAsMap=true|false]) yield value - perform a first operation on mongodb collection | perform a first operation on mongodb collection
16-
| CALL apoc.mongodb.find(host-or-key,db,collection,query,projection,sort,[compatibleValues=false|true],skip-or-null,limit-or-null,[extractReferences=false|true],[objectIdAsMap=true|false]) yield value - perform a find,project,sort operation on mongodb collection | perform a find,project,sort operation on mongodb collection
17-
| CALL apoc.mongodb.insert(host-or-key,db,collection,documents) - inserts the given documents into the mongodb collection | inserts the given documents into the mongodb collection
18-
| CALL apoc.mongodb.delete(host-or-key,db,collection,query) - delete the given documents from the mongodb collection and returns the number of affected documents | deletes the given documents from the mongodb collection and returns the number of affected documents
19-
| CALL apoc.mongodb.update(host-or-key,db,collection,query,update) - updates the given documents from the mongodb collection and returns the number of affected documents | updates the given documents from the mongodb collection and returns the number of affected documents
23+
include::../../../build/generated-documentation/apoc.mongodb.csv[]
2024
|===
2125

26+
[[mongodb-dependencies]]
27+
== Install Dependencies
28+
29+
The Mongo procedures have dependencies on a client library that is not included in the APOC Library.
30+
31+
This dependency is included in https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-mongodb-dependencies-{apoc-release}.jar[apoc-mongodb-dependencies-{apoc-release}.jar^], which can be downloaded from the https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/tag/{apoc-release}[releases page^].
32+
Once that file is downloaded, it should be placed in the `plugins` directory and the Neo4j Server restarted.
33+
34+
[[mongodb-fields]]
2235
== Field description
2336

2437
- `hostorkey`: the MongoDB host in the format `mongodb://<HOST_NAME>:<PORT>`
@@ -37,8 +50,10 @@ This section describes procedures that can be used to interact with MongoDB.
3750
- `documents`: the documents to insert
3851
- `update`: the updated params
3952

53+
[[mongodb-examples]]
54+
== Examples
4055

41-
Follwing an example that could help to understand the behaviour of `extractReferences`, `compatibleValues` and `objectIdAsMap`:
56+
Following an example that could help to understand the behaviour of `extractReferences`, `compatibleValues` and `objectIdAsMap`:
4257

4358
Given the following collections:
4459

docs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ plugins {
2929
id 'org.neo4j.doc.build.docbook' version '1.0-alpha12'
3030
}
3131

32-
if (!project.hasProperty('apocVersion')) { ext.apocVersion = '3.5.0.8' }
32+
if (!project.hasProperty('apocVersion')) { ext.apocVersion = '3.5.0.9' }
3333

3434
ext {
3535
versionParts = apocVersion.split('-')

docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.neo4j.procedure</groupId>
1313
<artifactId>apoc-docs</artifactId>
14-
<version>3.5.0.8</version>
14+
<version>3.5.0.9</version>
1515

1616
<name>apoc-docs</name>
1717
<description>Awesome Procedures for Cypher - Documentation</description>

extra-dependencies/build.gradle

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
allprojects {
2+
repositories {
3+
jcenter()
4+
maven {
5+
url "https://repo.gradle.org/gradle/libs-releases"
6+
}
7+
}
8+
}
9+
10+
configure(subprojects) {
11+
apply plugin: 'java'
12+
}
13+
14+
15+
subprojects {
16+
version = '3.5.0.12'
17+
group = 'org.neo4j.contrib'
18+
}
19+
20+
task copyJars(type: Copy) {
21+
from subprojects.collect { it.tasks.withType(Jar) }
22+
into "$buildDir/allJars"
23+
}
24+
25+
26+
task buildDependencies {
27+
subprojects.each { dependsOn("${it.name}:clean") }
28+
subprojects.each { dependsOn("${it.name}:build") }
29+
subprojects.each { dependsOn("${it.name}:shadowJar") }
30+
dependsOn(copyJars)
31+
}
57.3 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

extra-dependencies/gradlew

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
##
21+
## Gradle start up script for UN*X
22+
##
23+
##############################################################################
24+
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
42+
43+
APP_NAME="Gradle"
44+
APP_BASE_NAME=`basename "$0"`
45+
46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
49+
# Use the maximum available, or set MAX_FD != -1 to use that value.
50+
MAX_FD="maximum"
51+
52+
warn () {
53+
echo "$*"
54+
}
55+
56+
die () {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
61+
}
62+
63+
# OS specific support (must be 'true' or 'false').
64+
cygwin=false
65+
msys=false
66+
darwin=false
67+
nonstop=false
68+
case "`uname`" in
69+
CYGWIN* )
70+
cygwin=true
71+
;;
72+
Darwin* )
73+
darwin=true
74+
;;
75+
MINGW* )
76+
msys=true
77+
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
81+
esac
82+
83+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84+
85+
# Determine the Java command to use to start the JVM.
86+
if [ -n "$JAVA_HOME" ] ; then
87+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
88+
# IBM's JDK on AIX uses strange locations for the executables
89+
JAVACMD="$JAVA_HOME/jre/sh/java"
90+
else
91+
JAVACMD="$JAVA_HOME/bin/java"
92+
fi
93+
if [ ! -x "$JAVACMD" ] ; then
94+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
95+
96+
Please set the JAVA_HOME variable in your environment to match the
97+
location of your Java installation."
98+
fi
99+
else
100+
JAVACMD="java"
101+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
102+
103+
Please set the JAVA_HOME variable in your environment to match the
104+
location of your Java installation."
105+
fi
106+
107+
# Increase the maximum file descriptors if we can.
108+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
109+
MAX_FD_LIMIT=`ulimit -H -n`
110+
if [ $? -eq 0 ] ; then
111+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
112+
MAX_FD="$MAX_FD_LIMIT"
113+
fi
114+
ulimit -n $MAX_FD
115+
if [ $? -ne 0 ] ; then
116+
warn "Could not set maximum file descriptor limit: $MAX_FD"
117+
fi
118+
else
119+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
120+
fi
121+
fi
122+
123+
# For Darwin, add options to specify how the application appears in the dock
124+
if $darwin; then
125+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126+
fi
127+
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132+
JAVACMD=`cygpath --unix "$JAVACMD"`
133+
134+
# We build the pattern for arguments to be converted via cygpath
135+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
136+
SEP=""
137+
for dir in $ROOTDIRSRAW ; do
138+
ROOTDIRS="$ROOTDIRS$SEP$dir"
139+
SEP="|"
140+
done
141+
OURCYGPATTERN="(^($ROOTDIRS))"
142+
# Add a user-defined pattern to the cygpath arguments
143+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
144+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
145+
fi
146+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
147+
i=0
148+
for arg in "$@" ; do
149+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
150+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
151+
152+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
153+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
154+
else
155+
eval `echo args$i`="\"$arg\""
156+
fi
157+
i=`expr $i + 1`
158+
done
159+
case $i in
160+
0) set -- ;;
161+
1) set -- "$args0" ;;
162+
2) set -- "$args0" "$args1" ;;
163+
3) set -- "$args0" "$args1" "$args2" ;;
164+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170+
esac
171+
fi
172+
173+
# Escape application args
174+
save () {
175+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176+
echo " "
177+
}
178+
APP_ARGS=`save "$@"`
179+
180+
# Collect all arguments for the java command, following the shell quoting and substitution rules
181+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182+
183+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)