killbill-aplcache

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java
index eef25be..f178fa7 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJsonSimple.java
@@ -15,18 +15,17 @@
  */
 package com.ning.billing.jaxrs.json;
 
-import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
 
 public class AccountJsonSimple {
-
     @JsonView(BundleTimelineViews.Base.class)
     protected final String accountId;
-    
+
     @JsonView(BundleTimelineViews.Base.class)
     protected final String externalKey;
-    
+
     public AccountJsonSimple() {
         this.accountId = null;
         this.externalKey = null;
@@ -34,7 +33,7 @@ public class AccountJsonSimple {
 
     @JsonCreator
     public AccountJsonSimple(@JsonProperty("accountId") String accountId,
-            @JsonProperty("externalKey") String externalKey) {
+                             @JsonProperty("externalKey") String externalKey) {
         this.accountId = accountId;
         this.externalKey = externalKey;
     }
@@ -46,4 +45,32 @@ public class AccountJsonSimple {
     public String getExternalKey() {
         return externalKey;
     }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        final AccountJsonSimple that = (AccountJsonSimple) o;
+
+        if (accountId != null ? !accountId.equals(that.accountId) : that.accountId != null) {
+            return false;
+        }
+        if (externalKey != null ? !externalKey.equals(that.externalKey) : that.externalKey != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = accountId != null ? accountId.hashCode() : 0;
+        result = 31 * result + (externalKey != null ? externalKey.hashCode() : 0);
+        return result;
+    }
 }

diff --git a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestAccountJson.java b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestAccountJson.java
index 8b9a7ee..901a8e4 100644
--- a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestAccountJson.java
+++ b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestAccountJson.java
@@ -1,3 +1,18 @@
+/*
+ * 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.util.UUID;

diff --git a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestAccountJsonSimple.java b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestAccountJsonSimple.java
new file mode 100644
index 0000000..99ff73b
--- /dev/null
+++ b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestAccountJsonSimple.java
@@ -0,0 +1,42 @@
+/*
+ * 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 com.fasterxml.jackson.databind.ObjectMapper;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.UUID;
+
+public class TestAccountJsonSimple {
+    private static final ObjectMapper mapper = new ObjectMapper();
+
+    @Test(groups = "fast")
+    public void testJson() throws Exception {
+        final String accountId = UUID.randomUUID().toString();
+        final String externalKey = UUID.randomUUID().toString();
+        final AccountJsonSimple accountJsonSimple = new AccountJsonSimple(accountId, externalKey);
+        Assert.assertEquals(accountJsonSimple.getAccountId(), accountId);
+        Assert.assertEquals(accountJsonSimple.getExternalKey(), externalKey);
+
+        final String asJson = mapper.writeValueAsString(accountJsonSimple);
+        Assert.assertEquals(asJson, "{\"accountId\":\"" + accountJsonSimple.getAccountId() + "\"," +
+                "\"externalKey\":\"" + accountJsonSimple.getExternalKey() + "\"}");
+
+        final AccountJsonSimple fromJson = mapper.readValue(asJson, AccountJsonSimple.class);
+        Assert.assertEquals(fromJson, accountJsonSimple);
+    }
+}