killbill-memoizeit

diff --git a/analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java b/analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java
index d769c4a..c4078b4 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/AnalyticsListener.java
@@ -53,7 +53,7 @@ public class AnalyticsListener {
     private final BusinessInvoiceDao invoiceDao;
     private final BusinessOverdueStatusDao bosDao;
     private final BusinessInvoicePaymentDao bipDao;
-    private final BusinessTagRecorder tagRecorder;
+    private final BusinessTagDao tagDao;
     private final InternalCallContextFactory internalCallContextFactory;
 
     @Inject
@@ -62,14 +62,14 @@ public class AnalyticsListener {
                              final BusinessInvoiceDao invoiceDao,
                              final BusinessOverdueStatusDao bosDao,
                              final BusinessInvoicePaymentDao bipDao,
-                             final BusinessTagRecorder tagRecorder,
+                             final BusinessTagDao tagDao,
                              final InternalCallContextFactory internalCallContextFactory) {
         this.bstDao = bstDao;
         this.bacDao = bacDao;
         this.invoiceDao = invoiceDao;
         this.bosDao = bosDao;
         this.bipDao = bipDao;
-        this.tagRecorder = tagRecorder;
+        this.tagDao = tagDao;
         this.internalCallContextFactory = internalCallContextFactory;
     }
 
@@ -149,22 +149,22 @@ public class AnalyticsListener {
 
     @Subscribe
     public void handleControlTagCreation(final ControlTagCreationEvent event) {
-        tagRecorder.tagAdded(event.getObjectType(), event.getObjectId(), event.getTagDefinition().getName(), createCallContext(event));
+        tagDao.tagAdded(event.getObjectType(), event.getObjectId(), event.getTagDefinition().getName(), createCallContext(event));
     }
 
     @Subscribe
     public void handleControlTagDeletion(final ControlTagDeletionEvent event) {
-        tagRecorder.tagRemoved(event.getObjectType(), event.getObjectId(), event.getTagDefinition().getName(), createCallContext(event));
+        tagDao.tagRemoved(event.getObjectType(), event.getObjectId(), event.getTagDefinition().getName(), createCallContext(event));
     }
 
     @Subscribe
     public void handleUserTagCreation(final UserTagCreationEvent event) {
-        tagRecorder.tagAdded(event.getObjectType(), event.getObjectId(), event.getTagDefinition().getName(), createCallContext(event));
+        tagDao.tagAdded(event.getObjectType(), event.getObjectId(), event.getTagDefinition().getName(), createCallContext(event));
     }
 
     @Subscribe
     public void handleUserTagDeletion(final UserTagDeletionEvent event) {
-        tagRecorder.tagRemoved(event.getObjectType(), event.getObjectId(), event.getTagDefinition().getName(), createCallContext(event));
+        tagDao.tagRemoved(event.getObjectType(), event.getObjectId(), event.getTagDefinition().getName(), createCallContext(event));
     }
 
     @Subscribe

diff --git a/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java b/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
index 4252211..7c9e1fd 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/setup/AnalyticsModule.java
@@ -19,7 +19,7 @@ package com.ning.billing.analytics.setup;
 import com.ning.billing.analytics.AnalyticsListener;
 import com.ning.billing.analytics.BusinessAccountDao;
 import com.ning.billing.analytics.BusinessSubscriptionTransitionDao;
-import com.ning.billing.analytics.BusinessTagRecorder;
+import com.ning.billing.analytics.BusinessTagDao;
 import com.ning.billing.analytics.api.AnalyticsService;
 import com.ning.billing.analytics.api.DefaultAnalyticsService;
 import com.ning.billing.analytics.api.user.AnalyticsUserApi;
@@ -63,7 +63,7 @@ public class AnalyticsModule extends AbstractModule {
 
         bind(BusinessSubscriptionTransitionDao.class).asEagerSingleton();
         bind(BusinessAccountDao.class).asEagerSingleton();
-        bind(BusinessTagRecorder.class).asEagerSingleton();
+        bind(BusinessTagDao.class).asEagerSingleton();
         bind(AnalyticsListener.class).asEagerSingleton();
 
         bind(AnalyticsDao.class).to(DefaultAnalyticsDao.class).asEagerSingleton();

diff --git a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessTagRecorder.java b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessTagRecorder.java
index 51700d1..6b4bdbb 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessTagRecorder.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessTagRecorder.java
@@ -66,7 +66,7 @@ public class TestBusinessTagRecorder extends AnalyticsTestSuiteWithEmbeddedDB {
     private DefaultCallContextFactory callContextFactory;
     private AccountUserApi accountUserApi;
     private EntitlementUserApi entitlementUserApi;
-    private BusinessTagRecorder tagRecorder;
+    private BusinessTagDao tagDao;
 
     @BeforeMethod(groups = "slow")
     public void setUp() throws Exception {
@@ -91,7 +91,7 @@ public class TestBusinessTagRecorder extends AnalyticsTestSuiteWithEmbeddedDB {
         final DefaultSubscriptionFactory subscriptionFactory = new DefaultSubscriptionFactory(apiService, clock, catalogService);
         entitlementUserApi = new DefaultEntitlementUserApi(clock, entitlementDao, catalogService,
                                                            apiService, subscriptionFactory, addonUtils, internalCallContextFactory);
-        tagRecorder = new BusinessTagRecorder(accountTagSqlDao, invoicePaymentTagSqlDao, invoiceTagSqlDao, subscriptionTransitionTagSqlDao,
+        tagDao = new BusinessTagDao(accountTagSqlDao, invoicePaymentTagSqlDao, invoiceTagSqlDao, subscriptionTransitionTagSqlDao,
                                               accountUserApi, entitlementUserApi);
 
         eventBus.start();
@@ -115,9 +115,9 @@ public class TestBusinessTagRecorder extends AnalyticsTestSuiteWithEmbeddedDB {
         final UUID accountId = account.getId();
 
         Assert.assertEquals(accountTagSqlDao.getTagsForAccountByKey(accountKey, internalCallContext).size(), 0);
-        tagRecorder.tagAdded(ObjectType.ACCOUNT, accountId, name, internalCallContext);
+        tagDao.tagAdded(ObjectType.ACCOUNT, accountId, name, internalCallContext);
         Assert.assertEquals(accountTagSqlDao.getTagsForAccountByKey(accountKey, internalCallContext).size(), 1);
-        tagRecorder.tagRemoved(ObjectType.ACCOUNT, accountId, name, internalCallContext);
+        tagDao.tagRemoved(ObjectType.ACCOUNT, accountId, name, internalCallContext);
         Assert.assertEquals(accountTagSqlDao.getTagsForAccountByKey(accountKey, internalCallContext).size(), 0);
     }
 
@@ -134,9 +134,9 @@ public class TestBusinessTagRecorder extends AnalyticsTestSuiteWithEmbeddedDB {
         final UUID bundleId = bundle.getId();
 
         Assert.assertEquals(subscriptionTransitionTagSqlDao.getTagsForBusinessSubscriptionTransitionByKey(externalKey, internalCallContext).size(), 0);
-        tagRecorder.tagAdded(ObjectType.BUNDLE, bundleId, name, internalCallContext);
+        tagDao.tagAdded(ObjectType.BUNDLE, bundleId, name, internalCallContext);
         Assert.assertEquals(subscriptionTransitionTagSqlDao.getTagsForBusinessSubscriptionTransitionByKey(externalKey, internalCallContext).size(), 1);
-        tagRecorder.tagRemoved(ObjectType.BUNDLE, bundleId, name, internalCallContext);
+        tagDao.tagRemoved(ObjectType.BUNDLE, bundleId, name, internalCallContext);
         Assert.assertEquals(subscriptionTransitionTagSqlDao.getTagsForBusinessSubscriptionTransitionByKey(externalKey, internalCallContext).size(), 0);
     }
 }