diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonWithBundleKeys.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonWithBundleKeys.java
index 1e3e165..67d5e6a 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonWithBundleKeys.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceJsonWithBundleKeys.java
@@ -54,4 +54,32 @@ public class InvoiceJsonWithBundleKeys extends InvoiceJsonSimple {
public String getBundleKeys() {
return bundleKeys;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ if (!super.equals(o)) {
+ return false;
+ }
+
+ final InvoiceJsonWithBundleKeys that = (InvoiceJsonWithBundleKeys) o;
+
+ if (bundleKeys != null ? !bundleKeys.equals(that.bundleKeys) : that.bundleKeys != null) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = super.hashCode();
+ result = 31 * result + (bundleKeys != null ? bundleKeys.hashCode() : 0);
+ return result;
+ }
}
diff --git a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestInvoiceJsonWithBundleKeys.java b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestInvoiceJsonWithBundleKeys.java
new file mode 100644
index 0000000..8603492
--- /dev/null
+++ b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestInvoiceJsonWithBundleKeys.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2010-2012 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.jaxrs.json;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+import com.ning.billing.invoice.api.Invoice;
+
+public class TestInvoiceJsonWithBundleKeys {
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ static {
+ mapper.registerModule(new JodaModule());
+ mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+ }
+
+ @Test(groups = "fast")
+ public void testJson() throws Exception {
+ final BigDecimal amount = BigDecimal.TEN;
+ final BigDecimal credit = BigDecimal.ONE;
+ final String invoiceId = UUID.randomUUID().toString();
+ final DateTime invoiceDate = new DateTime(DateTimeZone.UTC);
+ final DateTime targetDate = new DateTime(DateTimeZone.UTC);
+ final String invoiceNumber = UUID.randomUUID().toString();
+ final BigDecimal balance = BigDecimal.ZERO;
+ final String accountId = UUID.randomUUID().toString();
+ final String bundleKeys = UUID.randomUUID().toString();
+ final InvoiceJsonWithBundleKeys invoiceJsonSimple = new InvoiceJsonWithBundleKeys(amount, credit, invoiceId, invoiceDate,
+ targetDate, invoiceNumber, balance, accountId, bundleKeys);
+ Assert.assertEquals(invoiceJsonSimple.getAmount(), amount);
+ Assert.assertEquals(invoiceJsonSimple.getCredit(), credit);
+ Assert.assertEquals(invoiceJsonSimple.getInvoiceId(), invoiceId);
+ Assert.assertEquals(invoiceJsonSimple.getInvoiceDate(), invoiceDate);
+ Assert.assertEquals(invoiceJsonSimple.getTargetDate(), targetDate);
+ Assert.assertEquals(invoiceJsonSimple.getInvoiceNumber(), invoiceNumber);
+ Assert.assertEquals(invoiceJsonSimple.getBalance(), balance);
+ Assert.assertEquals(invoiceJsonSimple.getAccountId(), accountId);
+ Assert.assertEquals(invoiceJsonSimple.getBundleKeys(), bundleKeys);
+
+ final String asJson = mapper.writeValueAsString(invoiceJsonSimple);
+ Assert.assertEquals(asJson, "{\"amount\":" + invoiceJsonSimple.getAmount().toString() + "," +
+ "\"credit\":" + invoiceJsonSimple.getCredit().toString() + "," +
+ "\"invoiceId\":\"" + invoiceJsonSimple.getInvoiceId() + "\"," +
+ "\"invoiceDate\":\"" + invoiceJsonSimple.getInvoiceDate().toDateTimeISO().toString() + "\"," +
+ "\"targetDate\":\"" + invoiceJsonSimple.getTargetDate().toDateTimeISO().toString() + "\"," +
+ "\"invoiceNumber\":\"" + invoiceJsonSimple.getInvoiceNumber() + "\"," +
+ "\"balance\":" + invoiceJsonSimple.getBalance().toString() + "," +
+ "\"accountId\":\"" + invoiceJsonSimple.getAccountId() + "\"," +
+ "\"bundleKeys\":\"" + invoiceJsonSimple.getBundleKeys() + "\"}");
+
+ final InvoiceJsonWithBundleKeys fromJson = mapper.readValue(asJson, InvoiceJsonWithBundleKeys.class);
+ Assert.assertEquals(fromJson, invoiceJsonSimple);
+ }
+
+ @Test(groups = "fast")
+ public void testFromInvoice() throws Exception {
+ final Invoice invoice = Mockito.mock(Invoice.class);
+ Mockito.when(invoice.getAmountCharged()).thenReturn(BigDecimal.TEN);
+ Mockito.when(invoice.getAmountCredited()).thenReturn(BigDecimal.ONE);
+ Mockito.when(invoice.getId()).thenReturn(UUID.randomUUID());
+ Mockito.when(invoice.getInvoiceDate()).thenReturn(new DateTime(DateTimeZone.UTC));
+ Mockito.when(invoice.getTargetDate()).thenReturn(new DateTime(DateTimeZone.UTC));
+ Mockito.when(invoice.getInvoiceNumber()).thenReturn(Integer.MAX_VALUE);
+ Mockito.when(invoice.getBalance()).thenReturn(BigDecimal.ZERO);
+ Mockito.when(invoice.getAccountId()).thenReturn(UUID.randomUUID());
+
+ final String bundleKeys = UUID.randomUUID().toString();
+
+ final InvoiceJsonWithBundleKeys invoiceJsonWithBundleKeys = new InvoiceJsonWithBundleKeys(invoice, bundleKeys);
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getAmount(), invoice.getAmountCharged());
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getCredit(), invoice.getAmountCredited());
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getInvoiceId(), invoice.getId().toString());
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getInvoiceDate(), invoice.getInvoiceDate());
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getTargetDate(), invoice.getTargetDate());
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getInvoiceNumber(), String.valueOf(invoice.getInvoiceNumber()));
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getBalance(), invoice.getBalance());
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getAccountId(), invoice.getAccountId().toString());
+ Assert.assertEquals(invoiceJsonWithBundleKeys.getBundleKeys(), bundleKeys);
+ }
+}
