diff --git a/docs/asciidoc/modules/ROOT/pages/overview/apoc.convert/apoc.convert.fromYaml.adoc b/docs/asciidoc/modules/ROOT/pages/overview/apoc.convert/apoc.convert.fromYaml.adoc index 3c5b0ad15f..490968eb9e 100644 --- a/docs/asciidoc/modules/ROOT/pages/overview/apoc.convert/apoc.convert.fromYaml.adoc +++ b/docs/asciidoc/modules/ROOT/pages/overview/apoc.convert/apoc.convert.fromYaml.adoc @@ -24,11 +24,6 @@ apoc.convert.fromYaml(value :: STRING, config = {} :: MAP) :: ANY == Config parameters include::partial$usage/config/apoc.convert.fromYaml.adoc[] -[[yaml-dependencies]] -=== Install dependencies -Note that to use this function, you have to install additional dependencies -which can be downloaded https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-yaml-dependencies-{apoc-release}-all.jar[from this link]. - [[usage-apoc.convert.fromYaml]] == Usage Examples diff --git a/docs/asciidoc/modules/ROOT/pages/overview/apoc.convert/apoc.convert.toYaml.adoc b/docs/asciidoc/modules/ROOT/pages/overview/apoc.convert/apoc.convert.toYaml.adoc index fffed30601..2e3267ece2 100644 --- a/docs/asciidoc/modules/ROOT/pages/overview/apoc.convert/apoc.convert.toYaml.adoc +++ b/docs/asciidoc/modules/ROOT/pages/overview/apoc.convert/apoc.convert.toYaml.adoc @@ -24,12 +24,6 @@ apoc.convert.toYaml(value :: ANY, config = {} :: MAP) :: STRING == Config parameters include::partial$usage/config/apoc.convert.toYaml.adoc[] -[[yaml-dependencies]] -=== Install dependencies -Note that to use this function, you have to install additional dependencies -which can be downloaded https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/{apoc-release}/apoc-yaml-dependencies-{apoc-release}-all.jar[from this link]. - - [[usage-apoc.convert.toYaml]] == Usage Examples include::partial$usage/apoc.convert.toYaml.adoc[] diff --git a/extended/build.gradle b/extended/build.gradle index 7925d04c12..571ba92bf8 100644 --- a/extended/build.gradle +++ b/extended/build.gradle @@ -69,6 +69,7 @@ dependencies { } def withoutJacksons = { + exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core' exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations' exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind' } @@ -83,6 +84,7 @@ dependencies { exclude group: 'org.apache.commons', module: 'commons-lang3' } implementation group: 'us.fatehi', name: 'schemacrawler', version: '16.20.8' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.17.0', withoutJacksons // These will be dependencies not packaged with the .jar // They need to be provided either through the database or in an extra .jar @@ -113,11 +115,9 @@ dependencies { // testImplementation analogous is not needed since is bundled via `test-utils` submodule compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.6', withoutServers - compileOnly group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.16.1' compileOnly group: 'org.apache.arrow', name: 'arrow-vector', version: '13.0.0' compileOnly group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '13.0.0' - testImplementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.16.1' testImplementation group: 'org.apache.arrow', name: 'arrow-vector', version: '13.0.0' testImplementation group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '13.0.0' diff --git a/extended/src/main/java/apoc/convert/ConvertExtended.java b/extended/src/main/java/apoc/convert/ConvertExtended.java index d1c881ea10..8d0a291aa7 100644 --- a/extended/src/main/java/apoc/convert/ConvertExtended.java +++ b/extended/src/main/java/apoc/convert/ConvertExtended.java @@ -2,7 +2,6 @@ import apoc.Extended; import apoc.meta.Types; -import apoc.util.MissingDependencyException; import apoc.util.collection.Iterables; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; @@ -25,20 +24,13 @@ @Extended public class ConvertExtended { - private static final String YAML_MISSING_DEPS_ERROR = """ - Cannot find the Yaml client jar. - Please put the apoc-yaml-dependencies-5.x.x-all.jar into plugin folder. - See the documentation: https://neo4j.com/labs/apoc/5/overview/apoc.convert/apoc.convert.toYaml/#yaml-dependencies"""; - @UserFunction("apoc.convert.toYaml") @Description("apoc.convert.toYaml(value, $config) - Serializes the given value to a YAML string") public String toYaml(@Name("value") Object value, @Name(value = "config", defaultValue = "{}") Map config) { Object result = writeYamlResult(value); try { return getYamlFactory(result, config); - } catch (NoClassDefFoundError e) { - throw new MissingDependencyException(YAML_MISSING_DEPS_ERROR); } catch (IOException e) { throw new RuntimeException("Can't convert " + "value" + " to yaml", e); } @@ -47,13 +39,9 @@ public String toYaml(@Name("value") Object value, @Name(value = "config", defaul @UserFunction("apoc.convert.fromYaml") @Description("apoc.convert.fromYaml(value, $config) - Deserializes the YAML string to Neo4j value") public Object fromYaml(@Name("value") String value, @Name(value = "config", defaultValue = "{}") Map config) throws Exception { - try { - Object parse = parse(value, config); - var mappingConf = (Map) config.getOrDefault(MAPPING_KEY, Map.of()); - return toValidYamlValue(parse, null, mappingConf, true); - } catch (NoClassDefFoundError e) { - throw new MissingDependencyException(YAML_MISSING_DEPS_ERROR); - } + Object parse = parse(value, config); + var mappingConf = (Map) config.getOrDefault(MAPPING_KEY, Map.of()); + return toValidYamlValue(parse, null, mappingConf, true); } /** @@ -65,15 +53,15 @@ private Object writeYamlResult(Object value) { return switch (type) { case NODE -> nodeToMap((Node) value); case RELATIONSHIP -> relToMap((Relationship) value); - + case PATH -> writeYamlResult(Iterables.stream((Path) value) .map(i -> i instanceof Node ? nodeToMap((Node) i) : relToMap((Relationship) i)) .collect(Collectors.toList())); - + case LIST -> ConvertUtils.convertToList(value).stream() .map(this::writeYamlResult) .collect(Collectors.toList()); - + case MAP -> ((Map) value) .entrySet() .stream() @@ -82,7 +70,7 @@ private Object writeYamlResult(Object value) { (mapAccumulator, entry) -> mapAccumulator.put(entry.getKey(), writeYamlResult(entry.getValue())), HashMap::putAll); - + default -> value; }; } diff --git a/extra-dependencies/settings.gradle b/extra-dependencies/settings.gradle index b15e3c4e7e..18c0c39e72 100644 --- a/extra-dependencies/settings.gradle +++ b/extra-dependencies/settings.gradle @@ -9,4 +9,3 @@ include('selenium') include('hadoop') include('gcs') include('aws') -include('yaml') diff --git a/extra-dependencies/yaml/build.gradle b/extra-dependencies/yaml/build.gradle deleted file mode 100644 index f06deb7bef..0000000000 --- a/extra-dependencies/yaml/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id 'com.github.johnrengelman.shadow' version '7.1.0' -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} - -archivesBaseName = 'apoc-yaml-dependencies' -description = """APOC Yaml Dependencies""" - -jar { - manifest { - attributes 'Implementation-Version': version - } -} - -dependencies { - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.17.0', commonExclusions -} - - - - diff --git a/extra-dependencies/yaml/gradle/wrapper/gradle-wrapper.jar b/extra-dependencies/yaml/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e289a2835a..0000000000 Binary files a/extra-dependencies/yaml/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/extra-dependencies/yaml/gradle/wrapper/gradle-wrapper.properties b/extra-dependencies/yaml/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index c85df3d885..0000000000 --- a/extra-dependencies/yaml/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Feb 06 14:27:44 CET 2018 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip \ No newline at end of file diff --git a/extra-dependencies/yaml/gradlew b/extra-dependencies/yaml/gradlew deleted file mode 100755 index 2fe81a7d95..0000000000 --- a/extra-dependencies/yaml/gradlew +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/extra-dependencies/yaml/gradlew.bat b/extra-dependencies/yaml/gradlew.bat deleted file mode 100644 index 9618d8d960..0000000000 --- a/extra-dependencies/yaml/gradlew.bat +++ /dev/null @@ -1,100 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega