Fix data types for many properties around dates and generic objects

Accounting API models updated

Added format: date to 20 properties
Added format: datetime to 22 properties
Updated eNum list for 12 properties
Updated string to integar for 3 properties
Removed "allOf" from 26 objects so parsing will map to model class and not generic object.
Replace BankAccount model class with Account class
Cleaned up a lot of descriptions

Early work on Files API included, but should not be considered stable.

Author: SidneyAllen

README.md

@@ -74,7 +74,7 @@ Add the dependency to your pom.xml.  Gradle, sbt and other build tools can be fo
     <dependency>
       <groupId>com.github.xeroapi</groupId>
       <artifactId>xero-java</artifactId>
-      <version>2.1.3</version>
+      <version>2.2.0</version>
 	</dependency>
 
 

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.github.xeroapi</groupId>
 	<artifactId>xero-java</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1.3</version>
+	<version>2.2.0</version>
 	<name>Xero-Java SDK</name>
 	<description>This is the official Java SDK for Xero API</description>
 	<url>https://github.com/XeroAPI/Xero-Java</url>

src/main/java/com/xero/api/ApiClient.java

@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-
 public class ApiClient {
     private final String basePath;
     private final HttpRequestFactory httpRequestFactory;
@@ -26,11 +25,13 @@ public class ApiClient {
 
     // A reasonable default object mapper. Client can pass in a chosen ObjectMapper anyway, this is just for reasonable defaults.
     private static ObjectMapper createDefaultObjectMapper() {
-        ObjectMapper objectMapper = new ObjectMapper()
-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-            .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-            .setDateFormat(new RFC3339DateFormat())
-            .setSerializationInclusion(Include.NON_NULL);
+    	ObjectMapper objectMapper = new ObjectMapper()
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .setDateFormat(new RFC3339DateFormat())
+                .setSerializationInclusion(Include.NON_NULL);
+    	objectMapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
+
         ThreeTenModule module = new ThreeTenModule();
         module.addDeserializer(Instant.class, CustomInstantDeserializer.INSTANT);
         module.addDeserializer(OffsetDateTime.class, CustomInstantDeserializer.OFFSET_DATE_TIME);

src/main/java/com/xero/api/CustomDateDeserializer.java

@@ -0,0 +1,46 @@
+package com.xero.api;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import org.threeten.bp.*;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+public class CustomDateDeserializer extends StdDeserializer<LocalDate> {
+	 
+	private static final long serialVersionUID = 1L;
+	
+    public CustomDateDeserializer() {
+        this(null);
+    }
+ 
+    public CustomDateDeserializer(Class<?> vc) {
+        super(vc);
+    }
+ 
+    public LocalDate deserialize(JsonParser jsonparser, DeserializationContext context)
+      throws IOException, JsonProcessingException {
+        String date = jsonparser.getText();
+        LocalDate formattedDate;
+        Pattern datePatt = Pattern.compile("^/Date\\((\\d+)([+-]\\d+)?\\)/$");
+		Matcher m = datePatt.matcher(date);
+		if (m.matches()) {
+			Long l = Long.parseLong(m.group(1));
+			formattedDate = Instant.ofEpochMilli(l).atZone(ZoneId.systemDefault()).toLocalDate();
+		} else {
+			throw new IllegalArgumentException("Wrong date format");
+		}
+		return formattedDate;
+    }
+}
+
+

src/main/java/com/xero/api/CustomDateModule.java

@@ -0,0 +1,19 @@
+package com.xero.api;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+public class CustomDateModule extends SimpleModule {
+
+	    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+		public CustomDateModule() {
+	 //       addDeserializer(LocalDate.class, new CustomDateDeserializer());
+	    }
+	}
+
+

src/main/java/com/xero/api/CustomOffsetDateTimeDeserializer.java

@@ -0,0 +1,46 @@
+package com.xero.api;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import org.threeten.bp.*;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+public class CustomOffsetDateTimeDeserializer extends StdDeserializer<OffsetDateTime> {
+	 
+	private static final long serialVersionUID = 1L;
+	
+    public CustomOffsetDateTimeDeserializer() {
+        this(null);
+    }
+ 
+    public CustomOffsetDateTimeDeserializer(Class<?> vc) {
+        super(vc);
+    }
+ 
+    public OffsetDateTime deserialize(JsonParser jsonparser, DeserializationContext context)
+      throws IOException, JsonProcessingException {
+        String date = jsonparser.getText();
+        OffsetDateTime formattedDate;
+        Pattern datePatt = Pattern.compile("^/Date\\((\\d+)([+-]\\d+)?\\)/$");
+		Matcher m = datePatt.matcher(date);
+		if (m.matches()) {
+			Long l = Long.parseLong(m.group(1));
+			formattedDate = Instant.ofEpochMilli(l).atZone(ZoneId.systemDefault()).toOffsetDateTime();
+		} else {
+			throw new IllegalArgumentException("Wrong date format");
+		}
+		return formattedDate;
+    }
+}
+
+

src/main/java/com/xero/api/JsonConfig.java

@@ -131,7 +131,7 @@ public String getAccessTokenUrl() {
 
   @Override
   public String getUserAgent() {
-    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-2.1.3]";
+    return USER_AGENT + " " + CONSUMER_KEY + " [Xero-Java-2.2.0]";
   }
 
   @Override