Merge pull request #15 from odoo-java/v14-migration-adn-tests

[WIP ]Support of Odoo v14

Author: flotho

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.odoojava</groupId>
     <artifactId>odoo-java-api</artifactId>
-    <version>3.1.7</version>
+    <version>3.1.8</version>
     <packaging>jar</packaging>
 
     <name>odoo-java-api</name>

src/main/java/com/odoojava/api/OdooCommand.java

@@ -21,30 +21,13 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.net.URL;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TimeZone;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.xml.bind.DatatypeConverter;
 
 import org.apache.xmlrpc.XmlRpcException;
 
-import com.googlecode.jsonrpc4j.JsonRpcHttpClient;
-import com.odoojava.api.Field.FieldType;
-import com.odoojava.api.helpers.FilterHelper;
 
 /**
  * 
@@ -201,8 +184,6 @@ public String PrintReportToFileName(Object[] ids) throws IOException, XmlRpcExce
 		FileOutputStream report_stream = new FileOutputStream(tmp_file);
 		try {
 			report_bytes = getPDFReportAsByte(reportName, ids);
-
-			
 			report_stream.write(report_bytes);
 		} catch (Throwable e) {
 			// TODO Auto-generated catch block

src/main/java/com/odoojava/api/ReportAdapter.java

@@ -71,18 +71,18 @@ public class Session {
 
 	private URL jsonurl;
 	private JsonRpcHttpClient jsonclient;
-	private Object[] login_args;
+	// private Object[] login_args;
 
 	public URL getJsonurl(String entryPoint) {
 		String protocol_str = "";
 		switch (this.protocol) {
-		case RPC_HTTP:
-			protocol_str = "http";
-			break;
+			case RPC_HTTP:
+				protocol_str = "http";
+				break;
 
-		default:
-			protocol_str = "https";
-			break;
+			default:
+				protocol_str = "https";
+				break;
 		}
 
 		URL urljson;
@@ -183,8 +183,8 @@ public void startSession() throws Exception {
 
 	private void checkVersionCompatibility() throws XmlRpcException, OdooApiException {
 
-		if (this.getServerVersion().getMajor() < 8 || this.getServerVersion().getMajor() > 13) {
-			throw new OdooApiException("Only Odoo Version from v8.x to 13.x are maintained. "
+		if (this.getServerVersion().getMajor() < 8 || this.getServerVersion().getMajor() > 14) {
+			throw new OdooApiException("Only Odoo Version from v8.x to 14.x are maintained. "
 					+ "Please choose another version of the library");
 		}
 
@@ -226,20 +226,12 @@ int authenticate() throws XmlRpcException, Exception {
 			System.out.println("json rpc login");
 
 		} catch (JsonRpcClientException e) {
-			// TODO Auto-generated catch block
-			String exc = e.getMessage();
 			System.out.println("Json rpc issue possibly caused by https://github.com/OCA/server-tools/issues/1237");
-			
-			
+			e.printStackTrace();
 		} catch (Throwable e) {
-			// TODO Auto-generated catch block
-			
 			System.out.println("General exception");
 			e.printStackTrace();
-		}
-		finally {
-			System.out.println("something bad potentially happened during connexion through JsonRPC");
-		}
+		} 
 
 		if (id instanceof Integer) {
 			userID = (Integer) id;
@@ -251,21 +243,19 @@ int authenticate() throws XmlRpcException, Exception {
 	}
 
 	private int authenticate_json_rpc() throws Throwable {
-		// TODO: fast and uggly implementation of json rpc, has to be reafctored in the
+		// TODO: fast and uggly implementation of json rpc, has to be refactored in the
 		// future
 
 		Map<String, String> articleMapOne = new HashMap<>();
 		articleMapOne.put("password", password);
 		articleMapOne.put("login", userName);
 		articleMapOne.put("db", databaseName);
 
-//		Object[] result = call_json_rpc(, "common", "login", articleMapOne);
+		// Object[] result = call_json_rpc(, "common", "login", articleMapOne);
 
 		jsonclient.setServiceUrl(getJsonurl("web/session/authenticate"));
 
-		Map<String, Object> result = jsonclient.invoke("call", articleMapOne, HashMap.class);
-//		Object[] result = jsonclient.readResponse(clazz, input);
-//		result.get
+		Map<String, Object> result =  jsonclient.invoke("call", articleMapOne, HashMap.class);
 		return (int) result.get("uid");
 	}
 
@@ -466,9 +456,13 @@ public Object executeCommandWithContext(final String objectName, final String co
 	 */
 	public void executeWorkflow(final String objectName, final String signal, final int objectID)
 			throws XmlRpcException {
-		Object[] params = new Object[] { databaseName, userID, password, objectName, signal, objectID };
 
-		objectClient.execute("exec_workflow", params);
+		if (serverVersion.getMajor() <= 10) {
+			Object[] params = new Object[] { databaseName, userID, password, objectName, signal, objectID };
+			objectClient.execute("exec_workflow", params);
+		} else {
+			System.out.println("exec_workflow is not supported in Odoo versions > 10");
+		}
 	}
 
 	/**

src/main/java/com/odoojava/api/Session.java

@@ -1,28 +1,44 @@
 package com.odoojava.api;
 
-import com.odoojava.api.Response;
-import com.odoojava.api.OdooApiException;
-import com.odoojava.api.Row;
-import com.odoojava.api.OdooCommand;
-import com.odoojava.api.ObjectAdapter;
-import com.odoojava.api.FieldCollection;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
+import com.odoojava.api.DemoDbGetter.DemoDbInfoRequester;
+import com.odoojava.api.OdooXmlRpcProxy.RPCProtocol;
 
 import java.util.HashMap;
 
 import org.apache.xmlrpc.XmlRpcException;
 import org.assertj.core.api.SoftAssertions;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class ObjectAdapterTest {
 	private static final String OTHER_SIGNAL_NAME = "otherSignalName";
 	private static final String OTHER_MODEL_NAME = "otherModel";
 	private static final String TEST_MODEL_NAME = "testModelName";
 	private static final String TEST_SIGNAL_NAME = "signal";
+	private static RPCProtocol protocol;
+	private static String host;
+	private static Integer port;
+	private static String databaseName;
+	private static String userName;
+	private static String password;
+
+	private static Session session;
 
 	boolean validated = false;
 
+	@BeforeClass
+	public static void setUp() throws Exception {
+		DemoDbGetter.getDemoDb(new DemoDbConnectionDataSetter());
+		session = new Session(protocol,
+				host, port, databaseName, userName,password);
+				 
+		session.startSession();
+	}
+	
+
+	
 	private final class TestAdapter extends ObjectAdapter {
 
 		public TestAdapter() throws OdooApiException, XmlRpcException {
@@ -39,7 +55,10 @@ public FieldCollection getFields() throws XmlRpcException {
 			return null;
 		}
 	}
+	
+	
 
+	
 	private abstract class AbstractTestCommand extends OdooCommand {
 		boolean searchCalledOnce = false;
 		boolean searchCalledTwiceOrMore = false;
@@ -155,6 +174,56 @@ public void executeWorkflow(final String objectName, final String signal, final
 		}
 	}
 
+
+
+	
+    /**
+     * Test of searchObject method, of class OdooCommand.
+     */
+    @Test
+    public void testSearchObject() throws Exception {
+        ObjectAdapter partnerAdapter = session.getObjectAdapter("res.partner");
+        FilterCollection filters = new FilterCollection();
+        filters.add("id", "<=", 2);
+        RowCollection partners = partnerAdapter.searchAndReadObject(
+            filters, new String[] { "name", "email" });
+
+        SoftAssertions softAssertions = new SoftAssertions();
+        softAssertions.assertThat(partners.isEmpty()).as("Is successful").isFalse();
+        softAssertions.assertAll();
+    }
+
+
+	@Test
+	public void should_return_model_list() throws Exception {
+		// use SoftAssertions instead of direct assertThat methods
+		// to collect all failing assertions in one go
+		SoftAssertions softly = new SoftAssertions();
+		
+		assert(true);
+	}
+
+	@Test
+	public void test_translated_name() throws Exception {
+		// use SoftAssertions instead of direct assertThat methods
+		// to collect all failing assertions in one go
+		SoftAssertions softly = new SoftAssertions();
+		
+		String objectName = "product.product";
+		ObjectAdapter prodAdapter = session.getObjectAdapter(objectName);
+		String[] fields = new String[]{"name", "display_name"};
+		Integer[]  ids = new Integer [] { 32 };
+		FilterCollection filters = new FilterCollection();
+		RowCollection prod_ids = prodAdapter.readObject(
+				ids,
+				fields);
+		Row prod_id = prod_ids.get(0);
+
+		Object[] readResult = (Object[]) session.executeCommand(objectName, "read", new Object[]{ids, fields});
+		System.out.println("prod_id name " + prod_id.get("name"));		
+		assert(true);
+	}
+	
 	@Test
 	public void should_throw_if_signal_doesnt_exist_for_that_object() throws Exception {
 		// Wrong signal
@@ -191,5 +260,41 @@ public void should_call_execute_worflow_on_command() throws Exception {
 		adapter.executeWorkflow(row, TEST_SIGNAL_NAME);
 		assertThat(command.executeWorkflowCalled).as("Command's executeWorkflow has been called").isTrue();
 	}
+	
+	/**
+	 * Only used to set the static data for connection on the main class
+	 */
+	private static class DemoDbConnectionDataSetter implements DemoDbInfoRequester {
+		@Override
+		public void setProtocol(RPCProtocol protocol) {
+			ObjectAdapterTest.protocol = protocol;
+		}
+
+		@Override
+		public void setHost(String host) {
+			ObjectAdapterTest.host = host;
+		}
+
+		@Override
+		public void setPort(Integer port) {
+			ObjectAdapterTest.port = port;
+		}
+
+		@Override
+		public void setDatabaseName(String databaseName) {
+			ObjectAdapterTest.databaseName = databaseName;
+		}
+
+		@Override
+		public void setUserName(String userName) {
+			ObjectAdapterTest.userName = userName;
+		}
+
+		@Override
+		public void setPassword(String password) {
+			ObjectAdapterTest.password = password;
+		}
+	}
+
 
 }