killbill-memoizeit

jaxrs: add catalog name to CatalogJsonSimple Signed-off-by:

8/23/2012 1:04:26 PM

Details

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/CatalogJsonSimple.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/CatalogJsonSimple.java
index efd1778..053b3ef 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/CatalogJsonSimple.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/CatalogJsonSimple.java
@@ -38,9 +38,11 @@ import com.ning.billing.catalog.api.StaticCatalog;
 @JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
 public class CatalogJsonSimple {
 
+    private final String name;
     private final ProductJson [] products;
 
     public CatalogJsonSimple(StaticCatalog catalog) throws CatalogApiException {
+        name = catalog.getCatalogName();
 
         Map<String, ProductJson> productMap = new HashMap<String, CatalogJsonSimple.ProductJson>();
 
@@ -85,8 +87,9 @@ public class CatalogJsonSimple {
     }
 
     @JsonCreator
-    public CatalogJsonSimple(@JsonProperty("products")  ProductJson[] products) {
-        super();
+    public CatalogJsonSimple(@JsonProperty("name") final String name,
+                             @JsonProperty("products") ProductJson[] products) {
+        this.name = name;
         this.products = products;
     }