Merge pull request #491 from sgilrodriguez/support-tax_service_opt_out

Add support for tax_service_opt_out in giftcard

Author: douglasmiller

src/main/java/com/ning/billing/recurly/model/GiftCard.java

@@ -71,6 +71,9 @@ public class GiftCard extends RecurlyObject {
     @XmlElement(name = "performance_obligation_id")
     private String performanceObligationId;
 
+    @XmlElement(name = "tax_service_opt_out")
+    private Boolean taxServiceOptOut;
+
     @XmlElement(name = "created_at")
     private DateTime createdAt;
 
@@ -188,6 +191,14 @@ public void setPerformanceObligationId(final Object performanceObligationId) {
         this.performanceObligationId = stringOrNull(performanceObligationId);
     }
 
+    public Boolean getTaxServiceOptOut() {
+        return taxServiceOptOut;
+    }
+
+    public void setTaxServiceOptOut(final Object taxServiceOptOut) {
+        this.taxServiceOptOut = booleanOrNull(taxServiceOptOut);
+    }
+
     public DateTime getCreatedAt() {
         return createdAt;
     }
@@ -274,6 +285,7 @@ public String toString() {
         sb.append(", liabilityGlAccountId='").append(liabilityGlAccountId).append('\'');
         sb.append(", revenueGlAccountId='").append(revenueGlAccountId).append('\'');
         sb.append(", performanceObligationId='").append(performanceObligationId).append('\'');
+        sb.append(", taxServiceOptOut='").append(taxServiceOptOut).append('\'');
         sb.append(", createdAt='").append(createdAt).append('\'');
         sb.append(", updatedAt='").append(updatedAt).append('\'');
         sb.append(", redeemedAt='").append(redeemedAt).append('\'');
@@ -331,6 +343,9 @@ public boolean equals(final Object o) {
         if (performanceObligationId != null ? !performanceObligationId.equals(that.performanceObligationId) : that.performanceObligationId != null) {
             return false;
         }
+        if (taxServiceOptOut != null ? !taxServiceOptOut.equals(that.taxServiceOptOut) : that.taxServiceOptOut != null) {
+            return false;
+        }
         if (createdAt != null ? createdAt.compareTo(that.createdAt) != 0 : that.createdAt != null) {
             return false;
         }
@@ -364,6 +379,7 @@ public int hashCode() {
             liabilityGlAccountId,
             revenueGlAccountId,
             performanceObligationId,
+            taxServiceOptOut,
             createdAt,
             updatedAt,
             redeemedAt,

src/test/java/com/ning/billing/recurly/model/TestGiftCards.java

@@ -65,6 +65,7 @@ public void testDeserialization() throws Exception {
                "        <liability_gl_account_id>123</liability_gl_account_id>\n" +
                "        <revenue_gl_account_id>456</revenue_gl_account_id>\n" +
                "        <performance_obligation_id>789</performance_obligation_id>\n" +
+               "        <tax_service_opt_out type=\"boolean\">true</tax_service_opt_out>\n" +
                "   </gift_card>" +
                "</gift_cards>";
 
@@ -86,6 +87,7 @@ public void testDeserialization() throws Exception {
         Assert.assertEquals(giftCard.getLiabilityGlAccountId(), "123");
         Assert.assertEquals(giftCard.getRevenueGlAccountId(), "456");
         Assert.assertEquals(giftCard.getPerformanceObligationId(), "789");
+        Assert.assertEquals(giftCard.getTaxServiceOptOut(), Boolean.TRUE);
         Assert.assertNull(giftCard.getCanceledAt());
 
         final Delivery delivery = giftCard.getDelivery();
@@ -107,4 +109,55 @@ public void testDeserialization() throws Exception {
         Assert.assertEquals(address.getZip(), "94110");
         Assert.assertEquals(address.getPhone(), "555-555-5555");
      }
+
+     @Test(groups = "fast")
+     public void testSerializationWithTaxServiceOptOut() throws Exception {
+        final GiftCard giftCard = new GiftCard();
+        giftCard.setProductCode("gift_card_100");
+        giftCard.setCurrency("USD");
+        giftCard.setUnitAmountInCents(10000);
+        giftCard.setTaxServiceOptOut(true);
+
+        final String xml = xmlMapper.writeValueAsString(giftCard);
+
+        Assert.assertTrue(xml.contains("<product_code>gift_card_100</product_code>"));
+        Assert.assertTrue(xml.contains("<currency>USD</currency>"));
+        Assert.assertTrue(xml.contains("<unit_amount_in_cents>10000</unit_amount_in_cents>"));
+        Assert.assertTrue(xml.contains("<tax_service_opt_out>true</tax_service_opt_out>"));
+     }
+
+     @Test(groups = "fast")
+     public void testDeserializationWithTaxServiceOptOutFalse() throws Exception {
+        final String giftCardData =
+               "<gift_card>" +
+               "    <product_code>gift_card</product_code>\n" +
+               "    <currency>USD</currency>   \n" +
+               "    <unit_amount_in_cents type=\"integer\">2000</unit_amount_in_cents>\n" +
+               "    <tax_service_opt_out type=\"boolean\">false</tax_service_opt_out>\n" +
+               "</gift_card>";
+
+        final GiftCard giftCard = xmlMapper.readValue(giftCardData, GiftCard.class);
+
+        Assert.assertEquals(giftCard.getProductCode(), "gift_card");
+        Assert.assertEquals(giftCard.getCurrency(), "USD");
+        Assert.assertEquals(giftCard.getUnitAmountInCents(), new Integer(2000));
+        Assert.assertEquals(giftCard.getTaxServiceOptOut(), Boolean.FALSE);
+     }
+
+     @Test(groups = "fast")
+     public void testDeserializationWithoutTaxServiceOptOut() throws Exception {
+        final String giftCardData =
+               "<gift_card>" +
+               "    <product_code>gift_card</product_code>\n" +
+               "    <currency>USD</currency>   \n" +
+               "    <unit_amount_in_cents type=\"integer\">2000</unit_amount_in_cents>\n" +
+               "</gift_card>";
+
+        final GiftCard giftCard = xmlMapper.readValue(giftCardData, GiftCard.class);
+
+        Assert.assertEquals(giftCard.getProductCode(), "gift_card");
+        Assert.assertEquals(giftCard.getCurrency(), "USD");
+        Assert.assertEquals(giftCard.getUnitAmountInCents(), new Integer(2000));
+        Assert.assertNull(giftCard.getTaxServiceOptOut());
+     }
  }