killbill-aplcache

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/CreditCollectionJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/CreditCollectionJson.java
index 14e8031..2840e4d 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/CreditCollectionJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/CreditCollectionJson.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class CreditCollectionJson {
-    private final UUID             accountId;
+    private final UUID accountId;
     private final List<CreditJson> credits;
 
     @JsonCreator
@@ -40,4 +40,32 @@ public class CreditCollectionJson {
     public List<CreditJson> getCredits() {
         return credits;
     }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        final CreditCollectionJson that = (CreditCollectionJson) o;
+
+        if (accountId != null ? !accountId.equals(that.accountId) : that.accountId != null) {
+            return false;
+        }
+        if (credits != null ? !credits.equals(that.credits) : that.credits != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = accountId != null ? accountId.hashCode() : 0;
+        result = 31 * result + (credits != null ? credits.hashCode() : 0);
+        return result;
+    }
 }

diff --git a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestCreditCollectionJson.java b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestCreditCollectionJson.java
new file mode 100644
index 0000000..a1382cd
--- /dev/null
+++ b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestCreditCollectionJson.java
@@ -0,0 +1,69 @@
+/*
+ * 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.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.google.common.collect.ImmutableList;
+
+public class TestCreditCollectionJson {
+    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 accountId = UUID.randomUUID();
+
+        final BigDecimal creditAmount = BigDecimal.TEN;
+        final UUID invoiceId = UUID.randomUUID();
+        final String invoiceNumber = UUID.randomUUID().toString();
+        final DateTime requestedDate = new DateTime(DateTimeZone.UTC);
+        final DateTime effectiveDate = new DateTime(DateTimeZone.UTC);
+        final String reason = UUID.randomUUID().toString();
+        final CreditJson creditJson = new CreditJson(creditAmount, invoiceId, invoiceNumber, requestedDate, effectiveDate, reason);
+
+        final CreditCollectionJson creditCollectionJson = new CreditCollectionJson(accountId, ImmutableList.<CreditJson>of(creditJson));
+        Assert.assertEquals(creditCollectionJson.getAccountId(), accountId);
+        Assert.assertEquals(creditCollectionJson.getCredits().size(), 1);
+        Assert.assertEquals(creditCollectionJson.getCredits().get(0), creditJson);
+
+        final String asJson = mapper.writeValueAsString(creditCollectionJson);
+        Assert.assertEquals(asJson, "{\"accountId\":\"" + accountId.toString() + "\"," +
+                "\"credits\":[{\"creditAmount\":" + creditJson.getCreditAmount() + "," +
+                "\"invoiceId\":\"" + creditJson.getInvoiceId().toString() + "\"," +
+                "\"invoiceNumber\":\"" + creditJson.getInvoiceNumber() + "\"," +
+                "\"requestedDate\":\"" + creditJson.getRequestedDate() + "\"," +
+                "\"effectiveDate\":\"" + creditJson.getEffectiveDate() + "\"," +
+                "\"reason\":\"" + creditJson.getReason() + "\"}]}");
+
+        final CreditCollectionJson fromJson = mapper.readValue(asJson, CreditCollectionJson.class);
+        Assert.assertEquals(fromJson, creditCollectionJson);
+    }
+}