Merge pull request #190 from XeroAPI/sid-development

pom.xml update

Author: SidneyAllen

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>xero-java</artifactId>
     <packaging>jar</packaging>
     <name>xero-java</name>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
     <url>https://github.com/XeroAPI/Xero-Java</url>
     <description>This is the official Java SDK for Xero API</description>
     <licenses>
@@ -87,6 +87,7 @@
 	       <artifactId>log4j-core</artifactId>
 	       <version>2.11.0</version>
 	   	</dependency>
+           
 	    <!-- JSON processing: jackson -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -302,7 +303,7 @@
 		<google-api-client-version>1.23.0</google-api-client-version>
 		<jersey-common-version>2.25.1</jersey-common-version>
 		<jackson-version>2.9.10</jackson-version>
-		<jackson-databind-version>2.9.10.1</jackson-databind-version>
+		<jackson-databind-version>2.9.10.3</jackson-databind-version>
 		<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
         <junit-version>4.12</junit-version>
         <org-apache-httpcomponents>4.5.3</org-apache-httpcomponents>

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

@@ -12,6 +12,15 @@
 
 package com.xero.api;
 
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.threeten.bp.Instant;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.threeten.bp.ZoneId;
+
 public class StringUtil {
     /**
      * Check if the given array contains the given value (with case-insensitive
@@ -61,4 +70,42 @@ public static String join(String[] array, String separator) {
         }
         return out.toString();
     }
+
+    public LocalDate convertStringToDate(String date)
+            throws IOException {
+        LocalDate formattedDate;
+        Pattern datePatt = Pattern.compile("^/Date\\((\\d+)([+-]\\d+)?\\)/$");
+        Pattern datePattNeg = Pattern.compile("^/Date\\(-(\\d+)([+-]\\d+)?\\)/$");
+        Matcher m = datePatt.matcher(date);
+        Matcher matchNeg = datePattNeg.matcher(date);
+        if (m != null && m.matches()) {
+            Long l = Long.parseLong(m.group(1));
+            formattedDate = Instant.ofEpochMilli(l).atZone(ZoneId.systemDefault()).toLocalDate();
+        } else if (matchNeg != null && matchNeg.matches()) {
+            Long l = Long.parseLong(matchNeg.group(1));
+            formattedDate = Instant.ofEpochMilli(-l).atZone(ZoneId.systemDefault()).toLocalDate();
+        } else {
+            throw new IllegalArgumentException("Wrong date format");
+        }
+        return formattedDate;
+    }
+    
+    public OffsetDateTime convertStringToOffsetDateTime(String date)
+            throws IOException {
+        OffsetDateTime formattedDate;
+        Pattern datePatt = Pattern.compile("^/Date\\((\\d+)([+-]\\d+)?\\)/$");
+        Matcher m = datePatt.matcher(date);
+        Pattern datePattNeg = Pattern.compile("^/Date\\(-(\\d+)([+-]\\d+)?\\)/$");
+        Matcher mNeg = datePattNeg.matcher(date);
+        if (m != null && m.matches()) {
+            Long l = Long.parseLong(m.group(1));
+            formattedDate = Instant.ofEpochMilli(l).atZone(ZoneId.systemDefault()).toOffsetDateTime();
+        } else if (mNeg != null && mNeg.matches()) {
+            Long l = Long.parseLong(mNeg.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/client/AccountingApi.java

@@ -35,6 +35,7 @@
 import com.xero.models.accounting.Organisations;
 import com.xero.models.accounting.Overpayments;
 import com.xero.models.accounting.Payment;
+import com.xero.models.accounting.PaymentDelete;
 import com.xero.models.accounting.PaymentService;
 import com.xero.models.accounting.PaymentServices;
 import com.xero.models.accounting.Payments;
@@ -90,7 +91,7 @@ public class AccountingApi {
     private ApiClient apiClient;
     private static AccountingApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.4.0";
+    private String version = "3.5.0";
 
     public AccountingApi() {
         this(new ApiClient());
@@ -3974,15 +3975,15 @@ public HttpResponse deleteLinkedTransactionForHttpResponse(String accessToken,
     * <p><b>400</b> - A failed request due to validation error
     * @param xeroTenantId Xero identifier for Tenant
     * @param paymentID Unique identifier for a Payment
-    * @param payments The payments parameter
+    * @param paymentDelete The paymentDelete parameter
     * @param accessToken Authorization token for user set in header of each request
     * @return Payments
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public Payments  deletePayment(String accessToken, String xeroTenantId, UUID paymentID, Payments payments) throws IOException {
+    public Payments  deletePayment(String accessToken, String xeroTenantId, UUID paymentID, PaymentDelete paymentDelete) throws IOException {
         try {
             TypeReference<Payments> typeRef = new TypeReference<Payments>() {};
-            HttpResponse response = deletePaymentForHttpResponse(accessToken, xeroTenantId, paymentID, payments);
+            HttpResponse response = deletePaymentForHttpResponse(accessToken, xeroTenantId, paymentID, paymentDelete);
             return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
         } catch (HttpResponseException e) {
             XeroApiExceptionHandler handler = new XeroApiExceptionHandler();
@@ -3993,16 +3994,16 @@ public Payments  deletePayment(String accessToken, String xeroTenantId, UUID pay
         return null;
     }
 
-    public HttpResponse deletePaymentForHttpResponse(String accessToken,  String xeroTenantId,  UUID paymentID,  Payments payments) throws IOException {
+    public HttpResponse deletePaymentForHttpResponse(String accessToken,  String xeroTenantId,  UUID paymentID,  PaymentDelete paymentDelete) throws IOException {
         // verify the required parameter 'xeroTenantId' is set
         if (xeroTenantId == null) {
             throw new IllegalArgumentException("Missing the required parameter 'xeroTenantId' when calling deletePayment");
         }// verify the required parameter 'paymentID' is set
         if (paymentID == null) {
             throw new IllegalArgumentException("Missing the required parameter 'paymentID' when calling deletePayment");
-        }// verify the required parameter 'payments' is set
-        if (payments == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'payments' when calling deletePayment");
+        }// verify the required parameter 'paymentDelete' is set
+        if (paymentDelete == null) {
+            throw new IllegalArgumentException("Missing the required parameter 'paymentDelete' when calling deletePayment");
         }
         if (accessToken == null) {
             throw new IllegalArgumentException("Missing the required parameter 'accessToken' when calling deletePayment");
@@ -4024,7 +4025,7 @@ public HttpResponse deletePaymentForHttpResponse(String accessToken,  String xer
 
 
         HttpContent content = null;
-        content = apiClient.new JacksonJsonHttpContent(payments);
+        content = apiClient.new JacksonJsonHttpContent(paymentDelete);
 
         Credential credential = new Credential(BearerToken.authorizationHeaderAccessMethod()).setAccessToken(accessToken);
         HttpTransport transport = apiClient.getHttpTransport();       

src/main/java/com/xero/api/client/AssetApi.java

@@ -44,7 +44,7 @@ public class AssetApi {
     private ApiClient apiClient;
     private static AssetApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.4.0";
+    private String version = "3.5.0";
 
     public AssetApi() {
         this(new ApiClient());

src/main/java/com/xero/api/client/BankFeedsApi.java

@@ -45,7 +45,7 @@ public class BankFeedsApi {
     private ApiClient apiClient;
     private static BankFeedsApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.4.0";
+    private String version = "3.5.0";
 
     public BankFeedsApi() {
         this(new ApiClient());

src/main/java/com/xero/api/client/IdentityApi.java

@@ -41,7 +41,7 @@ public class IdentityApi {
     private ApiClient apiClient;
     private static IdentityApi instance = null;
     private String userAgent = "Default";
-    private String version = "3.4.0";
+    private String version = "3.5.0";
 
     public IdentityApi() {
         this(new ApiClient());