diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceItemJsonSimple.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceItemJsonSimple.java
index 6df38a5..cad2d8b 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceItemJsonSimple.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/InvoiceItemJsonSimple.java
@@ -26,17 +26,17 @@ import com.ning.billing.catalog.api.Currency;
import com.ning.billing.invoice.api.InvoiceItem;
public class InvoiceItemJsonSimple {
- private final UUID invoiceId;
- private final UUID accountId;
- private final UUID bundleId;
- private final UUID subscriptionId;
- private final String planName;
- private final String phaseName;
- private final String description;
- private final DateTime startDate;
- private final DateTime endDate;
+ private final UUID invoiceId;
+ private final UUID accountId;
+ private final UUID bundleId;
+ private final UUID subscriptionId;
+ private final String planName;
+ private final String phaseName;
+ private final String description;
+ private final DateTime startDate;
+ private final DateTime endDate;
private final BigDecimal amount;
- private final Currency currency;
+ private final Currency currency;
public InvoiceItemJsonSimple(@JsonProperty("invoiceId") final UUID invoiceId,
@JsonProperty("accountId") final UUID accountId,
@@ -63,17 +63,9 @@ public class InvoiceItemJsonSimple {
}
public InvoiceItemJsonSimple(final InvoiceItem item) {
- this.invoiceId = item.getInvoiceId();
- this.accountId = item.getAccountId();
- this.bundleId = item.getBundleId();
- this.subscriptionId = item.getSubscriptionId();
- this.planName = item.getPlanName();
- this.phaseName = item.getPhaseName();
- this.description = item.getDescription();
- this.startDate = item.getStartDate();
- this.endDate = item.getEndDate();
- this.amount = item.getAmount();
- this.currency = item.getCurrency();
+ this(item.getInvoiceId(), item.getAccountId(), item.getBundleId(), item.getSubscriptionId(),
+ item.getPlanName(), item.getPhaseName(), item.getDescription(), item.getStartDate(), item.getEndDate(),
+ item.getAmount(), item.getCurrency());
}
public UUID getInvoiceId() {
@@ -119,4 +111,68 @@ public class InvoiceItemJsonSimple {
public Currency getCurrency() {
return currency;
}
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final InvoiceItemJsonSimple that = (InvoiceItemJsonSimple) o;
+
+ if (accountId != null ? !accountId.equals(that.accountId) : that.accountId != null) {
+ return false;
+ }
+ if (amount != null ? !amount.equals(that.amount) : that.amount != null) {
+ return false;
+ }
+ if (bundleId != null ? !bundleId.equals(that.bundleId) : that.bundleId != null) {
+ return false;
+ }
+ if (currency != that.currency) {
+ return false;
+ }
+ if (description != null ? !description.equals(that.description) : that.description != null) {
+ return false;
+ }
+ if (endDate != null ? !endDate.equals(that.endDate) : that.endDate != null) {
+ return false;
+ }
+ if (invoiceId != null ? !invoiceId.equals(that.invoiceId) : that.invoiceId != null) {
+ return false;
+ }
+ if (phaseName != null ? !phaseName.equals(that.phaseName) : that.phaseName != null) {
+ return false;
+ }
+ if (planName != null ? !planName.equals(that.planName) : that.planName != null) {
+ return false;
+ }
+ if (startDate != null ? !startDate.equals(that.startDate) : that.startDate != null) {
+ return false;
+ }
+ if (subscriptionId != null ? !subscriptionId.equals(that.subscriptionId) : that.subscriptionId != null) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = invoiceId != null ? invoiceId.hashCode() : 0;
+ result = 31 * result + (accountId != null ? accountId.hashCode() : 0);
+ result = 31 * result + (bundleId != null ? bundleId.hashCode() : 0);
+ result = 31 * result + (subscriptionId != null ? subscriptionId.hashCode() : 0);
+ result = 31 * result + (planName != null ? planName.hashCode() : 0);
+ result = 31 * result + (phaseName != null ? phaseName.hashCode() : 0);
+ result = 31 * result + (description != null ? description.hashCode() : 0);
+ result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
+ result = 31 * result + (endDate != null ? endDate.hashCode() : 0);
+ result = 31 * result + (amount != null ? amount.hashCode() : 0);
+ result = 31 * result + (currency != null ? currency.hashCode() : 0);
+ return result;
+ }
}
diff --git a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestInvoiceItemJsonSimple.java b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestInvoiceItemJsonSimple.java
new file mode 100644
index 0000000..ec9fc54
--- /dev/null
+++ b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestInvoiceItemJsonSimple.java
@@ -0,0 +1,115 @@
+/*
+ * 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.catalog.api.Currency;
+import com.ning.billing.invoice.api.InvoiceItem;
+
+public class TestInvoiceItemJsonSimple {
+ 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 UUID invoiceId = UUID.randomUUID();
+ final UUID accountId = UUID.randomUUID();
+ final UUID bundleId = UUID.randomUUID();
+ final UUID subscriptionId = UUID.randomUUID();
+ final String planName = UUID.randomUUID().toString();
+ final String phaseName = UUID.randomUUID().toString();
+ final String description = UUID.randomUUID().toString();
+ final DateTime startDate = new DateTime(DateTimeZone.UTC);
+ final DateTime endDate = new DateTime(DateTimeZone.UTC);
+ final BigDecimal amount = BigDecimal.TEN;
+ final Currency currency = Currency.MXN;
+ final InvoiceItemJsonSimple invoiceItemJsonSimple = new InvoiceItemJsonSimple(invoiceId, accountId, bundleId, subscriptionId,
+ planName, phaseName, description, startDate, endDate,
+ amount, currency);
+ Assert.assertEquals(invoiceItemJsonSimple.getInvoiceId(), invoiceId);
+ Assert.assertEquals(invoiceItemJsonSimple.getAccountId(), accountId);
+ Assert.assertEquals(invoiceItemJsonSimple.getBundleId(), bundleId);
+ Assert.assertEquals(invoiceItemJsonSimple.getSubscriptionId(), subscriptionId);
+ Assert.assertEquals(invoiceItemJsonSimple.getPlanName(), planName);
+ Assert.assertEquals(invoiceItemJsonSimple.getPhaseName(), phaseName);
+ Assert.assertEquals(invoiceItemJsonSimple.getDescription(), description);
+ Assert.assertEquals(invoiceItemJsonSimple.getStartDate(), startDate);
+ Assert.assertEquals(invoiceItemJsonSimple.getEndDate(), endDate);
+ Assert.assertEquals(invoiceItemJsonSimple.getAmount(), amount);
+ Assert.assertEquals(invoiceItemJsonSimple.getCurrency(), currency);
+
+ final String asJson = mapper.writeValueAsString(invoiceItemJsonSimple);
+ Assert.assertEquals(asJson, "{\"invoiceId\":\"" + invoiceItemJsonSimple.getInvoiceId().toString() + "\"," +
+ "\"accountId\":\"" + invoiceItemJsonSimple.getAccountId().toString() + "\"," +
+ "\"bundleId\":\"" + invoiceItemJsonSimple.getBundleId().toString() + "\"," +
+ "\"subscriptionId\":\"" + invoiceItemJsonSimple.getSubscriptionId().toString() + "\"," +
+ "\"planName\":\"" + invoiceItemJsonSimple.getPlanName() + "\"," +
+ "\"phaseName\":\"" + invoiceItemJsonSimple.getPhaseName() + "\"," +
+ "\"description\":\"" + invoiceItemJsonSimple.getDescription() + "\"," +
+ "\"startDate\":\"" + invoiceItemJsonSimple.getStartDate().toDateTimeISO().toString() + "\"," +
+ "\"endDate\":\"" + invoiceItemJsonSimple.getEndDate().toDateTimeISO().toString() + "\"," +
+ "\"amount\":" + invoiceItemJsonSimple.getAmount().toString() + "," +
+ "\"currency\":\"" + invoiceItemJsonSimple.getCurrency().toString() + "\"}");
+
+ final InvoiceItemJsonSimple fromJson = mapper.readValue(asJson, InvoiceItemJsonSimple.class);
+ Assert.assertEquals(fromJson, invoiceItemJsonSimple);
+ }
+
+ @Test(groups = "fast")
+ public void testFromInvoiceItem() throws Exception {
+ final InvoiceItem invoiceItem = Mockito.mock(InvoiceItem.class);
+ Mockito.when(invoiceItem.getInvoiceId()).thenReturn(UUID.randomUUID());
+ Mockito.when(invoiceItem.getAccountId()).thenReturn(UUID.randomUUID());
+ Mockito.when(invoiceItem.getBundleId()).thenReturn(UUID.randomUUID());
+ Mockito.when(invoiceItem.getSubscriptionId()).thenReturn(UUID.randomUUID());
+ Mockito.when(invoiceItem.getPlanName()).thenReturn(UUID.randomUUID().toString());
+ Mockito.when(invoiceItem.getPhaseName()).thenReturn(UUID.randomUUID().toString());
+ Mockito.when(invoiceItem.getDescription()).thenReturn(UUID.randomUUID().toString());
+ Mockito.when(invoiceItem.getStartDate()).thenReturn(new DateTime(DateTimeZone.UTC));
+ Mockito.when(invoiceItem.getEndDate()).thenReturn(new DateTime(DateTimeZone.UTC));
+ Mockito.when(invoiceItem.getAmount()).thenReturn(BigDecimal.TEN);
+ Mockito.when(invoiceItem.getCurrency()).thenReturn(Currency.EUR);
+
+ final InvoiceItemJsonSimple invoiceItemJsonSimple = new InvoiceItemJsonSimple(invoiceItem);
+ Assert.assertEquals(invoiceItemJsonSimple.getInvoiceId(), invoiceItem.getInvoiceId());
+ Assert.assertEquals(invoiceItemJsonSimple.getAccountId(), invoiceItem.getAccountId());
+ Assert.assertEquals(invoiceItemJsonSimple.getBundleId(), invoiceItem.getBundleId());
+ Assert.assertEquals(invoiceItemJsonSimple.getSubscriptionId(), invoiceItem.getSubscriptionId());
+ Assert.assertEquals(invoiceItemJsonSimple.getPlanName(), invoiceItem.getPlanName());
+ Assert.assertEquals(invoiceItemJsonSimple.getPhaseName(), invoiceItem.getPhaseName());
+ Assert.assertEquals(invoiceItemJsonSimple.getDescription(), invoiceItem.getDescription());
+ Assert.assertEquals(invoiceItemJsonSimple.getStartDate(), invoiceItem.getStartDate());
+ Assert.assertEquals(invoiceItemJsonSimple.getEndDate(), invoiceItem.getEndDate());
+ Assert.assertEquals(invoiceItemJsonSimple.getAmount(), invoiceItem.getAmount());
+ Assert.assertEquals(invoiceItemJsonSimple.getCurrency(), invoiceItem.getCurrency());
+ }
+}
