Merge pull request #27 from trolley/dev

RC: Attributes update

Author: Aman Aalam

README.md

@@ -20,11 +20,11 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.trolley</groupId>
     <artifactId>java-sdk</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 </dependency>
 ```
 
-The library's source is hosted at [https://github.com/paymentRails/java-sdk](https://github.com/trolley/java-sdk)
+The library's source is hosted at [https://github.com/Trolley/java-sdk](https://github.com/trolley/java-sdk)
 
 The library can be found at: [https://central.sonatype.com/artifact/com.trolley/java-sdk/](https://central.sonatype.com/artifact/com.trolley/java-sdk/)
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.trolley</groupId>
     <artifactId>java-sdk</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <description>Java SDK for Trolley API</description>
     <packaging>jar</packaging>
     <name>Trolley Java SDK</name>

src/main/java/com/trolley/trolley/Payment.java

@@ -33,7 +33,8 @@ public class Payment
     private Compliance compliance;
     private String payoutMethod;
     private String methodDisplay;
-    Object batch;
+    private Batch batch;
+    private String checkNumber;
     String withholdingAmount;
     String withholdingCurrency;
     String equivalentWithholdingAmount;
@@ -287,6 +288,22 @@ public void setMethodDisplay(final String methodDisplay) {
         this.methodDisplay = methodDisplay;
     }
 
+    public Batch getBatch() {
+        return batch;
+    }
+
+    public void setBatch(Batch batch) {
+        this.batch = batch;
+    }
+
+    public String getCheckNumber() {
+        return checkNumber;
+    }
+
+    public void setCheckNumber(String checkNumber) {
+        this.checkNumber = checkNumber;
+    }
+
     public static Payment find(final String payment_id, final String batch_id) throws Exception {
         return Configuration.gateway().payment.find(payment_id, batch_id);
     }

src/main/java/com/trolley/trolley/Recipient.java

@@ -1,7 +1,13 @@
 package com.trolley.trolley;
 
 import java.util.List;
+import java.util.Locale;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.ser.std.StdKeySerializers.Default;
+import com.trolley.trolley.Invoice.SearchBy;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Recipient
@@ -19,7 +25,7 @@ public class Recipient
     String taxType;
     String status;
     String language;
-    String complianceStatus;
+    ComplianceStatus complianceStatus;
     String dob;
     String passport;
     String updatedAt;
@@ -42,6 +48,35 @@ public class Recipient
     String taxForm;
     String taxFormStatus;
     String taxWithholdingPercentage;
+
+    public static enum ComplianceStatus {
+        REVIEW("review"),
+        BLOCKED("blocked"),
+        PENDING("pending"),
+        VERIFIED("verified");
+
+        private String key;
+
+        ComplianceStatus(String key) {
+            this.key = key;
+        }
+
+        @JsonCreator
+        public static ComplianceStatus fromString(String key) {
+            return key == null
+                    ? null
+                    : ComplianceStatus.valueOf(key.toUpperCase(Locale.US));
+        }
+
+        @JsonValue
+        public String getKey() {
+            return key;
+        }
+
+        public String toString(){
+            return key.toLowerCase(Locale.US);
+        }
+    }
 
     public Recipient() {
         this.taxWithholdingPercentage = "0.0";
@@ -223,11 +258,11 @@ public void setLanguage(final String language) {
         this.language = language;
     }
 
-    public String getComplianceStatus() {
+    public ComplianceStatus getComplianceStatus() {
         return this.complianceStatus;
     }
 
-    public void setComplianceStatus(final String complianceStatus) {
+    public void setComplianceStatus(final ComplianceStatus complianceStatus) {
         this.complianceStatus = complianceStatus;
     }
 

src/main/java/com/trolley/trolley/Version.java

@@ -6,5 +6,5 @@
 public class Version {
     public static int MAJOR = 1;
     public static int MINOR = 1;
-    public static int PATCH = 0;
+    public static int PATCH = 2;
 }

src/test/java/com/trolley/sdk/integration/BatchTest.java

@@ -3,6 +3,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
@@ -112,6 +113,9 @@ public void testCreateWithPayments() throws Exception {
 
         assertEquals("15.00", batchPayments.get(0).getAmount());
         assertEquals("USD", batchPayments.get(0).getCurrency());
+        assertEquals(batchPayments.get(0).getBatch().getId(), batch.getId());
+
+        assertNull(batchPayments.get(0).getCheckNumber());
 
         //Cleanup
         boolean recDelResult = testHelper.deleteRecipient(recipientAlpha);

src/test/java/com/trolley/sdk/integration/RecipientTest.java

@@ -55,6 +55,9 @@ public void testLifecycle() throws Exception {
         boolean response = client.recipient.update(recipient.getId(), body);
         assertNotNull(response);
 
+        // Test Compliance Status
+        assertTrue(recipient.getComplianceStatus() == Recipient.ComplianceStatus.PENDING);
+
         Recipient anotherRecipient = client.recipient.find(recipient.getId());
         assertEquals(anotherRecipient.getFirstName(), "Bob");
 
@@ -105,9 +108,13 @@ public void testRecipientRouteMinimum() throws Exception {
         Gateway client = new Gateway(config);
         ArrayList<Recipient> recipients = (ArrayList<Recipient>)client.recipient.search(1,20,"");
         //Making sure routeMinimum is not null before asserting it's value
-        assertNotNull(recipients.get(0).getRouteMinimum());
-        //Making sure routeMinium is set to a non-null value
-        assertTrue(Integer.parseInt(recipients.get(0).getRouteMinimum()) >= 0);
+        for (Recipient recipient : recipients) {
+            if(null != recipient.getRouteMinimum()){
+                //Making sure routeMinium is set to a non-null value
+                assertTrue(Integer.parseInt(recipient.getRouteMinimum()) >= 0);
+                break;
+            }
+        }        
     }
 
 }