Clean up code

Interfaces like Map should always be used instead of implementations
classes like HashMap, in particular for parameters and return types.

Also refactored ObjectAdapter#writeObject to make it simpler.

Author: fpoyer

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

@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.xmlrpc.XmlRpcException;
 
@@ -797,8 +798,7 @@ public Boolean[] writeObject(final RowCollection rows, final boolean changesOnly
 	 * @throws OpeneERPApiException
 	 * @throws XmlRpcException
 	 */
-	public boolean writeObject(final Row row, boolean changesOnly) throws OpeneERPApiException, XmlRpcException {
-		HashMap<String, Object> valueList = new HashMap<String, Object>();
+	public boolean writeObject(final Row row, boolean changesOnly) throws OpeneERPApiException {
 
 		Object idObj = row.get("id");
 
@@ -807,23 +807,38 @@ public boolean writeObject(final Row row, boolean changesOnly) throws OpeneERPAp
 
 		int id = Integer.parseInt(idObj.toString());
 
-		if (changesOnly) {
-			for (Field fld : row.getChangedFields())
-				valueList.put(fld.getName(), formatValueForWrite(fld, row.get(fld)));
-		} else
-			for (Field fld : row.getFields()) {
-				valueList.put(fld.getName(), formatValueForWrite(fld, row.get(fld)));
-			}
+		Map<String, Object> valueList = collectValues(row, changesOnly);
 
 		if (valueList.size() == 0)
 			return false;
 
-		boolean success = command.writeObject(modelName, id, valueList);
+		try {
+
+			boolean success = command.writeObject(modelName, id, valueList);
+			if (success) {
+				row.changesApplied();
+			}
+			return success;
+
+		} catch (XmlRpcException e) {
+			throw new OpeneERPApiException(e);
+		}
+
+	}
 
-		if (success)
-			row.changesApplied();
+	private Map<String, Object> collectValues(final Row row, boolean changesOnly) {
+		Map<String, Object> valueList = new HashMap<>();
+		FieldCollection fields;
+		if (changesOnly) {
+			fields = row.getChangedFields();
+		} else {
+			fields = row.getFields();
+		}
 
-		return success;
+		for (Field fld : fields) {
+			valueList.put(fld.getName(), formatValueForWrite(fld, row.get(fld)));
+		}
+		return valueList;
 	}
 
 	/**

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

@@ -20,6 +20,8 @@
 package com.debortoliwines.odoo.api;
 
 import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.xmlrpc.XmlRpcException;
 
 /**
@@ -98,9 +100,8 @@ public Object[] readObject(String objectName, Object [] ids, String [] fields) t
 	 * @return True if the update was successful
 	 * @throws XmlRpcException
 	 */
-	public boolean writeObject(String objectName, int id, HashMap<String, Object> valueList) throws XmlRpcException{
-		boolean result = false;
-		result = (Boolean) session.executeCommand(objectName, "write", new Object[] {id, valueList});
+	public boolean writeObject(String objectName, int id, Map<String, Object> valueList) throws XmlRpcException {
+		boolean result = (Boolean) session.executeCommand(objectName, "write", new Object[] { id, valueList });
 		return result;
 	}