diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 000000000..cb28b0e37 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..7c70847d2 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. + +# NOTE: Maven 3.9 is incompatible with the linkage checker rules +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/linkage-checker-exclusion-rules.xml b/linkage-checker-exclusion-rules.xml new file mode 100644 index 000000000..2cf615506 --- /dev/null +++ b/linkage-checker-exclusion-rules.xml @@ -0,0 +1,49 @@ + + + + + ? + + + + + Optional + + + + + Optional + + + + + Optional + + + + + Optional + + + + + provided appengine + + + + + ? + + + + + ? + + + diff --git a/mvnw b/mvnw new file mode 100755 index 000000000..8d937f4c1 --- /dev/null +++ b/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 000000000..f80fbad3e --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 61d656196..ae2c9f1b0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 net.snowflake @@ -8,54 +9,50 @@ jar snowflake-jdbc - http://maven.apache.org + https://github.com/snowflakedb/snowflake-jdbc - - - Central - Internal Central Repo2 - default - https://nexus.int.snowflakecomputing.com/repository/maven-central/ - - false - - - - - - 3.3.9 - - - - scm:svn:http://127.0.0.1/svn/dummy - scm:svn:https://127.0.0.1/svn/dummy - HEAD - http://127.0.0.1/websvn/dummy + scm:git:https://github.com/snowflakedb/snowflake-jdbc.git + https://github.com/snowflakedb/snowflake-jdbc - UTF-8 - UTF-8 10.0.1 - 2.0.6 - 1.15.3 - 2.4.1 - 2.13.2 - 2.13.4.2 - - 4.5.13 - 0.8.4 - true 1.12.327 - 1.34.0 - 1.41.4 1.70 + 1.34.0 + true 5.13.0 + 1.15.3 3.5.6 - net.snowflake.client.jdbc.internal + UTF-8 + UTF-8 net/snowflake/client/jdbc/internal + net.snowflake.client.jdbc.internal net.snowflake.client.category.AllTestCategory + 2.4.1 + 3.6.3 + 3.1.0 + 3.0.0 + 3.2.0 + 3.11.0 + 3.5.0 + 3.1.1 + 3.0.0-M3 + 3.1.0 + 3.0.0 + 2.19 + 3.0.1 + 3.1.1 + 0.8.8 + 0.17.2 + 3.3.0 + 3.5.0 + 3.4.2 + 3.4.1 + 3.0.1 + 3.2.1 + 3.0.0 @@ -67,182 +64,287 @@ pom import + + com.fasterxml.jackson + jackson-bom + 2.13.5 + pom + import + + + io.netty + netty-bom + 4.1.82.Final + pom + import + + + classworlds + classworlds + 1.1 + + + com.google.api.grpc + proto-google-common-protos + 2.8.4 + + + com.google.code.gson + gson + 2.9.0 + + + com.google.errorprone + error_prone_annotations + 2.11.0 + + + com.google.guava + guava + 31.1-jre + + + com.google.http-client + google-http-client + 1.41.7 + + + com.google.http-client + google-http-client-gson + 1.41.7 + + + com.google.protobuf + protobuf-java + 3.19.6 + + + com.google.protobuf + protobuf-java-util + 3.19.6 + + + commons-cli + commons-cli + 1.2 + + + commons-codec + commons-codec + 1.15 + + + commons-io + commons-io + 2.11.0 + + + commons-logging + commons-logging + 1.2 + + + io.grpc + grpc-context + 1.45.2 + + + io.opencensus + opencensus-api + 0.31.0 + + + junit + junit + 4.13.2 + + + org.apache.commons + commons-compress + 1.21 + + + org.apache.commons + commons-lang3 + 3.12.0 + + + org.apache.httpcomponents + httpclient + 4.5.14 + + + org.apache.httpcomponents + httpcore + 4.4.16 + + + org.checkerframework + checker-qual + 3.21.4 + + + org.codehaus.plexus + plexus-container-default + 1.0-alpha-9-stable-1 + + + org.codehaus.plexus + plexus-utils + 3.4.2 + + + org.hamcrest + hamcrest-core + 2.2 + + + org.ow2.asm + asm + 9.3 + + + org.threeten + threetenbp + 1.6.0 + + + org.tukaani + xz + 1.9 + + + org.slf4j + slf4j-api + 2.0.6 + provided + + - - commons-codec - commons-codec - 1.14 - - - io.netty - netty-common - 4.1.77.Final + + com.amazonaws + aws-java-sdk-core - io.netty - netty-buffer - 4.1.77.Final + com.amazonaws + aws-java-sdk-kms - com.nimbusds - nimbus-jose-jwt - 9.21 + com.amazonaws + aws-java-sdk-s3 - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M1 - test + com.fasterxml.jackson.core + jackson-annotations - junit - junit - 4.13.1 - jar - test + com.fasterxml.jackson.core + jackson-core - org.hamcrest - hamcrest - 2.1 - jar - test + com.fasterxml.jackson.core + jackson-databind - org.mockito - mockito-inline - ${mockito.version} - test + com.google.api + gax + 2.16.0 - commons-dbcp - commons-dbcp - 1.4 - test + com.google.cloud + google-cloud-core + 2.6.0 - com.mchange - c3p0 - 0.9.5.4 - jar - test + com.google.cloud + google-cloud-storage + 2.6.2 - com.zaxxer - HikariCP - 2.4.3 - test + com.google.code.findbugs + jsr305 + 3.0.2 - org.apache.httpcomponents - httpclient - ${httpclient.version} - jar - - - commons-codec - commons-codec - - + com.google.guava + guava - commons-io - commons-io - 2.8.0 - jar + com.google.http-client + google-http-client - com.amazonaws - aws-java-sdk-s3 + com.microsoft.azure + azure-storage + 5.0.0 - com.fasterxml.jackson.core - jackson-databind - ${jacksondatabind.version} - jar + com.nimbusds + nimbus-jose-jwt + 9.21 - com.fasterxml.jackson.core - jackson-core - ${jackson.version} + com.yammer.metrics + metrics-core + 2.2.0 - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} + com.yammer.metrics + metrics-servlet + 2.2.0 - com.google.guava - guava - 30.0-jre + commons-codec + commons-codec - net.snowflake - snowflake-common - 5.1.4 - jar - compile + commons-io + commons-io - commons-cli - commons-cli + commons-logging + commons-logging 1.2 - jar - test - - - commons-codec - commons-codec - 1.14 - net.minidev - json-smart - 2.4.9 + javax.servlet + javax.servlet-api + 3.1.0 - org.apache.commons - commons-lang3 - 3.11 - jar - test + joda-time + joda-time + 2.8.1 - org.apache.commons - commons-text - 1.10.0 - jar - test + net.minidev + json-smart + 2.4.9 - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - test + net.snowflake + snowflake-common + 5.1.4 - org.codehaus.plexus - plexus-archiver - 4.3.0 - provided + org.apache.arrow + arrow-memory-core + ${arrow.version} - com.yammer.metrics - metrics-graphite - 2.2.0 + org.apache.arrow + arrow-vector + ${arrow.version} - com.yammer.metrics - metrics-servlet - 2.2.0 + org.apache.httpcomponents + httpclient - javax.servlet - javax.servlet-api - 3.1.0 - compile + org.apache.httpcomponents + httpcore org.apache.tika @@ -250,16 +352,14 @@ ${tika.version} - org.apache.avro - avro - 1.8.1 - test + org.bouncycastle + bcpkix-jdk15on + ${bouncycastle.version} - org.slf4j - slf4j-api - ${slf4j.version} - provided + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} org.jsoup @@ -267,127 +367,147 @@ ${jsoup.version} - com.microsoft.azure - azure-storage - 5.0.0 + org.slf4j + slf4j-api - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} + net.java.dev.jna + jna + ${jna.version} + provided - org.bouncycastle - bcpkix-jdk15on - ${bouncycastle.version} + net.java.dev.jna + jna-platform + ${jna.version} + provided - com.amazonaws - aws-java-sdk-sns - test + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + runtime - ch.qos.logback - logback-classic - 1.3.6 - test + + com.google.flatbuffers + flatbuffers-java + 1.12.0 + runtime + + + io.netty + netty-buffer + runtime org.apache.arrow - arrow-vector + arrow-format ${arrow.version} - - - commons-codec - commons-codec - - - io.netty - netty-common - - - io.netty - netty-buffer - - + runtime org.apache.arrow - arrow-memory-unsafe + arrow-memory-netty ${arrow.version} + runtime org.apache.arrow - arrow-memory-netty + arrow-memory-unsafe ${arrow.version} - - - io.netty - netty-common - - - io.netty - netty-buffer - - + runtime - com.google.auth - google-auth-library-oauth2-http - 1.5.3 + ch.qos.logback + logback-classic + 1.3.6 + test - com.google.cloud - google-cloud-storage - 2.6.2 - - - com.google.code.gson - gson - - - com.google.oauth-client - google-oauth-client - - + ch.qos.logback + logback-core + 1.3.6 + test - com.google.auth - google-auth-library-credentials - 1.5.3 + com.amazonaws + aws-java-sdk-sns + test - com.google.api-client - google-api-client - ${google.api.client.version} - - - com.google.oauth-client - google-oauth-client - - + com.mchange + c3p0 + 0.9.5.4 + test - - com.google.oauth-client - google-oauth-client - 1.33.3 + + com.zaxxer + HikariCP + 2.4.3 + test - com.google.http-client - google-http-client - ${google.http.client.version} + commons-cli + commons-cli + jar + test - net.java.dev.jna - jna - ${jna.version} - provided + commons-dbcp + commons-dbcp + 1.4 + test - net.java.dev.jna - jna-platform - ${jna.version} - provided + commons-pool + commons-pool + 1.5.4 + test + + + junit + junit + test + + + org.apache.avro + avro + 1.8.1 + test + + + org.apache.commons + commons-compress + test + + + org.apache.commons + commons-lang3 + test + + + org.apache.commons + commons-text + 1.10.0 + test + + + org.hamcrest + hamcrest + 2.2 + test + + + org.mockito + mockito-core + 3.5.6 + test + + + org.mockito + mockito-inline + ${mockito.version} + test @@ -395,135 +515,183 @@ ${project.artifactId} - src/main/resources true + src/main/resources + + + + com.github.ekryd.sortpom + sortpom-maven-plugin + ${version.plugin.sortpom} + + + com.github.siom79.japicmp + japicmp-maven-plugin + ${version.plugin.japicmp} + + + com.spotify.fmt + fmt-maven-plugin + ${version.plugin.fmt} + + + org.apache.maven.plugins + maven-antrun-plugin + ${version.plugin.antrun} + + + org.apache.maven.plugins + maven-clean-plugin + ${version.plugin.clean} + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.plugin.compiler} + + + org.apache.maven.plugins + maven-dependency-plugin + ${version.plugin.dependency} + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.plugin.deploy} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${version.plugin.enforcer} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${version.plugin.failsafe} + + + org.apache.maven.plugins + maven-gpg-plugin + ${version.plugin.gpg} + + + org.apache.maven.plugins + maven-install-plugin + ${version.plugin.install} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.plugin.jar} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.plugin.javadoc} + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${version.plugin.projectinforeports} + + + org.apache.maven.plugins + maven-shade-plugin + ${version.plugin.shade} + + + org.apache.maven.plugins + maven-source-plugin + ${version.plugin.source} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.plugin.surefire} + + + org.codehaus.mojo + buildnumber-maven-plugin + ${version.plugin.buildnumber} + + + org.codehaus.mojo + exec-maven-plugin + ${version.plugin.exec} + + + org.jacoco + jacoco-maven-plugin + ${version.plugin.jacoco} + + + - org.apache.maven.plugins - maven-install-plugin - 3.0.0-M1 + com.github.ekryd.sortpom + sortpom-maven-plugin + + false + false + true + scope,groupId,artifactId + groupId,artifactId + true + true + groupId,artifactId + true + stop + strict + - install-tika-core - validate - - install-file - - - ${project.basedir}/dependencies/tika-core-${tika.version}.jar - org.apache.tika - tika-core - ${tika.version} - jar - true - - - - install-arrow-memory-pom - validate - - install-file - - - ${project.basedir}/dependencies/arrow-memory-${arrow.version}.pom - org.apache.arrow - arrow-memory - ${arrow.version} - pom - true - - - - install-arrow-memory-core - validate - install-file + verify - - ${project.basedir}/dependencies/arrow-memory-core-${arrow.version}.jar - org.apache.arrow - arrow-memory-core - ${arrow.version} - jar - true - - - - install-arrow-memory-unsafe - validate - - install-file - - - ${project.basedir}/dependencies/arrow-memory-unsafe-${arrow.version}.jar - org.apache.arrow - arrow-memory-unsafe - ${arrow.version} - jar - true - - - - install-arrow-memory-netty - validate - - install-file - - - ${project.basedir}/dependencies/arrow-memory-netty-${arrow.version}.jar - org.apache.arrow - arrow-memory-netty - ${arrow.version} - jar - true - - - - install-arrow-format validate - - install-file - - - ${project.basedir}/dependencies/arrow-format-${arrow.version}.jar - org.apache.arrow - arrow-format - ${arrow.version} - jar - true - + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + true + true + \d+\.\d+\.\d+ + + com.snowflake + net.snowflake + + + ${shadeBase} + + + + - install-arrow-vector - validate + japicmp - install-file + cmp - - ${project.basedir}/dependencies/arrow-vector-${arrow.version}.jar - org.apache.arrow - arrow-vector - ${arrow.version} - jar - true - + verify org.apache.maven.plugins maven-clean-plugin - 3.0.0 lib - - *.jar - + + *.jar + @@ -531,7 +699,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 true true @@ -546,47 +713,130 @@ default-testCompile - test-compile testCompile - + test-compile + - org.jacoco - jacoco-maven-plugin - ${jacoco.version} + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + analyze-only + + + true + true + + javax.servlet:javax.servlet-api + + + + + install-jar + + copy + + install + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + lib + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + com.google.cloud.tools + linkage-checker-enforcer-rules + 1.5.13 + + + org.codehaus.mojo + extra-enforcer-rules + 1.3 + + + org.eclipse.aether + aether-util + + + + - pre-unit-test + enforce-best-practices + + enforce + + + + + true + true + + + arrow-memory-unsafe + + org.apache.arrow.memory.DefaultAllocationManagerFactory + + + + + + + + + + + + + enforce-maven - prepare-agent + enforce - target/jacoco-ut.exec + + + ${version.maven} + + - post-unit-test - test + enforce-linkage-checker - report + enforce + verify - target/jacoco-ut.exec - target/jacoco-ut + + + true + linkage-checker-exclusion-rules.xml + + - - ${jacoco.skip.instrument} - org.apache.maven.plugins maven-jar-plugin - 2.4 @@ -604,31 +854,26 @@ - maven-dependency-plugin + org.apache.maven.plugins + maven-javadoc-plugin + + 8 + ${project.basedir}/src/main/javadoc/overview.html + java + ${project.basedir}/src/main/javadoc/licenses.html + - install-jar - install + attach-javadocs - copy + jar - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - - - lib - org.apache.maven.plugins maven-source-plugin - 3.0.1 attach-sources @@ -639,327 +884,361 @@ - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.0 + org.jacoco + jacoco-maven-plugin - 8 - ${project.basedir}/src/main/javadoc/overview.html - java - ${project.basedir}/src/main/javadoc/licenses.html + ${jacoco.skip.instrument} - attach-javadocs + pre-unit-test - jar + prepare-agent + + + target/jacoco-ut.exec + + + + post-unit-test + + report + test + + target/jacoco-ut.exec + target/jacoco-ut + + org.apache.maven.plugins maven-project-info-reports-plugin - 2.9 + + check-style + + + + com.spotify.fmt + fmt-maven-plugin + + + + check + + + + + + + self-contained-jar - + !not-self-contained-jar - org.codehaus.mojo - buildnumber-maven-plugin - 1.2 + + + org.apache.maven.plugins + maven-antrun-plugin + + + repack + + run + + package + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin - package - - create-timestamp - + enforce-linkage-checker + + enforce + + none - - - yyyyMMddHHmmss - buildNumber.timestamp - false - - false - - + org.apache.maven.plugins maven-shade-plugin - 3.2.4 - - + - package shade + package - - - net.snowflake.common - ${shadeBase}.snowflake.common - - - org.apache - ${shadeBase}.apache - - org.apache.log4j.* - - - - com.amazonaws - ${shadeBase}.amazonaws - - - software.amazon.ion - ${shadeBase}.software.amazon.ion - - - com.microsoft.azure - ${shadeBase}.microsoft.azure - - - com.fasterxml - ${shadeBase}.fasterxml - - - com.google - ${shadeBase}.google - - - google.geo - ${shadeBase}.google.geo - - - org.joda - ${shadeBase}.joda - - - com.yammer - ${shadeBase}.yammer - - - javax.servlet - ${shadeBase}.javax.servlet - - - org.jsoup - ${shadeBase}.org.jsoup - - - org.bouncycastle - ${shadeBase}.org.bouncycastle - - - com.nimbusds - ${shadeBase}.com.nimbusds - - - javax.annotation - ${shadeBase}.javax.annotation - - - net.jcip - ${shadeBase}.net.jcip - - - net.minidev - ${shadeBase}.net.minidev - - - org.objectweb - ${shadeBase}.org.objectweb - - - com.sun - ${shadeBase}.com.sun - - com.sun.jna.** - - - - io.netty - ${shadeBase}.io.netty - - - com.carrotsearch - ${shadeBase}.com.carrotsearch - - - google.type - ${shadeBase}.google.type - - - google.rpc - ${shadeBase}.google.rpc - - - google.iam - ${shadeBase}.google.iam - - - io.opencensus - ${shadeBase}.opencensus - - - org.threeten - ${shadeBase}.threeten - - - google.protobuf - ${shadeBase}.google.protobuf - - - google.api - ${shadeBase}.google.api - - - io.grpc - ${shadeBase}.grpc - - - google.longrunning - ${shadeBase}.google.longrunning - - - google.cloud - ${shadeBase}.google.cloud - - - google.logging - ${shadeBase}.google.logging - - - org.checkerframework - ${shadeBase}.org.checkerframework - - - org.codehaus - ${shadeBase}.org.codehaus - - - - - *:* - - META-INF/LICENSE* - META-INF/NOTICE* - META-INF/DEPENDENCIES - META-INF/maven/** - META-INF/services/com.fasterxml.* - META-INF/*.xml - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - .netbeans_automatic_build - git.properties - arrow-git.properties - google-http-client.properties - storage.v1.json - pipes-fork-server-default-log4j2.xml - dependencies.properties - pipes-fork-server-default-log4j2.xml - - - - org.apache.arrow:arrow-vector - - - codegen/** - - - - com.google.guava:guava - - com/google/common/io/** - com/google/common/base/** - com/google/common/hash/** - com/google/common/collect/** - com/google/common/graph/** - com/google/common/math/** - com/google/common/util/concurrent/** - - - - commons-logging:commons-logging - - org/apache/commons/logging/impl/AvalonLogger.class - - - + + + net.snowflake.common + ${shadeBase}.snowflake.common + + + org.apache + ${shadeBase}.apache + + org.apache.log4j.* + + + + com.amazonaws + ${shadeBase}.amazonaws + + + software.amazon.ion + ${shadeBase}.software.amazon.ion + + + com.microsoft.azure + ${shadeBase}.microsoft.azure + + + com.fasterxml + ${shadeBase}.fasterxml + + + com.google + ${shadeBase}.google + + + google.geo + ${shadeBase}.google.geo + + + org.joda + ${shadeBase}.joda + + + com.yammer + ${shadeBase}.yammer + + + javax.servlet + ${shadeBase}.javax.servlet + + + org.jsoup + ${shadeBase}.org.jsoup + + + org.bouncycastle + ${shadeBase}.org.bouncycastle + + + com.nimbusds + ${shadeBase}.com.nimbusds + + + javax.annotation + ${shadeBase}.javax.annotation + + + net.jcip + ${shadeBase}.net.jcip + + + net.minidev + ${shadeBase}.net.minidev + + + org.objectweb + ${shadeBase}.org.objectweb + + + com.sun + ${shadeBase}.com.sun + + com.sun.jna.** + + + + io.netty + ${shadeBase}.io.netty + + + com.carrotsearch + ${shadeBase}.com.carrotsearch + + + google.type + ${shadeBase}.google.type + + + google.rpc + ${shadeBase}.google.rpc + + + google.iam + ${shadeBase}.google.iam + + + io.opencensus + ${shadeBase}.opencensus + + + org.threeten + ${shadeBase}.threeten + + + google.protobuf + ${shadeBase}.google.protobuf + + + google.api + ${shadeBase}.google.api + + + io.grpc + ${shadeBase}.grpc + + + google.longrunning + ${shadeBase}.google.longrunning + + + google.cloud + ${shadeBase}.google.cloud + + + google.logging + ${shadeBase}.google.logging + + + org.checkerframework + ${shadeBase}.org.checkerframework + + + org.codehaus + ${shadeBase}.org.codehaus + + + + + *:* + + META-INF/LICENSE* + META-INF/NOTICE* + META-INF/DEPENDENCIES + META-INF/maven/** + META-INF/services/com.fasterxml.* + META-INF/*.xml + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + .netbeans_automatic_build + git.properties + arrow-git.properties + google-http-client.properties + storage.v1.json + + pipes-fork-server-default-log4j2.xml + dependencies.properties + pipes-fork-server-default-log4j2.xml + + + + org.apache.arrow:arrow-vector + + + codegen/** + + + + com.google.guava:guava + + com/google/common/io/** + com/google/common/base/** + com/google/common/hash/** + com/google/common/collect/** + com/google/common/graph/** + com/google/common/math/** + com/google/common/util/concurrent/** + + + + commons-logging:commons-logging + + org/apache/commons/logging/impl/AvalonLogger.class + + + - - + - - - org.apache.maven.plugins - maven-antrun-plugin - 3.1.0 + org.codehaus.mojo + buildnumber-maven-plugin + + yyyyMMddHHmmss + buildNumber.timestamp + false + + false + + - repack - package - run + create-timestamp - - - - - - - - - - - - - - - + package org.codehaus.mojo exec-maven-plugin - 1.6.0 check-shaded-content - verify exec + verify - ${basedir}/ci/scripts/check_content.sh + ${basedir}/ci/scripts/check_content.sh @@ -970,64 +1249,78 @@ java-9 - 9 + (9,) - maven-surefire-plugin + maven-failsafe-plugin - - --illegal-access=warn - + --add-opens=java.base/java.nio=ALL-UNNAMED - maven-failsafe-plugin + maven-surefire-plugin - - --illegal-access=warn - + --add-opens=java.base/java.nio=ALL-UNNAMED - check-style + jenkinsIT + + + jenkinsIT + + + - com.coveo - fmt-maven-plugin - 2.10 + com.github.siom79.japicmp + japicmp-maven-plugin + japicmp - check + cmp + none + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + analyze-only + + none - - - - - jenkinsIT - - - jenkinsIT - - - - org.apache.maven.plugins maven-failsafe-plugin - ${testCategory} + ${testCategory} + + + verify + + DefaultIT @@ -1038,53 +1331,42 @@ **/DellBoomiCloudIT.java - - net.snowflake.client.log.JDK14Logger - - - ${basedir}/src/test/resources/logging.properties - + net.snowflake.client.log.JDK14Logger + ${basedir}/src/test/resources/logging.properties - - - verify - - - org.jacoco jacoco-maven-plugin - ${jacoco.version} + + ${jacoco.skip.instrument} + pre-integration-test - pre-integration-test prepare-agent + pre-integration-test target/jacoco-it.exec post-integration-test - post-integration-test report + post-integration-test target/jacoco-it.exec target/jacoco-it - - ${jacoco.skip.instrument} - @@ -1102,6 +1384,11 @@ org.apache.maven.plugins maven-failsafe-plugin + + + verify + + ClientTelemetryIT @@ -1113,17 +1400,10 @@ **/SFTrustManagerIT.java - - ${basedir}/src/test/resources/logback-test.xml - + ${basedir}/src/test/resources/logback-test.xml - - - verify - - @@ -1142,6 +1422,11 @@ org.apache.maven.plugins maven-failsafe-plugin + + + verify + + DellBoomiIT @@ -1151,11 +1436,6 @@ DellBoomiCloudIT.java - - - verify - - @@ -1174,6 +1454,11 @@ org.apache.maven.plugins maven-failsafe-plugin + + + verify + + ClientTelemetryIT @@ -1185,17 +1470,10 @@ **/SFTrustManagerIT.java - - ${basedir}/src/test/resources/logback-test.xml - + ${basedir}/src/test/resources/logback-test.xml - - - verify - - @@ -1214,7 +1492,7 @@ org.apache.maven.plugins maven-failsafe-plugin - ${testCategory} + ${testCategory} @@ -1226,59 +1504,53 @@ **/DellBoomiCloudIT.java - - ${basedir}/src/test/resources/logback-test.xml - - - true - + ${basedir}/src/test/resources/logback-test.xml + true verify_travis_it - verify verify + verify org.jacoco jacoco-maven-plugin - ${jacoco.version} + + ${jacoco.skip.instrument} + pre-integration-test - pre-integration-test prepare-agent + pre-integration-test target/jacoco-it.exec post-integration-test - post-integration-test report + post-integration-test target/jacoco-it.exec target/jacoco-it - - ${jacoco.skip.instrument} - - ossrh-deploy @@ -1288,16 +1560,21 @@ + + maven-deploy-plugin + + true + + org.apache.maven.plugins maven-gpg-plugin - 1.6 - deploy sign-and-deploy-file + deploy target/${project.artifactId}.jar ossrh @@ -1311,13 +1588,6 @@ - - - maven-deploy-plugin - - true - - diff --git a/src/main/java/net/snowflake/client/core/DataConversionContext.java b/src/main/java/net/snowflake/client/core/DataConversionContext.java index 222f909e5..86bba8208 100644 --- a/src/main/java/net/snowflake/client/core/DataConversionContext.java +++ b/src/main/java/net/snowflake/client/core/DataConversionContext.java @@ -33,15 +33,23 @@ public interface DataConversionContext { /** get scale from Snowflake metadata */ int getScale(int columnIndex); - /** @return current session */ + /** + * @return current session + */ SFBaseSession getSession(); - /** @return session time zone */ + /** + * @return session time zone + */ TimeZone getTimeZone(); - /** @return whether to honor client time zone for timestamp_ntz */ + /** + * @return whether to honor client time zone for timestamp_ntz + */ boolean getHonorClientTZForTimestampNTZ(); - /** @return result version */ + /** + * @return result version + */ long getResultVersion(); } diff --git a/src/main/java/net/snowflake/client/core/EventHandler.java b/src/main/java/net/snowflake/client/core/EventHandler.java index b23a93a33..cca435386 100644 --- a/src/main/java/net/snowflake/client/core/EventHandler.java +++ b/src/main/java/net/snowflake/client/core/EventHandler.java @@ -23,7 +23,9 @@ import net.snowflake.client.log.SFLoggerFactory; import org.joda.time.DateTime; -/** @author jrosen */ +/** + * @author jrosen + */ public class EventHandler extends Handler { private static final SFLogger logger = SFLoggerFactory.getLogger(EventHandler.class); diff --git a/src/main/java/net/snowflake/client/core/EventUtil.java b/src/main/java/net/snowflake/client/core/EventUtil.java index 530275708..e4cde5502 100644 --- a/src/main/java/net/snowflake/client/core/EventUtil.java +++ b/src/main/java/net/snowflake/client/core/EventUtil.java @@ -54,7 +54,9 @@ public static synchronized void initEventHandlerInstance(int maxEntries, int flu // eventHandler.startFlusher(); } - /** @return the shared EventHandler instance */ + /** + * @return the shared EventHandler instance + */ public static EventHandler getEventHandlerInstance() { if (eventHandler.get() == null) { initEventHandlerInstance(MAX_ENTRIES, FLUSH_PERIOD_MS); diff --git a/src/main/java/net/snowflake/client/core/IncidentUtil.java b/src/main/java/net/snowflake/client/core/IncidentUtil.java index a686d3796..6b2086ee5 100644 --- a/src/main/java/net/snowflake/client/core/IncidentUtil.java +++ b/src/main/java/net/snowflake/client/core/IncidentUtil.java @@ -21,7 +21,9 @@ import net.snowflake.client.log.SFLogger; import net.snowflake.client.log.SFLoggerFactory; -/** @author jrosen + mkeller */ +/** + * @author jrosen + mkeller + */ public class IncidentUtil { private static final SFLogger logger = SFLoggerFactory.getLogger(IncidentUtil.class); diff --git a/src/main/java/net/snowflake/client/core/QueryContextCache.java b/src/main/java/net/snowflake/client/core/QueryContextCache.java index db9acda49..cddf33e32 100644 --- a/src/main/java/net/snowflake/client/core/QueryContextCache.java +++ b/src/main/java/net/snowflake/client/core/QueryContextCache.java @@ -144,7 +144,9 @@ public void clearCache() { logger.debug("clearCache() returns. Number of entries in cache now {}", treeSet.size()); } - /** @param data: the QueryContext Object serialized as a JSON format string */ + /** + * @param data: the QueryContext Object serialized as a JSON format string + */ public void deserializeQueryContextJson(String data) { synchronized (this) { diff --git a/src/main/java/net/snowflake/client/core/SFBaseStatement.java b/src/main/java/net/snowflake/client/core/SFBaseStatement.java index a4216d07d..042070a3b 100644 --- a/src/main/java/net/snowflake/client/core/SFBaseStatement.java +++ b/src/main/java/net/snowflake/client/core/SFBaseStatement.java @@ -190,6 +190,8 @@ public enum CallingMethod { public abstract int getConservativePrefetchThreads(); - /** @return the child query IDs for the multiple statements query. */ + /** + * @return the child query IDs for the multiple statements query. + */ public abstract String[] getChildQueryIds(String queryID) throws SQLException; } diff --git a/src/main/java/net/snowflake/client/core/SFSession.java b/src/main/java/net/snowflake/client/core/SFSession.java index a176c3636..012cb893f 100644 --- a/src/main/java/net/snowflake/client/core/SFSession.java +++ b/src/main/java/net/snowflake/client/core/SFSession.java @@ -1048,7 +1048,9 @@ private DriverPropertyInfo addNewDriverProperty(String name, String description) return info; } - /** @return whether this session uses async queries */ + /** + * @return whether this session uses async queries + */ public boolean isAsyncSession() { return !activeAsyncQueries.isEmpty(); } diff --git a/src/main/java/net/snowflake/client/core/SFStatement.java b/src/main/java/net/snowflake/client/core/SFStatement.java index 97f43ab3e..854ce6074 100644 --- a/src/main/java/net/snowflake/client/core/SFStatement.java +++ b/src/main/java/net/snowflake/client/core/SFStatement.java @@ -615,12 +615,16 @@ private void reducePrefetchThreadsAndChunkSizeToFitMemoryLimit( } } - /** @return conservative prefetch threads before fetching results */ + /** + * @return conservative prefetch threads before fetching results + */ public int getConservativePrefetchThreads() { return conservativePrefetchThreads; } - /** @return conservative memory limit before fetching results */ + /** + * @return conservative memory limit before fetching results + */ public long getConservativeMemoryLimit() { return conservativeMemoryLimit; } diff --git a/src/main/java/net/snowflake/client/core/arrow/ArrowVectorConverter.java b/src/main/java/net/snowflake/client/core/arrow/ArrowVectorConverter.java index 835a67892..f61e9954d 100644 --- a/src/main/java/net/snowflake/client/core/arrow/ArrowVectorConverter.java +++ b/src/main/java/net/snowflake/client/core/arrow/ArrowVectorConverter.java @@ -159,6 +159,8 @@ public interface ArrowVectorConverter { */ Object toObject(int index) throws SFException; - /** @param isUTC true or false value of whether NTZ timestamp should be set to UTC */ + /** + * @param isUTC true or false value of whether NTZ timestamp should be set to UTC + */ void setTreatNTZAsUTC(boolean isUTC); } diff --git a/src/main/java/net/snowflake/client/jdbc/ArrowResultChunk.java b/src/main/java/net/snowflake/client/jdbc/ArrowResultChunk.java index 979f824a2..5d2661786 100644 --- a/src/main/java/net/snowflake/client/jdbc/ArrowResultChunk.java +++ b/src/main/java/net/snowflake/client/jdbc/ArrowResultChunk.java @@ -313,7 +313,9 @@ private static List initConverters( return converters; } - /** @return an iterator to iterate over current chunk */ + /** + * @return an iterator to iterate over current chunk + */ public ArrowChunkIterator getIterator(DataConversionContext dataConversionContext) { return new ArrowChunkIterator(this, dataConversionContext); } @@ -429,7 +431,9 @@ public ArrowVectorConverter getCurrentConverter(int columnIdx) throws SFExceptio return currentConverters.get(columnIdx); } - /** @return index of row in current record batch */ + /** + * @return index of row in current record batch + */ public int getCurrentRowInRecordBatch() { if (resultChunk.sortFirstResultChunkEnabled() && currentRecordBatchIndex == 0) { return resultChunk.firstResultChunkSortedIndices.get(currentRowInRecordBatch); diff --git a/src/main/java/net/snowflake/client/jdbc/FileBackedOutputStream.java b/src/main/java/net/snowflake/client/jdbc/FileBackedOutputStream.java index fe7c96ae0..2930188eb 100644 --- a/src/main/java/net/snowflake/client/jdbc/FileBackedOutputStream.java +++ b/src/main/java/net/snowflake/client/jdbc/FileBackedOutputStream.java @@ -60,7 +60,9 @@ int getCount() { } } - /** @return the file holding the data (possibly null). */ + /** + * @return the file holding the data (possibly null). + */ public synchronized File getFile() { return file; } diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java index d94f45cb6..521a00f07 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java @@ -121,7 +121,9 @@ public InputStream getAsciiStream(int columnIndex) throws SQLException { throw new SnowflakeLoggedFeatureNotSupportedException(session); } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated @Override public InputStream getUnicodeStream(int columnIndex) throws SQLException { @@ -192,7 +194,9 @@ public double getDouble(String columnLabel) throws SQLException { return getDouble(findColumn(columnLabel)); } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated @Override public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException { @@ -235,7 +239,9 @@ public InputStream getAsciiStream(String columnLabel) throws SQLException { throw new SnowflakeLoggedFeatureNotSupportedException(session); } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated @Override public InputStream getUnicodeStream(String columnLabel) throws SQLException { diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeColumnMetadata.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeColumnMetadata.java index 2bed595ef..56cc8c6ae 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeColumnMetadata.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeColumnMetadata.java @@ -6,7 +6,9 @@ import java.io.Serializable; -/** @author jhuang */ +/** + * @author jhuang + */ public class SnowflakeColumnMetadata implements Serializable { private static final long serialVersionUID = 1L; private String name; diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaDataResultSet.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaDataResultSet.java index 05f09bad3..bed368aba 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaDataResultSet.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaDataResultSet.java @@ -435,7 +435,9 @@ public String getQueryID() { return queryId; } - /** @deprecated */ + /** + * @deprecated + */ @Deprecated @Override public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException { diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatement.java b/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatement.java index 1374fb831..e4535ad32 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatement.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatement.java @@ -5,7 +5,9 @@ import java.sql.SQLException; public interface SnowflakePreparedStatement { - /** @return the Snowflake query ID of the latest executed query */ + /** + * @return the Snowflake query ID of the latest executed query + */ String getQueryID() throws SQLException; /** diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSet.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSet.java index e517f2edf..b858f2b1e 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSet.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSet.java @@ -10,7 +10,9 @@ /** This interface defines Snowflake specific APIs for ResultSet */ public interface SnowflakeResultSet { - /** @return the Snowflake query ID of the query which generated this result set */ + /** + * @return the Snowflake query ID of the query which generated this result set + */ String getQueryID() throws SQLException; /** diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaDataV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaDataV1.java index cb90de385..03f59d6b6 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaDataV1.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaDataV1.java @@ -39,7 +39,9 @@ public void setQueryType(QueryType type) { this.queryType = type; } - /** @return query id */ + /** + * @return query id + */ public String getQueryID() throws SQLException { return this.queryId; } @@ -53,12 +55,16 @@ public void setQueryIdForAsyncResults(String queryId) { this.queryId = queryId; } - /** @return list of column names */ + /** + * @return list of column names + */ public List getColumnNames() throws SQLException { return resultSetMetaData.getColumnNames(); } - /** @return index of the column by name, index starts from zero */ + /** + * @return index of the column by name, index starts from zero + */ public int getColumnIndex(String columnName) throws SQLException { return resultSetMetaData.getColumnIndex(columnName); } diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLException.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLException.java index 65144a446..6d5ca18ed 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLException.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLException.java @@ -10,7 +10,9 @@ import net.snowflake.client.log.SFLoggerFactory; import net.snowflake.common.core.ResourceBundleManager; -/** @author jhuang */ +/** + * @author jhuang + */ public class SnowflakeSQLException extends SQLException { static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeSQLException.class); diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeStatement.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeStatement.java index 49744f2bf..88b2b54eb 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeStatement.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeStatement.java @@ -10,10 +10,14 @@ /** This interface defines Snowflake specific APIs for Statement */ public interface SnowflakeStatement { - /** @return the Snowflake query ID of the latest executed query */ + /** + * @return the Snowflake query ID of the latest executed query + */ String getQueryID() throws SQLException; - /** @return the Snowflake query IDs of the latest executed batch queries */ + /** + * @return the Snowflake query IDs of the latest executed batch queries + */ List getBatchQueryIDs() throws SQLException; /** diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java index 8a909ca0d..5f9a18e9e 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java @@ -372,23 +372,31 @@ boolean executeInternal( } } - /** @return the query ID of the latest executed query */ + /** + * @return the query ID of the latest executed query + */ public String getQueryID() { // return the queryID for the query executed last time return queryID; } - /** @return the query IDs of the latest executed batch queries */ + /** + * @return the query IDs of the latest executed batch queries + */ public List getBatchQueryIDs() { return Collections.unmodifiableList(batchQueryIDs); } - /** @return the child query IDs for the multiple statements query. */ + /** + * @return the child query IDs for the multiple statements query. + */ public String[] getChildQueryIds(String queryID) throws SQLException { return sfBaseStatement.getChildQueryIds(queryID); } - /** @return the open resultSets from this statement */ + /** + * @return the open resultSets from this statement + */ public Set getOpenResultSets() { return openResultSets; } diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java index 0754323f2..b199f7626 100644 --- a/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java +++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java @@ -33,7 +33,9 @@ import org.apache.http.Header; import org.apache.http.HttpResponse; -/** @author jhuang */ +/** + * @author jhuang + */ public class SnowflakeUtil { static final SFLogger logger = SFLoggerFactory.getLogger(RestRequest.class); diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/CommonObjectMetadata.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/CommonObjectMetadata.java index f26efc61d..93646e104 100644 --- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/CommonObjectMetadata.java +++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/CommonObjectMetadata.java @@ -34,14 +34,18 @@ public class CommonObjectMetadata implements StorageObjectMetadata { this.userDefinedMetadata = userDefinedMetadata; } - /** @return returns a Map/key-value pairs of metadata properties */ + /** + * @return returns a Map/key-value pairs of metadata properties + */ @Override public Map getUserMetadata() { return userDefinedMetadata; } ; - /** @return returns the size of object in bytes */ + /** + * @return returns the size of object in bytes + */ @Override public long getContentLength() { return contentLength; diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3ObjectMetadata.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3ObjectMetadata.java index d800dbdc5..ec54508f9 100644 --- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3ObjectMetadata.java +++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3ObjectMetadata.java @@ -56,7 +56,9 @@ public String getContentEncoding() { return objectMetadata.getContentEncoding(); } - /** @return Returns the encapsulated AWS S3 metadata object */ + /** + * @return Returns the encapsulated AWS S3 metadata object + */ ObjectMetadata getS3ObjectMetadata() { return objectMetadata; } diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3StorageObjectMetadata.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3StorageObjectMetadata.java index 064598330..3bb209c48 100644 --- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3StorageObjectMetadata.java +++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3StorageObjectMetadata.java @@ -21,13 +21,17 @@ public S3StorageObjectMetadata(ObjectMetadata s3Metadata) { this.s3Metadata = s3Metadata; } - /** @return returns a Map/key-value pairs of metadata properties */ + /** + * @return returns a Map/key-value pairs of metadata properties + */ @Override public Map getUserMetadata() { return this.s3Metadata.getUserMetadata(); } - /** @return returns the size of object in bytes */ + /** + * @return returns the size of object in bytes + */ @Override public long getContentLength() { return this.s3Metadata.getContentLength(); diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeAzureClient.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeAzureClient.java index 63bca905d..9a03509ea 100644 --- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeAzureClient.java +++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeAzureClient.java @@ -149,13 +149,17 @@ public int getRetryBackoffMin() { return 1000; } - /** @return Returns true if encryption is enabled */ + /** + * @return Returns true if encryption is enabled + */ @Override public boolean isEncrypting() { return encryptionKeySize > 0 && this.stageInfo.getIsClientSideEncrypted(); } - /** @return Returns the size of the encryption key */ + /** + * @return Returns the size of the encryption key + */ @Override public int getEncryptionKeySize() { return encryptionKeySize; diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java index a3194658f..2fd4403e5 100644 --- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java +++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java @@ -97,13 +97,17 @@ public int getRetryBackoffMin() { return 1000; } - /** @return Returns true if encryption is enabled */ + /** + * @return Returns true if encryption is enabled + */ @Override public boolean isEncrypting() { return encryptionKeySize > 0 && this.stageInfo.getIsClientSideEncrypted(); } - /** @return Returns the size of the encryption key */ + /** + * @return Returns the size of the encryption key + */ @Override public int getEncryptionKeySize() { return encryptionKeySize; diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeStorageClient.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeStorageClient.java index 89fc21d02..90eea4cd0 100644 --- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeStorageClient.java +++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeStorageClient.java @@ -17,7 +17,9 @@ * @author lgiakoumakis */ public interface SnowflakeStorageClient { - /** @return Returns the Max number of retry attempts */ + /** + * @return Returns the Max number of retry attempts + */ int getMaxRetries(); /** @@ -28,13 +30,19 @@ public interface SnowflakeStorageClient { */ int getRetryBackoffMaxExponent(); - /** @return Returns the min number of milliseconds to sleep before retry */ + /** + * @return Returns the min number of milliseconds to sleep before retry + */ int getRetryBackoffMin(); - /** @return Returns true if encryption is enabled */ + /** + * @return Returns true if encryption is enabled + */ boolean isEncrypting(); - /** @return Returns the size of the encryption key */ + /** + * @return Returns the size of the encryption key + */ int getEncryptionKeySize(); /** diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageObjectMetadata.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageObjectMetadata.java index ddaea5981..3fde2512b 100644 --- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageObjectMetadata.java +++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageObjectMetadata.java @@ -15,10 +15,14 @@ * @author lgiakoumakis */ public interface StorageObjectMetadata { - /** @return returns a Map/key-value pairs of metadata properties */ + /** + * @return returns a Map/key-value pairs of metadata properties + */ Map getUserMetadata(); - /** @return returns the size of object in bytes */ + /** + * @return returns the size of object in bytes + */ long getContentLength(); /** diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageObjectSummary.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageObjectSummary.java index 6e13e99e1..64fa08547 100644 --- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageObjectSummary.java +++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageObjectSummary.java @@ -132,22 +132,30 @@ private static String convertBase64ToHex(String base64String) { } } - /** @return returns the location of the object */ + /** + * @return returns the location of the object + */ public String getLocation() { return location; } - /** @return returns the key property of the object */ + /** + * @return returns the key property of the object + */ public String getKey() { return key; } - /** @return returns the MD5 hash of the object */ + /** + * @return returns the MD5 hash of the object + */ public String getMD5() { return md5; } - /** @return returns the size property of the object */ + /** + * @return returns the size property of the object + */ public long getSize() { return size; } diff --git a/src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryEvent.java b/src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryEvent.java index e2fe2a790..f2b2f70c9 100644 --- a/src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryEvent.java +++ b/src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryEvent.java @@ -170,7 +170,9 @@ private void putMap(String name, HashMap map) { } } - /** @return the deployment of this event */ + /** + * @return the deployment of this event + */ public String getDeployment() { JSONArray tags = (JSONArray) this.get("Tags"); for (Object tag : tags) { diff --git a/src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryService.java b/src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryService.java index 74ab3ec50..eb33250a8 100644 --- a/src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryService.java +++ b/src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryService.java @@ -63,7 +63,9 @@ protected TelemetryService initialValue() { // current snowflake connection string private SnowflakeConnectString sfConnStr; - /** @return return thread local instance */ + /** + * @return return thread local instance + */ public static TelemetryService getInstance() { return _threadLocal.get(); } @@ -245,13 +247,13 @@ public SnowflakeConnectString getSnowflakeConnectionString() { private enum TELEMETRY_API { SFCTEST( "https://sfctest.client-telemetry.snowflakecomputing.com/enqueue", - "rRNY3EPNsB4U89XYuqsZKa7TSxb9QVX93yNM4tS6"), + "rRNY3EPNsB4U89XYuqsZKa7TSxb9QVX93yNM4tS6"), // pragma: allowlist secret SFCDEV( "https://sfcdev.client-telemetry.snowflakecomputing.com/enqueue", - "kyTKLWpEZSaJnrzTZ63I96QXZHKsgfqbaGmAaIWf"), + "kyTKLWpEZSaJnrzTZ63I96QXZHKsgfqbaGmAaIWf"), // pragma: allowlist secret PROD( "https://client-telemetry.snowflakecomputing.com/enqueue", - "wLpEKqnLOW9tGNwTjab5N611YQApOb3t9xOnE1rX"); + "wLpEKqnLOW9tGNwTjab5N611YQApOb3t9xOnE1rX"); // pragma: allowlist secret private final String url; @@ -315,7 +317,9 @@ public String getServerDeploymentName() { private String lastClientError = ""; - /** @return the number of events successfully reported by this service */ + /** + * @return the number of events successfully reported by this service + */ public int getEventCount() { return eventCnt.get(); } @@ -336,7 +340,9 @@ public int getServerFailureCount() { return serverFailureCnt.get(); } - /** @return the string containing the most recent failed response */ + /** + * @return the string containing the most recent failed response + */ public String getLastClientError() { return this.lastClientError; } diff --git a/src/main/java/net/snowflake/client/loader/LoadResultListener.java b/src/main/java/net/snowflake/client/loader/LoadResultListener.java index 05a76c4fd..38ea92766 100644 --- a/src/main/java/net/snowflake/client/loader/LoadResultListener.java +++ b/src/main/java/net/snowflake/client/loader/LoadResultListener.java @@ -7,7 +7,9 @@ /** Callback API for processing errors and statistics of upload operation */ public interface LoadResultListener { - /** @return this result listener needs to listen to the provided records */ + /** + * @return this result listener needs to listen to the provided records + */ boolean needSuccessRecords(); /** @@ -28,13 +30,19 @@ public interface LoadResultListener { */ void addOperationRecordCount(Operation op, int i); - /** @return whether this result listener needs to listen to error records */ + /** + * @return whether this result listener needs to listen to error records + */ boolean needErrors(); - /** @param error information about error that was encountered */ + /** + * @param error information about error that was encountered + */ void addError(LoadingError error); - /** @return Whether to throw an exception upon encountering error */ + /** + * @return Whether to throw an exception upon encountering error + */ boolean throwOnError(); /** diff --git a/src/test/java/net/snowflake/client/jdbc/ClientMemoryLimitParallelIT.java b/src/test/java/net/snowflake/client/jdbc/ClientMemoryLimitParallelIT.java index 60f3bf4fe..08deeba1c 100644 --- a/src/test/java/net/snowflake/client/jdbc/ClientMemoryLimitParallelIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ClientMemoryLimitParallelIT.java @@ -17,7 +17,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** @author azhan attempts to test the CLIENT_MEMORY_LIMIT working in multi-threading */ +/** + * @author azhan attempts to test the CLIENT_MEMORY_LIMIT working in multi-threading + */ @Category(TestCategoryOthers.class) public class ClientMemoryLimitParallelIT { private static Logger LOGGER =