Merge pull request #25 from trolley/dev

RC v1.1.1

Author: Aman Aalam

.gitignore

@@ -2,6 +2,7 @@ nb-configuration
 target
 nbproject
 .classpath
+.idea/*
 .project
 .settings
 .settings/*
@@ -10,4 +11,4 @@ nbproject
 .vscode/*
 src/main/java/com/trolley/trolley/index.java
 /.metadata/
-.env
+.env

.mvn/jvm.config

@@ -0,0 +1,4 @@
+--add-opens java.base/java.util=ALL-UNNAMED
+--add-opens java.base/java.lang.reflect=ALL-UNNAMED
+--add-opens java.base/java.text=ALL-UNNAMED
+--add-opens java.desktop/java.awt.font=ALL-UNNAMED

README.md

@@ -1,9 +1,7 @@
-# Trolley Java SDK (Previously Payment Rails[^1])
+# Trolley Java SDK
 
 A native Java SDK for Trolley
 
-[^1]: [Payment Rails is now Trolley](https://www.trolley.com/payment-rails-is-now-trolley-series-a). We're in the process of updating our SDKs to support the new domain. In this transition phase, you might still see "PaymentRails" at some places.
-
 ## Installation
 
 #
@@ -22,21 +20,21 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.trolley</groupId>
     <artifactId>java-sdk</artifactId>
-    <version>1.0.1</version>
+    <version>1.1.1</version>
 </dependency>
 ```
 
-The library's source is hosted at [https://github.com/paymentRails/java-sdk](https://github.com/paymentRails/java-sdk)
+The library's source is hosted at [https://github.com/paymentRails/java-sdk](https://github.com/trolley/java-sdk)
 
-The library can be found at: [https://central.sonatype.com/artifact/com.trolley/java-sdk/1.0](https://central.sonatype.com/artifact/com.trolley/java-sdk/1.0)
+The library can be found at: [https://central.sonatype.com/artifact/com.trolley/java-sdk/](https://central.sonatype.com/artifact/com.trolley/java-sdk/)
 
 ## Getting Started
 
 ```java
 import com.trolley.java-sdk.*;
 import com.trolley.Exceptions.*;
 
-public class PaymentRailsExample {
+public class TrolleyExample {
     public static void main(String[] args) {
 
        Gateway client = new Gateway(new Configuration("YOUR_PUBLIC_KEY","YOUR_PRIVATE_KEY","production"));

pom.xml

@@ -3,11 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.trolley</groupId>
     <artifactId>java-sdk</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <description>Java SDK for Trolley API</description>
     <packaging>jar</packaging>
     <name>Trolley Java SDK</name>
-    <url>https://github.com/PaymentRails/java-sdk</url>
+    <url>https://github.com/Trolley/java-sdk</url>
 
     <licenses>
         <license>
@@ -41,9 +41,9 @@
         </developer>
     </developers>
      <scm>
-        <connection>scm:git:git://github.com/PaymentRails/java-sdk.git</connection>
-        <developerConnection>scm:git:git://github.com/PaymentRails/java-sdk.git</developerConnection>
-        <url>https://github.com/PaymentRails/java-sdk</url>
+        <connection>scm:git:git://github.com/Trolley/java-sdk.git</connection>
+        <developerConnection>scm:git:git://github.com/Trolley/java-sdk.git</developerConnection>
+        <url>https://github.com/Trolley/java-sdk</url>
         <tag>HEAD</tag>
     </scm>
     <properties>
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>

src/main/java/com/trolley/trolley/Client.java

@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.rmi.UnexpectedException;
-import java.io.Reader;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.DataOutputStream;

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

@@ -34,6 +34,7 @@ public class Recipient
     String payoutMethod;
     public Object payout;
     String emailAddress;
+    List<String> contactEmails;
     public Object inactiveReasons;
     Compliance compliance;
     List<RecipientAccount> accounts;
@@ -165,6 +166,14 @@ public String getEmail() {
     public void setEmail(final String email) {
         this.email = email;
     }
+
+    public List<String> getContactEmails() {
+        return this.contactEmails;
+    }
+
+    public void setContactEmails(final List<String> contactEmails) {
+        this.contactEmails = contactEmails;
+    }
 
     public String getName() {
         return this.name;

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

@@ -48,31 +48,24 @@ public void testInvoices() throws Exception {
             }
         };
 
-        // Create a new invoice
-        Invoice invoice = client.invoice.create(new Invoice(
-            recipient.getId(),
-            "invoice-123", 
-            "test-invoice-create-java-sdk", 
-            "ext-id-"+System.currentTimeMillis(), 
-            null,
-            null, 
-            null, 
-            invoiceLines));
+        // Create a new invoice - request body
+        Invoice invoice = new Invoice();
+        invoice.setRecipientId(recipient.getId());
+        invoice.setInvoiceNumber("invoice-123");
+        invoice.setDescription("test-invoice-create-java-sdk");
+        invoice.setExternalId("ext-id-"+System.currentTimeMillis());
+        invoice.setLines(invoiceLines);
+
+        // Create a new invoice - receiving response
+        invoice = client.invoice.create(invoice);
         assertEquals(invoice.getRecipientId(), recipient.getId());
 
         //Update an Invoice
+        Invoice updateInvoiceRequest = new Invoice();
+        updateInvoiceRequest.setDescription("test-invoice-update-java-sdk");
         final Invoice updatedInvoice = client.invoice.update(
             invoice.getId(),
-            new Invoice(
-                null,
-                "invoice-123", 
-                "test-invoice-update-java-sdk", 
-                null, 
-                null,
-                null, 
-                null, 
-                null
-            ));
+            updateInvoiceRequest);
         assertEquals(updatedInvoice.getDescription(),"test-invoice-update-java-sdk");
         assertEquals(updatedInvoice.getId(),invoice.getId());
 
@@ -110,32 +103,29 @@ public void testInvoiceLines() throws Exception {
         final Recipient recipient = testHelper.createRecipient();
 
         //Setup - create Invoice
-        Invoice invoice = client.invoice.create(new Invoice(
-            recipient.getId(),
-            "invoice-123", 
-            "test-invoice-create-java-sdk", 
-            "ext-id-"+System.currentTimeMillis(), 
-            null,
-            null, 
-            null, 
-            null));
+        Invoice createInvoiceRequest = new Invoice();
+        createInvoiceRequest.setRecipientId(recipient.getId());
+        createInvoiceRequest.setInvoiceNumber("invoice-123");
+        createInvoiceRequest.setDescription("test-invoice-create-java-sdk");
+        createInvoiceRequest.setExternalId("ext-id-"+System.currentTimeMillis());
+
+        Invoice invoice = client.invoice.create(createInvoiceRequest);
         assertEquals(invoice.getRecipientId(), recipient.getId());
 
         //Add a new Invoice Line to the Invoice just created
-        Invoice invoiceWithLines = client.invoiceLine.create(invoice.getId(), 
-            new InvoiceLine(
-                new Amount("100", "USD"),
-                InvoiceLine.InvoiceCategories.SERVICES,
-                "Invoice Line from Java SDK", 
-                "ILine-ExtId-"+System.currentTimeMillis(), 
-                true, 
-                true,
-                null, 
-                "2", 
-                new Amount("10", "USD"), 
-                new Amount("5", "USD"),
-                null, 
-                null));
+        InvoiceLine invoiceLineRequest = new InvoiceLine();
+        invoiceLineRequest.setUnitAmount(new Amount("100", "USD"));
+        invoiceLineRequest.setCategory(InvoiceLine.InvoiceCategories.SERVICES);
+        invoiceLineRequest.setDescription("Invoice Line from Java SDK");
+        invoiceLineRequest.setExternalId("ILine-ExtId-"+System.currentTimeMillis());
+        invoiceLineRequest.setTaxReportable(true);
+        invoiceLineRequest.setForceUsTaxActivity(true);
+        invoiceLineRequest.setQuantity("2");
+        invoiceLineRequest.setDiscountAmount(new Amount("10", "USD"));
+        invoiceLineRequest.setTaxAmount(new Amount("5", "USD"));
+
+        Invoice invoiceWithLines = client.invoiceLine.create(invoice.getId(), invoiceLineRequest);
+            
         assertEquals(invoiceWithLines.getLines().get(0).getUnitAmount().getValue(), "100.00");
 
         //Add multiple new Invoice Lines to the Invoice created

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

@@ -14,6 +14,7 @@
 import com.trolley.trolley.RecipientAccount;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @PrepareForTest(Recipient.class)
@@ -34,6 +35,7 @@ public void testCreateRecipient() throws Exception {
         assertEquals(recipient.getFirstName(), "John");
         assertEquals(recipient.getLastName(), "Smith");
         assertNotNull(recipient.getId());
+        assertEquals(recipient.getContactEmails(), Arrays.asList("john1@example.com", "john2@example.com"));
 
         //Cleanup
         boolean deleteResult = testHelper.deleteRecipient(recipient);

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

@@ -33,6 +33,7 @@ public Recipient createRecipient() throws Exception {
 
         String email = "\"create.recipient.java-sdk." + uuid.toString() + "@example.com\"";
         String body = "{\"type\": \"individual\",\"firstName\": \"John\",\"lastName\": \"Smith\",\"email\":" + email
+                + ",\"contactEmails\": [\"john1@example.com\", \"john2@example.com\"]"
                 + ",\"address\":{\"street1\": \"123 Main St\",\"city\": \"San Francisco\",\"region\": \"CA\",\"postalCode\": \"94131\",\"country\": \"DE\",\"phone\" : \"18005551212\"}}";
 
         Recipient recipient = client.recipient.create(body);