killbill-memoizeit

Merge remote-tracking branch 'origin/analytics-as-osgi-plugin-support'

4/10/2013 6:53:44 PM

Details

diff --git a/catalog/src/main/java/com/ning/billing/catalog/api/user/DefaultCatalogUserApi.java b/catalog/src/main/java/com/ning/billing/catalog/api/user/DefaultCatalogUserApi.java
index 6b60bbd..24b3972 100644
--- a/catalog/src/main/java/com/ning/billing/catalog/api/user/DefaultCatalogUserApi.java
+++ b/catalog/src/main/java/com/ning/billing/catalog/api/user/DefaultCatalogUserApi.java
@@ -16,14 +16,26 @@
 
 package com.ning.billing.catalog.api.user;
 
+import javax.inject.Inject;
+
 import com.ning.billing.catalog.api.Catalog;
+import com.ning.billing.catalog.api.CatalogService;
 import com.ning.billing.catalog.api.CatalogUserApi;
 import com.ning.billing.util.callcontext.TenantContext;
 
 public class DefaultCatalogUserApi implements CatalogUserApi {
 
+    private final CatalogService catalogService;
+
+    @Inject
+    public DefaultCatalogUserApi(final CatalogService catalogService) {
+        this.catalogService = catalogService;
+    }
+
     @Override
     public Catalog getCatalog(final String catalogName, final TenantContext context) {
-        throw new UnsupportedOperationException();
+        // STEPH TODO this is  hack until we decides what do do exactly:
+        // Probably we want one catalog for tenant but but TBD
+        return catalogService.getFullCatalog();
     }
 }