[IMP]Add explicit method to call or not the RPC execute with context

Purpose is to deal with main methods that could have different signature 
regarding the version.
tested successfully on v10

Author: flotho

src/main/java/com/debortoliwines/odoo/api/OdooCommand.java

@@ -82,7 +82,12 @@ public Response searchObject(String objectName, Object[] filter, int offset, int
                 : new Object[]{filter, offsetParam, limitParam, orderParam, count};
 
         try {
-            Response response = new Response(session.executeCommand(objectName, "search", params));
+            //TODO: test differents version with search on quantity on products
+            //with location_id in the context to check that it works or not
+            Response response = (this.session.getServerVersion().getMajor() < 10) 
+                    ? new Response(session.executeCommand(objectName, "search", params))
+                    : new Response(session.executeCommandWithContext(objectName, "search", params));
+           
             return response;
         } catch (XmlRpcException e) {
             return new Response(e);
@@ -100,7 +105,7 @@ public Response searchObject(String objectName, Object[] filter, int offset, int
     @SuppressWarnings("unchecked")
     public Map<String, Object> getFields(String objectName, String[] filterFields) throws XmlRpcException {
         Map<String, Object> fieldsArray;
-        if (this.session.getServerVersion().getMajor() >= 8 ) {
+        if (this.session.getServerVersion().getMajor() >= 8) {
             fieldsArray = (Map<String, Object>) session.executeCommand(objectName, "fields_get",
                     new Object[]{filterFields});
         } else {
@@ -122,13 +127,14 @@ public Map<String, Object> getFields(String objectName, String[] filterFields) t
      * @throws XmlRpcException
      */
     public Object[] readObject(String objectName, Object[] ids, String[] fields) throws XmlRpcException {
-        Object[] readResult ;
-        if (this.session.getServerVersion().getMajor() >= 8 ) {
-            readResult = (Object[]) session.executeCommand(objectName, "read", new Object[]{ids, fields});
+        Object[] readResult;
+        if (this.session.getServerVersion().getMajor() >= 8) {
+            readResult = (Object[]) session.executeCommandWithContext(objectName, "read", new Object[]{ids, fields});
         } else {
+            //TODO: Have to be rewritten/deleted considering the previous call
             readResult = (Object[]) session.executeCommand(objectName, "read", new Object[]{ids, fields, session.getContext()});
         }
-        
+
         return readResult;
     }
 
@@ -142,7 +148,15 @@ public Object[] readObject(String objectName, Object[] ids, String[] fields) thr
      * @throws XmlRpcException
      */
     public boolean writeObject(String objectName, int id, Map<String, Object> valueList) throws XmlRpcException {
-        return (Boolean) session.executeCommand(objectName, "write", new Object[]{id, valueList});
+        if (this.session.getServerVersion().getMajor() < 10) {
+            //Prior to the v10, each version have to be adapted if needed
+            //Some methods on certains class from v8 to v9 don't respect the syntax
+            return (Boolean) session.executeCommand(objectName, "write", new Object[]{id, valueList});
+        } else {
+            //Work perfectly for the v10, please keep this check
+            return (Boolean) session.executeCommandWithContext(objectName, "write", new Object[]{id, valueList});
+        }
+
     }
 
     /**
@@ -202,16 +216,15 @@ public boolean unlinkObject(String objectName, Object[] ids) throws XmlRpcExcept
      * @throws XmlRpcException
      */
     public Object createObject(String objectName, Map<String, Object> values) throws XmlRpcException {
-        Object readResult ;
-        if (this.session.getServerVersion().getMajor() >= 8 ) {
-            readResult = (Object) session.executeCommand(objectName, "create", new Object[]{values, session.getContext()});
+        Object readResult;
+        if (this.session.getServerVersion().getMajor() < 10) {
+            readResult = (Object) session.executeCommand(objectName, "create", new Object[]{values});
         } else {
-            readResult = (Object) session.executeCommand(objectName, "create", new Object[]{values, session.getContext()});
+            readResult = (Object) session.executeCommandWithContext(objectName, "create", new Object[]{values});
         }
-        
+
         return readResult;
-        
-        
+
     }
 
     /**

src/main/java/com/debortoliwines/odoo/api/Session.java

@@ -223,7 +223,10 @@ public static ArrayList<String> getDatabaseList(RPCProtocol protocol, String hos
 
     /**
      * Executes any command on the server linked to the /xmlrpc/object service.
-     * All parameters are prepended by: "databaseName,userID,password"
+     * All parameters are prepended by: "databaseName,userID,password" This
+     * method execute the command without the context parameter Its purpose is
+     * to be used by Odoo version prior to v10 or for v10 methods that mustn't
+     * use the context
      *
      * @param objectName Object or model name to execute the command on
      * @param commandName Command name to execute
@@ -236,29 +239,40 @@ public Object executeCommand(final String objectName, final String commandName,
         Object[] connectionParams = new Object[]{databaseName, userID, password, objectName, commandName};
 
         // Combine the connection parameters and command parameters
-//        Object[] params;
-//        if ()
-        Object[] params = new Object[connectionParams.length + (parameters == null ? 0 : parameters.length)];
+        Object[] params = new Object[connectionParams.length
+                + (parameters == null ? 0 : parameters.length)];
         System.arraycopy(connectionParams, 0, params, 0, connectionParams.length);
 
         if (parameters != null && parameters.length > 0) {
             System.arraycopy(parameters, 0, params, connectionParams.length, parameters.length);
         }
-        if (this.getServerVersion().getMajor() == 9 && this.context.size() > 0) {
-            Integer initial_length = params.length;
-            params = Arrays.copyOf(params, initial_length + this.context.size());
-            System.arraycopy(this.context.toString(), 0, params, initial_length, this.context.size());
-        }
-
-        //Try to always deal with the context
-//        (this.getServerVersion().getMajor() < 10)
-//                ? new Object[]{filter, offsetParam, limitParam, orderParam, false, count}
-//                : new Object[]{filter, offsetParam, limitParam, orderParam, count};
-//        this.getServerVersion()
-//        System.arraycopy(this.getContext(), 0, params, connectionParams.length, parameters.length);
         return objectClient.execute("execute", params);
     }
 
+    /**
+     * Executes any command on the server linked to the /xmlrpc/object service.
+     * parameters and Context are prepended .The context MUST NOT have been 
+     * already passed in the parameters.
+     *
+     * @param objectName Object or model name to execute the command on
+     * @param commandName Command name to execute
+     * @param parameters List of parameters for the command. For easy of use,
+     * consider the OdooCommand object or ObjectAdapter
+     * @return The result of the call
+     * @throws XmlRpcException
+     */
+    public Object executeCommandWithContext(final String objectName, final String commandName, final Object[] parameters) throws XmlRpcException {
+        Object[] connectionParams = new Object[]{databaseName, userID, password, objectName, commandName};
+
+        // Combine the parameters with the context
+        Object[] params = new Object[1 + (parameters == null ? 0 : parameters.length)];
+        if (parameters != null && parameters.length > 0) {
+            System.arraycopy(parameters, 0, params, 0, parameters.length);
+        }
+        System.arraycopy(new Object[]{getContext()}, 0, params, parameters.length, 1);
+        return executeCommand(objectName, commandName, params);
+    }
+
     /**
      * Executes a workflow by sending a signal to the workflow engine for a
      * specific object. This functions calls the 'exec_workflow' method on the