From b0f9235cea3e9efaf32e84b1538d2f10a0bd90a3 Mon Sep 17 00:00:00 2001
From: John C <incarnate@users.noreply.github.com>
Date: Fri, 21 Apr 2017 16:22:42 +1000
Subject: [PATCH] Upgrade Jackson to v2 and set ObjectMapper to case
 insensitive

Fixes an issue on some systems where the case of fields in Rapid does not
match the properties of the object
---
 CHANGELOG.md                                  |  5 +++
 README.md                                     |  1 -
 pom.xml                                       | 12 +++++--
 .../rapid/sdk/beans/external/CardDetails.java | 23 ++++++------
 .../rapid/sdk/beans/external/LineItem.java    |  2 +-
 .../beans/internal/BeagleVerification.java    |  2 +-
 .../rapid/sdk/beans/internal/Customer.java    | 25 ++++++-------
 .../rapid/sdk/beans/internal/Option.java      |  2 +-
 .../rapid/sdk/beans/internal/Payment.java     |  8 ++---
 .../sdk/beans/internal/RefundDetails.java     |  8 ++---
 .../sdk/beans/internal/ShippingAddress.java   |  8 ++---
 .../rapid/sdk/beans/internal/Transaction.java | 10 +++---
 .../sdk/beans/internal/Verification.java      |  2 +-
 .../entities/CancelAuthorisationRequest.java  |  2 +-
 .../entities/CancelAuthorisationResponse.java |  4 +--
 .../sdk/entities/CapturePaymentRequest.java   |  2 +-
 .../sdk/entities/CapturePaymentResponse.java  | 17 ++++-----
 .../sdk/entities/CreateAccessCodeRequest.java | 21 +++++------
 .../entities/CreateAccessCodeResponse.java    |  4 +--
 .../CreateAccessCodeSharedRequest.java        | 36 +++++++++----------
 .../CreateAccessCodeSharedResponse.java       |  4 +--
 .../entities/DirectCustomerSearchRequest.java |  2 +-
 .../DirectCustomerSearchResponse.java         |  4 +--
 .../sdk/entities/DirectPaymentRequest.java    | 21 +++++------
 .../sdk/entities/DirectPaymentResponse.java   |  4 +--
 .../sdk/entities/DirectRefundRequest.java     | 16 +++++----
 .../sdk/entities/DirectRefundResponse.java    |  5 +--
 .../entities/TransactionSearchResponse.java   |  5 +--
 .../process/AbstractMessageProcess.java       |  5 ++-
 ...ssCodeSharedToCreateCustConverterTest.java |  2 +-
 ...sCodeSharedToCreateTransConverterTest.java |  2 +-
 .../AccessCodeToCreateCustConverterTest.java  |  2 +-
 .../AccessCodeToCreateTransConverterTest.java |  2 +-
 ...tCustomerToQueryCustomerConverterTest.java |  2 +-
 ...irectPaymentToCreateCustConverterTest.java |  2 +-
 ...rectPaymentToCreateTransConverterTest.java |  2 +-
 ...ctRefundToRefundResponseConverterTest.java |  2 +-
 .../SearchToQueryTransConverterTest.java      |  2 +-
 38 files changed, 148 insertions(+), 130 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b88bf84..e09da00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All Notable changes will be documented in this file
 
+## 1.3.0
+
+ - Updated SDK to use TLS 1.2 when connecting to eWAY
+ - Updated Jackson (JSON library) to version 2
+
 ## 1.2.0
 
  - Added ability to set the Rapid API version and new associated fields
diff --git a/README.md b/README.md
index 5da17ce..bc3f9f6 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@ A Java library to integrate with eWAY's Rapid Payment API.
 Sign up with eWAY at:
  - Australia:    https://www.eway.com.au/
  - New Zealand:  https://eway.io/nz/
- - UK:           https://eway.io/uk/
  - Hong Kong:    https://eway.io/hk/
  - Malaysia:     https://eway.io/my/
  - Singapore:    https://eway.io/sg/
diff --git a/pom.xml b/pom.xml
index 709f117..85b4b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.ewaypayments</groupId>
     <artifactId>eway-rapid-java</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
     <packaging>jar</packaging>
 
     <name>eWAY Rapid API Library</name>
@@ -67,10 +67,11 @@
             <version>4.12</version>
         </dependency>
         <!-- Jersey JSON Jackson (2.x) entity providers support module -->
+        <!---->
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
-            <version>2.8</version>
+            <version>2.25.1</version>
         </dependency>
         <!-- Apache Commons Validator provides the building blocks for both client
         side validation and server side data validation. It may be used standalone
@@ -96,7 +97,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.6.0</version>
+            <version>2.6.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.6.7</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/external/CardDetails.java b/src/main/java/com/eway/payment/rapid/sdk/beans/external/CardDetails.java
index 2889c5e..975e99e 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/external/CardDetails.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/external/CardDetails.java
@@ -1,7 +1,8 @@
 package com.eway.payment.rapid.sdk.beans.external;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 /**
  * Card Details
@@ -32,7 +33,7 @@ public String getName() {
      *
      * @param name Name on the card
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("Name")
     public void setName(String name) {
         this.name = name;
@@ -53,7 +54,7 @@ public String getNumber() {
      *
      * @param number Number on the credit card
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("Number")
     public void setNumber(String number) {
         this.number = number;
@@ -74,7 +75,7 @@ public String getExpiryMonth() {
      *
      * @param expiryMonth Card expiry month
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("ExpiryMonth")
     public void setExpiryMonth(String expiryMonth) {
 		if (expiryMonth != null && expiryMonth.length() == 1) {
@@ -97,7 +98,7 @@ public String getExpiryYear() {
      *
      * @param expiryYear Card expiry year
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("ExpiryYear")
     public void setExpiryYear(String expiryYear) {
         this.expiryYear = expiryYear;
@@ -117,7 +118,7 @@ public String getStartMonth() {
      *
      * @param startMonth Card start month
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("StartMonth")
     public void setStartMonth(String startMonth) {
         this.startMonth = startMonth;
@@ -137,7 +138,7 @@ public String getStartYear() {
      *
      * @param startYear Card start year
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("StartYear")
     public void setStartYear(String startYear) {
         this.startYear = startYear;
@@ -157,7 +158,7 @@ public String getIssueNumber() {
      *
      * @param issueNumber Card issue number
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("IssueNumber")
     public void setIssueNumber(String issueNumber) {
         this.issueNumber = issueNumber;
@@ -177,7 +178,7 @@ public String getCVN() {
      *
      * @param CVN Card verification number
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CVN")
     public void setCVN(String CVN) {
         this.CVN = CVN;
@@ -197,7 +198,7 @@ public int getCardType() {
      *
      * @param cardType Card Type
      */
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardType")
     public void setCardType(int cardType) {
         this.cardType = cardType;
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/external/LineItem.java b/src/main/java/com/eway/payment/rapid/sdk/beans/external/LineItem.java
index 9497694..3c0e81b 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/external/LineItem.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/external/LineItem.java
@@ -1,6 +1,6 @@
 package com.eway.payment.rapid.sdk.beans.external;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Contains line item information
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/BeagleVerification.java b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/BeagleVerification.java
index a89df37..09b0d4b 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/BeagleVerification.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/BeagleVerification.java
@@ -1,6 +1,6 @@
 package com.eway.payment.rapid.sdk.beans.internal;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class BeagleVerification {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Customer.java b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Customer.java
index e5014c2..13b54c0 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Customer.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Customer.java
@@ -2,9 +2,10 @@
 
 import com.eway.payment.rapid.sdk.beans.external.CardDetails;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Customer {
@@ -66,42 +67,42 @@ public class Customer {
     @JsonProperty("Url")
     private String url;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardNumber")
     private String cardNumber;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardStartMonth")
     private String cardStartMonth;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardStartYear")
     private String cardStartYear;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardIssueNumber")
     private String cardIssueNumber;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardName")
     private String cardName;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardExpiryMonth")
     private Integer cardExpiryMonth;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardExpiryYear")
     private Integer cardExpiryYear;
 
     @JsonProperty("IsActive")
     private String isActive;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CardDetails")
     private CardDetails cardDetails;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CustomerIP")
     private String customerDeviceIP;
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Option.java b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Option.java
index a055de1..e6bfc64 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Option.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Option.java
@@ -1,6 +1,6 @@
 package com.eway.payment.rapid.sdk.beans.internal;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Option {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Payment.java b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Payment.java
index 9e0f372..0e0f497 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Payment.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Payment.java
@@ -1,13 +1,13 @@
 package com.eway.payment.rapid.sdk.beans.internal;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Contains payment information
  */
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Payment {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/RefundDetails.java b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/RefundDetails.java
index 68a81e4..f673fa3 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/RefundDetails.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/RefundDetails.java
@@ -1,11 +1,11 @@
 package com.eway.payment.rapid.sdk.beans.internal;
 
 import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RefundDetails {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/ShippingAddress.java b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/ShippingAddress.java
index 726bd0d..ae26359 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/ShippingAddress.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/ShippingAddress.java
@@ -1,10 +1,10 @@
 package com.eway.payment.rapid.sdk.beans.internal;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ShippingAddress {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Transaction.java b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Transaction.java
index a3dcfd5..25e241c 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Transaction.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Transaction.java
@@ -1,8 +1,8 @@
 package com.eway.payment.rapid.sdk.beans.internal;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Transaction {
@@ -46,11 +46,11 @@ public class Transaction {
     @JsonProperty("Verification")
     private Verification verification;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("Customer")
     private Customer customer;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("ShippingAddress")
     private ShippingAddress shippingAddress;
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Verification.java b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Verification.java
index 71ca0e6..0da3f1b 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Verification.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/beans/internal/Verification.java
@@ -1,6 +1,6 @@
 package com.eway.payment.rapid.sdk.beans.internal;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Verification {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/CancelAuthorisationRequest.java b/src/main/java/com/eway/payment/rapid/sdk/entities/CancelAuthorisationRequest.java
index 5983e87..9eb9831 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/CancelAuthorisationRequest.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/CancelAuthorisationRequest.java
@@ -1,6 +1,6 @@
 package com.eway.payment.rapid.sdk.entities;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class CancelAuthorisationRequest extends Request {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/CancelAuthorisationResponse.java b/src/main/java/com/eway/payment/rapid/sdk/entities/CancelAuthorisationResponse.java
index 3ed6527..2e7fd58 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/CancelAuthorisationResponse.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/CancelAuthorisationResponse.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.entities;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Response object for a Cancel Authorisation request
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/CapturePaymentRequest.java b/src/main/java/com/eway/payment/rapid/sdk/entities/CapturePaymentRequest.java
index 9b39b43..3f434d1 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/CapturePaymentRequest.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/CapturePaymentRequest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.entities;
 
 import com.eway.payment.rapid.sdk.beans.internal.Payment;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class CapturePaymentRequest extends Request {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/CapturePaymentResponse.java b/src/main/java/com/eway/payment/rapid/sdk/entities/CapturePaymentResponse.java
index e21c28e..eb736b3 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/CapturePaymentResponse.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/CapturePaymentResponse.java
@@ -1,30 +1,27 @@
 package com.eway.payment.rapid.sdk.entities;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Response object from capturing a payment
  */
-@SuppressWarnings("restriction")
-@XmlRootElement(name = "CapturePaymentResponse")
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class CapturePaymentResponse extends Response {
 
-    @XmlElement(name = "ResponseCode")
+    @JsonProperty("ResponseCode")
     private String responseCode;
     
-    @XmlElement(name = "ResponseMessage")
+    @JsonProperty("ResponseMessage")
     private String responseMessage;
     
-    @XmlElement(name = "TransactionID")
+    @JsonProperty("TransactionID")
     private String transactionID;
     
-    @XmlElement(name = "TransactionStatus")
+    @JsonProperty("TransactionStatus")
     private Boolean transactionStatus;
     
-    @XmlElement(name = "Errors")
+    @JsonProperty("Errors")
     private String errors;
 
     /**
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeRequest.java b/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeRequest.java
index 607f367..9ee9221 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeRequest.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeRequest.java
@@ -5,20 +5,21 @@
 import com.eway.payment.rapid.sdk.beans.internal.Option;
 import com.eway.payment.rapid.sdk.beans.internal.Payment;
 import com.eway.payment.rapid.sdk.beans.internal.ShippingAddress;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class CreateAccessCodeRequest extends Request {
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("Customer")
     private Customer customer;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("ShippingAddress")
     private ShippingAddress shippingAddress;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("ShippingMethod")
     private String shippingMethod;
 
@@ -37,26 +38,26 @@ public class CreateAccessCodeRequest extends Request {
     @JsonProperty("Method")
     private String method;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CustomerIP")
     private String customerIP;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("DeviceID")
     private String deviceID;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CheckoutPayment")
     private Boolean checkoutPayment;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CheckoutUrl")
     private String checkoutUrl;
 
     @JsonProperty("TransactionType")
     private String transactionType;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("PartnerID")
     private String partnerID;
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeResponse.java b/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeResponse.java
index c9d73dd..52286bc 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeResponse.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeResponse.java
@@ -2,8 +2,8 @@
 
 import com.eway.payment.rapid.sdk.beans.internal.Customer;
 import com.eway.payment.rapid.sdk.beans.internal.Payment;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * The response from creating an AccessCode for a Transparent Redirect
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeSharedRequest.java b/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeSharedRequest.java
index b3ef2d7..4b096a9 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeSharedRequest.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeSharedRequest.java
@@ -6,20 +6,20 @@
 import com.eway.payment.rapid.sdk.beans.internal.Payment;
 import com.eway.payment.rapid.sdk.beans.internal.ShippingAddress;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class CreateAccessCodeSharedRequest extends Request {
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("Customer")
     private Customer customer;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("ShippingAddress")
     private ShippingAddress shippingAddress;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("ShippingMethod")
     private String shippingMethod;
 
@@ -38,58 +38,58 @@ public class CreateAccessCodeSharedRequest extends Request {
     @JsonProperty("CancelUrl")
     private String cancelUrl;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("CheckoutUrl")
     private String checkoutUrl;
 
     @JsonProperty("Method")
     private String method;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("DeviceID")
     private String deviceID;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("CustomerIP")
     private String customerIP;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("TransactionType")
     private String transactionType;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("LogoUrl")
     private String logoUrl;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("HeaderText")
     private String headerText;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("PartnerID")
     private String partnerID;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("Language")
     private String language;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("CustomerReadOnly")
     private Boolean customerReadOnly;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("CustomView")
     private String customView;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("VerifyCustomerPhone")
     private Boolean verifyCustomerPhone;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("VerifyCustomerEmail")
     private Boolean verifyCustomerEmail;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("CheckoutPayment")
     private Boolean checkoutPayment;
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeSharedResponse.java b/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeSharedResponse.java
index ade0ca1..121c334 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeSharedResponse.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/CreateAccessCodeSharedResponse.java
@@ -3,8 +3,8 @@
 import com.eway.payment.rapid.sdk.beans.internal.Customer;
 import com.eway.payment.rapid.sdk.beans.internal.Payment;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Response from creating a transaction using the Responsive Shared Page. Use
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectCustomerSearchRequest.java b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectCustomerSearchRequest.java
index 4ac954e..23a0734 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectCustomerSearchRequest.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectCustomerSearchRequest.java
@@ -1,6 +1,6 @@
 package com.eway.payment.rapid.sdk.entities;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class DirectCustomerSearchRequest extends Request {
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectCustomerSearchResponse.java b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectCustomerSearchResponse.java
index c9fa531..0d99b99 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectCustomerSearchResponse.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectCustomerSearchResponse.java
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.eway.payment.rapid.sdk.beans.internal.Customer;
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectPaymentRequest.java b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectPaymentRequest.java
index 419a252..ad7b18d 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectPaymentRequest.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectPaymentRequest.java
@@ -1,21 +1,22 @@
 package com.eway.payment.rapid.sdk.entities;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-
 import com.eway.payment.rapid.sdk.beans.external.LineItem;
 import com.eway.payment.rapid.sdk.beans.internal.Customer;
 import com.eway.payment.rapid.sdk.beans.internal.Option;
 import com.eway.payment.rapid.sdk.beans.internal.Payment;
 import com.eway.payment.rapid.sdk.beans.internal.ShippingAddress;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
 public class DirectPaymentRequest extends Request {
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("Customer")
     private Customer customer;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("ShippingAddress")
     private ShippingAddress shippingAddress;
 
@@ -34,23 +35,23 @@ public class DirectPaymentRequest extends Request {
     @JsonProperty("TransactionType")
     private String transactionType;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CustomerIP")
     private String customerIP;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("DeviceID")
     private String deviceID;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("PartnerID")
     private String partnerID;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("RedirectUrl")
     private String redirectUrl;
     
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("SecuredCardData")
     private String securedCardData;
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectPaymentResponse.java b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectPaymentResponse.java
index 3cf5696..23b6bd6 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectPaymentResponse.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectPaymentResponse.java
@@ -3,8 +3,8 @@
 import com.eway.payment.rapid.sdk.beans.internal.Customer;
 import com.eway.payment.rapid.sdk.beans.internal.Payment;
 import com.eway.payment.rapid.sdk.beans.internal.Verification;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * The response from completing a direct payment
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectRefundRequest.java b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectRefundRequest.java
index dbb6620..61515a5 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectRefundRequest.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectRefundRequest.java
@@ -5,16 +5,18 @@
 import com.eway.payment.rapid.sdk.beans.internal.Option;
 import com.eway.payment.rapid.sdk.beans.internal.RefundDetails;
 import com.eway.payment.rapid.sdk.beans.internal.ShippingAddress;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class DirectRefundRequest extends Request {
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("Customer")
     public Customer customer;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("ShippingAddress")
     public ShippingAddress shippingAddress;
 
@@ -27,15 +29,15 @@ public class DirectRefundRequest extends Request {
     @JsonProperty("Options")
     public Option[] options = new Option[0];
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("DeviceID")
     public String deviceID;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("CustomerIP")
     public String customerIP;
 
-    @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+    @JsonInclude(Include.NON_NULL)
     @JsonProperty("PartnerID")
     public String partnerID;
 
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectRefundResponse.java b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectRefundResponse.java
index 5abc645..41c0dd4 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/DirectRefundResponse.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/DirectRefundResponse.java
@@ -2,8 +2,9 @@
 
 import com.eway.payment.rapid.sdk.beans.internal.Customer;
 import com.eway.payment.rapid.sdk.beans.internal.RefundDetails;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * The response from completing a refund
diff --git a/src/main/java/com/eway/payment/rapid/sdk/entities/TransactionSearchResponse.java b/src/main/java/com/eway/payment/rapid/sdk/entities/TransactionSearchResponse.java
index 0c76476..5e7ef61 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/entities/TransactionSearchResponse.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/entities/TransactionSearchResponse.java
@@ -1,8 +1,9 @@
 package com.eway.payment.rapid.sdk.entities;
 
 import com.eway.payment.rapid.sdk.beans.internal.Transaction;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * The response from a transaction search
diff --git a/src/main/java/com/eway/payment/rapid/sdk/message/process/AbstractMessageProcess.java b/src/main/java/com/eway/payment/rapid/sdk/message/process/AbstractMessageProcess.java
index a990ad7..e70aaa2 100644
--- a/src/main/java/com/eway/payment/rapid/sdk/message/process/AbstractMessageProcess.java
+++ b/src/main/java/com/eway/payment/rapid/sdk/message/process/AbstractMessageProcess.java
@@ -12,7 +12,8 @@
 import com.sun.jersey.api.client.WebResource;
 
 import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.MapperFeature;
 
 import java.io.IOException;
 import java.security.KeyManagementException;
@@ -80,6 +81,7 @@ protected final <U, K> U doPost(K request, Class<U> responseClass) throws RapidS
             }
 
             ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
             requestJson = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(request);
 
             SSLContext context = SSLContext.getInstance("TLSv1.2");
@@ -133,6 +135,7 @@ protected final <U, K> U doPut(K request, Class<U> responseClass) throws RapidSd
             }
 
             ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
             requestJson = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(request);
 
             SSLContext context = SSLContext.getInstance("TLSv1.2");
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeSharedToCreateCustConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeSharedToCreateCustConverterTest.java
index df2e4d1..07fa9d0 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeSharedToCreateCustConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeSharedToCreateCustConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeSharedToCreateTransConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeSharedToCreateTransConverterTest.java
index f627a3a..fe85c4f 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeSharedToCreateTransConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeSharedToCreateTransConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeToCreateCustConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeToCreateCustConverterTest.java
index 3999142..3f3a37d 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeToCreateCustConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeToCreateCustConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeToCreateTransConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeToCreateTransConverterTest.java
index 36666f5..648189f 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeToCreateTransConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/AccessCodeToCreateTransConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectCustomerToQueryCustomerConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectCustomerToQueryCustomerConverterTest.java
index 433ef61..e90c629 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectCustomerToQueryCustomerConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectCustomerToQueryCustomerConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectPaymentToCreateCustConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectPaymentToCreateCustConverterTest.java
index a77f694..3d19162 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectPaymentToCreateCustConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectPaymentToCreateCustConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectPaymentToCreateTransConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectPaymentToCreateTransConverterTest.java
index 0811e03..243f84d 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectPaymentToCreateTransConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectPaymentToCreateTransConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectRefundToRefundResponseConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectRefundToRefundResponseConverterTest.java
index a801e51..a787828 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectRefundToRefundResponseConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/DirectRefundToRefundResponseConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/SearchToQueryTransConverterTest.java b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/SearchToQueryTransConverterTest.java
index 1783803..aa5f7ab 100644
--- a/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/SearchToQueryTransConverterTest.java
+++ b/src/test/java/com/eway/payment/rapid/sdk/message/convert/response/SearchToQueryTransConverterTest.java
@@ -1,7 +1,7 @@
 package com.eway.payment.rapid.sdk.message.convert.response;
 
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;