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
eWAYPayment · Apr 21, 2017 · b0f9235 · b0f9235
1 parent 87c2cb8
commit b0f9235
Show file tree

Hide file tree

Showing 38 changed files with 148 additions and 130 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 
     /**