diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..bf82ff0 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 0000000..c25e7d5 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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 +# +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e0f15db --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/README.md b/README.md index 782b135..b474cc0 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ The required jar files are : * xmlrpc-client-3.1.3.jar * xmlrpc-common-3.1.3.jar * ws-commons-util-1.0.2.jar + +New dependency https://github.com/briandilley/jsonrpc4j * jsonrpc4j Add those jar files to your classpath and you should be ok. @@ -46,7 +48,7 @@ Run : ```mvn package``` or any other goal that will produce a .jar in the target ## Context manipulation -Values must cast in correct forma +Values must cast in correct format ``` Map inputMap = new java.util.HashMap(); diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..814f64a --- /dev/null +++ b/mvnw @@ -0,0 +1,287 @@ +#!/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.1.1 +# +# 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" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; 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="`which 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/.."; pwd` + fi + # end of workaround + done + printf '%s' "$(cd "$basedir"; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -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 +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi + +########################################################################################## +# 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. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $wrapperUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + QUIET="--quiet" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + elif command -v curl > /dev/null; then + QUIET="--silent" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + QUIET="" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L + fi + [ $? -eq 0 ] || rm -f "$wrapperJarPath" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$BASE_DIR/.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 + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +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 + +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 0000000..cba1f04 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,187 @@ +@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.1.1 +@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.1.1/maven-wrapper-3.1.1.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.1.1/maven-wrapper-3.1.1.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 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 baec023..216e389 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.odoojava odoo-java-api - 3.1.8 + 3.2.2 jar odoo-java-api diff --git a/src/main/java/com/odoojava/api/ReportAdapter.java b/src/main/java/com/odoojava/api/ReportAdapter.java index 179dc4b..cd72aa7 100644 --- a/src/main/java/com/odoojava/api/ReportAdapter.java +++ b/src/main/java/com/odoojava/api/ReportAdapter.java @@ -106,6 +106,17 @@ public String getReportMethod() { if (this.serverVersion.getMajor() < 11) { reportMethod = "render_report"; } + if (this.serverVersion.getMajor() == 14) { + System.out.println("Since v14, render method is no more public : https://github.com/odoo/odoo/issues/78528 "); + System.out.println("The render method proposed `render` suppose that you patched the code : https://github.com/odoo-java/odoo-java-api/issues/17 "); + reportMethod = "render"; + } + if (this.serverVersion.getMajor() > 14) { + System.out.println("Since v14, render method is no more public : https://github.com/odoo/odoo/issues/78528 "); + System.out.println("The render method proposed `render` suppose that you patched the code : https://github.com/odoo-java/odoo-java-api/issues/17 "); + + reportMethod = "render"; + } return reportMethod; } diff --git a/src/main/java/com/odoojava/api/Session.java b/src/main/java/com/odoojava/api/Session.java index 783b8c4..2108395 100644 --- a/src/main/java/com/odoojava/api/Session.java +++ b/src/main/java/com/odoojava/api/Session.java @@ -30,7 +30,6 @@ import com.odoojava.api.OdooXmlRpcProxy.RPCProtocol; import com.odoojava.api.OdooXmlRpcProxy.RPCServices; import com.googlecode.jsonrpc4j.*; -import com.googlecode.jsonrpc4j.JsonRpcClientException; /** * * @@ -182,9 +181,8 @@ public void startSession() throws Exception { } private void checkVersionCompatibility() throws XmlRpcException, OdooApiException { - - if (this.getServerVersion().getMajor() < 8 || this.getServerVersion().getMajor() > 14) { - throw new OdooApiException("Only Odoo Version from v8.x to 14.x are maintained. " + if (this.getServerVersion().getMajor() < 8 || this.getServerVersion().getMajor() > 16) { + throw new OdooApiException("Only Odoo Version from v8.x to 16.x are maintained. " + "Please choose another version of the library"); } @@ -227,11 +225,11 @@ int authenticate() throws XmlRpcException, Exception { } catch (JsonRpcClientException e) { System.out.println("Json rpc issue possibly caused by https://github.com/OCA/server-tools/issues/1237"); - e.printStackTrace(); + // e.printStackTrace(); } catch (Throwable e) { System.out.println("General exception"); e.printStackTrace(); - } + } if (id instanceof Integer) { userID = (Integer) id; @@ -243,26 +241,54 @@ int authenticate() throws XmlRpcException, Exception { } private int authenticate_json_rpc() throws Throwable { - // TODO: fast and uggly implementation of json rpc, has to be refactored in the - // future + /* TODO: fast and uggly implementation of json rpc, has to be refactored in the + future + */ + jsonclient.setServiceUrl(getJsonurl("jsonrpc")); + Map jsonparams = new HashMap<>(); + jsonparams.put("service", "common"); + jsonparams.put("method", "login"); + + ArrayList methodparams = new ArrayList<>(); + methodparams.add(databaseName); + methodparams.add(userName); + methodparams.add(password); + jsonparams.put("args", methodparams); + + Object result = jsonclient.invoke("call", jsonparams, int.class); + + return (int) result; + } + + public Object[] executeJsonCommand(final String objectName, final String commandName, final Object[] args) + throws Throwable { + jsonclient.setServiceUrl(getJsonurl("jsonrpc")); + Map jsonparams = new HashMap<>(); + jsonparams.put("service", "object"); + jsonparams.put("method", "execute_kw"); - Map articleMapOne = new HashMap<>(); - articleMapOne.put("password", password); - articleMapOne.put("login", userName); - articleMapOne.put("db", databaseName); + ArrayList methodparams = new ArrayList<>(); + methodparams.add(databaseName); + methodparams.add(userID); + methodparams.add(password); + methodparams.add(objectName); + methodparams.add(commandName); + methodparams.add(args); - // Object[] result = call_json_rpc(, "common", "login", articleMapOne); + jsonparams.put("args", methodparams); - jsonclient.setServiceUrl(getJsonurl("web/session/authenticate")); + Object[] result = jsonclient.invoke("call", jsonparams, Object[].class); + + return result; - Map result = jsonclient.invoke("call", articleMapOne, HashMap.class); - return (int) result.get("uid"); } public Object[] call_report_jsonrpc(String reportModel, String reportMethod, ArrayList args) throws Throwable { - // TODO: fast and uggly implementation of json rpc, has to be reafctored in the - // future + /* + TODO: fast and uggly implementation of json rpc, + has to be reafctored in the future + */ jsonclient.setServiceUrl(getJsonurl("jsonrpc")); Map jsonparams = new HashMap<>(); @@ -275,14 +301,16 @@ public Object[] call_report_jsonrpc(String reportModel, String reportMethod, Arr methodparams.add(password); methodparams.add(reportModel); methodparams.add(reportMethod); - methodparams.add(args); + ArrayList empty_recordset_for_model_annotation_in_odoo = new ArrayList<>(); + //The render method is annotated @model in Odoo, so we must pass an empty value as the first + //paramter otherwise Odoo will only interpret 1 parameter from the 2 given + //TODO: find a way to identify if a metho is annotated with @api.model + args.add(0, empty_recordset_for_model_annotation_in_odoo ); + methodparams.add(args); jsonparams.put("args", methodparams); - Object[] result = jsonclient.invoke("call", jsonparams, Object[].class); - return result; - } void checkDatabasePresenceSafe() { @@ -399,13 +427,17 @@ public Object executeCommand(final String objectName, final String commandName, * @throws XmlRpcException */ public Object executeCommandKw(final String objectName, final String commandName, final Object[] parameters, - Context context) throws XmlRpcException { + final Object[] kwargs, Context context) throws XmlRpcException { List paramsList = new ArrayList<>(); paramsList.addAll(Arrays.asList(new Object[] { databaseName, userID, password, objectName, commandName })); + if (parameters != null && parameters.length > 0) { paramsList.add(Arrays.asList(parameters)); } + // if (kwargs != null && kwargs.length > 0) { + // paramsList.add(Arrays.asList(kwargs)); + // } Map c = new HashMap<>(); c.put("context", context); @@ -427,7 +459,7 @@ public Object executeCommandKw(final String objectName, final String commandName * @throws XmlRpcException */ public Object executeCommandWithContext(final String objectName, final String commandName, - final Object[] parameters) throws XmlRpcException { + final Object[] parameters, final Object[]... kwargs) throws XmlRpcException { Object[] connectionParams = new Object[] { databaseName, userID, password, objectName, commandName }; if (this.getServerVersion().getMajor() < 13) { @@ -439,7 +471,7 @@ public Object executeCommandWithContext(final String objectName, final String co System.arraycopy(new Object[] { getContext() }, 0, params, parameters.length, 1); return executeCommand(objectName, commandName, params); } else { - return executeCommandKw(objectName, commandName, parameters, getContext()); + return executeCommandKw(objectName, commandName, parameters, kwargs, getContext()); } } diff --git a/src/test/java/com/odoojava/api/SessionTest.java b/src/test/java/com/odoojava/api/SessionTest.java index c7e2f69..f493863 100644 --- a/src/test/java/com/odoojava/api/SessionTest.java +++ b/src/test/java/com/odoojava/api/SessionTest.java @@ -66,6 +66,8 @@ public static void startProxy() throws Exception { } } + + @Before public void startMockServer() throws Exception { if (isUsingMockServer()) { @@ -175,8 +177,17 @@ public static void requestDemoDb() throws IOException, XmlRpcException { @Before public void setUp() throws Exception { session = new Session(protocol, host, port, databaseName, userName, password); + session.startSession(); } + // @BeforeClass + // public static void setUp() throws Exception { + // DemoDbGetter.getDemoDb(new DemoDbConnectionDataSetter()); + // session = new Session(protocol, host, port, databaseName, userName, password); + + + // } + @Test public void should_throw_when_parameters_are_incorrect() throws Exception { if (isUsingMockServer()) { @@ -322,6 +333,9 @@ public void should_return_server_version() throws Exception { } + + + static boolean checkedDatabasePresence = false, authenticated = false, fetchedRemoteContext = false; @Test @@ -354,6 +368,57 @@ void getRemoteContext() throws XmlRpcException { softly.assertAll(); } + + + @Test + public void test_executecommand() throws Exception { + + Long picking_id = (long) 1; + String errorMessage = "test message"; + errorMessage = "
    " + errorMessage + "
"; + Object prepare1 = session.executeCommandWithContext("stock.picking", "message_post", new Object[] { + picking_id.intValue(), errorMessage + }); + // Check parameters given are sent in order + // TODO: rewrite this part as in v14 additional parameters are not allowed in + // context_get + // if (isUsingMockServer()) { + // mockServer + // .when(request().withMethod("POST").withPath("/xmlrpc/2/object") + // .withBody(new RegexBody(".*res.users.*context_get.*"))) + // .respond(response().withStatusCode(200).withBody( + // "\n\n\n\n1\n\n\n\n")); + // } else { + // session.startSession(); + // } + // Object[] parameters = new Object[] { "parameter1" }; + // session.executeCommandWithContext("res.users", "context_get", parameters); + // if (isUsingMockServer()) { + // mockServer.verify(request().withBody(new RegexBody(".*parameter1.*")), + // VerificationTimes.once()); + // } + + // // Check empty array is working + // parameters = new Object[] {}; + // session.executeCommand("res.users", "context_get", parameters); + // if (isUsingMockServer()) { + // mockServer.verify(request().withBody(new + // RegexBody(".*res.users.*context_get.*")), + // VerificationTimes.exactly(2)); + // } + + // // Check null is working + // parameters = null; + // session.executeCommand("res.users", "context_get", parameters); + // if (isUsingMockServer()) { + // mockServer.verify(request().withBody(new + // RegexBody(".*res.users.*context_get.*")), + // VerificationTimes.exactly(3)); + // } + } + + @Test public void should_send_given_parameters() throws Exception { // Check parameters given are sent in order