killbill-aplcache

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AnalyticsDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AnalyticsDao.java
index 7f61fe2..d22ca3f 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AnalyticsDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/AnalyticsDao.java
@@ -24,8 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.skife.jdbi.v2.DBI;
-
 import com.ning.billing.ObjectType;
 import com.ning.billing.osgi.bundles.analytics.api.BusinessAccount;
 import com.ning.billing.osgi.bundles.analytics.api.BusinessField;
@@ -52,16 +50,14 @@ import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-public class AnalyticsDao {
+public class AnalyticsDao extends BusinessAnalyticsDaoBase {
 
     private final OSGIKillbillAPI osgiKillbillAPI;
-    private final BusinessAnalyticsSqlDao sqlDao;
 
     public AnalyticsDao(final OSGIKillbillAPI osgiKillbillAPI,
                         final OSGIKillbillDataSource osgiKillbillDataSource) {
+        super(osgiKillbillDataSource);
         this.osgiKillbillAPI = osgiKillbillAPI;
-        final DBI dbi = BusinessDBIProvider.get(osgiKillbillDataSource.getDataSource());
-        sqlDao = dbi.onDemand(BusinessAnalyticsSqlDao.class);
     }
 
     public BusinessAccount getAccountById(final UUID accountId, final TenantContext context) {

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessBundleSummaryDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessBundleSummaryDao.java
index 75b5bdc..ff8a054 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessBundleSummaryDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessBundleSummaryDao.java
@@ -20,15 +20,11 @@ import java.util.Collection;
 
 import com.ning.billing.osgi.bundles.analytics.dao.model.BusinessBundleSummaryModelDao;
 import com.ning.billing.util.callcontext.CallContext;
-import com.ning.killbill.osgi.libs.killbill.OSGIKillbillAPI;
 import com.ning.killbill.osgi.libs.killbill.OSGIKillbillDataSource;
-import com.ning.killbill.osgi.libs.killbill.OSGIKillbillLogService;
 
 public class BusinessBundleSummaryDao extends BusinessAnalyticsDaoBase {
 
-    public BusinessBundleSummaryDao(final OSGIKillbillLogService logService,
-                                    final OSGIKillbillAPI osgiKillbillAPI,
-                                    final OSGIKillbillDataSource osgiKillbillDataSource) {
+    public BusinessBundleSummaryDao(final OSGIKillbillDataSource osgiKillbillDataSource) {
         super(osgiKillbillDataSource);
     }
 

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessFieldDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessFieldDao.java
index c205a88..3a962bd 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessFieldDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessFieldDao.java
@@ -53,14 +53,20 @@ public class BusinessFieldDao extends BusinessAnalyticsDaoBase {
         });
     }
 
-    private void updateInTransaction(final Collection<BusinessFieldModelDao> fieldModelDaos, final BusinessAnalyticsSqlDao transactional, final CallContext context) {
+    private void updateInTransaction(final Collection<BusinessFieldModelDao> fieldModelDaos,
+                                     final BusinessAnalyticsSqlDao transactional,
+                                     final CallContext context) {
+        // TODO We should delete first
         if (fieldModelDaos.size() == 0) {
             return;
         }
 
         // We assume all fieldModelDaos are for a single type
         final BusinessFieldModelDao firstFieldModelDao = fieldModelDaos.iterator().next();
-        transactional.deleteByAccountRecordId(firstFieldModelDao.getTableName(), firstFieldModelDao.getAccountRecordId(), firstFieldModelDao.getTenantRecordId(), context);
+        transactional.deleteByAccountRecordId(firstFieldModelDao.getTableName(),
+                                              firstFieldModelDao.getAccountRecordId(),
+                                              firstFieldModelDao.getTenantRecordId(),
+                                              context);
 
         for (final BusinessFieldModelDao fieldModelDao : fieldModelDaos) {
             transactional.create(fieldModelDao.getTableName(), fieldModelDao, context);

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessOverdueStatusDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessOverdueStatusDao.java
index 27352ed..8bc03f1 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessOverdueStatusDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessOverdueStatusDao.java
@@ -65,13 +65,18 @@ public class BusinessOverdueStatusDao extends BusinessAnalyticsDaoBase {
         });
     }
 
-    private void updateInTransaction(final Collection<BusinessOverdueStatusModelDao> businessOverdueStatuses, final BusinessAnalyticsSqlDao transactional, final CallContext context) {
+    private void updateInTransaction(final Collection<BusinessOverdueStatusModelDao> businessOverdueStatuses,
+                                     final BusinessAnalyticsSqlDao transactional,
+                                     final CallContext context) {
         if (businessOverdueStatuses.size() == 0) {
             return;
         }
 
         final BusinessOverdueStatusModelDao firstBst = businessOverdueStatuses.iterator().next();
-        transactional.deleteByAccountRecordId(firstBst.getTableName(), firstBst.getAccountRecordId(), firstBst.getTenantRecordId(), context);
+        transactional.deleteByAccountRecordId(firstBst.getTableName(),
+                                              firstBst.getAccountRecordId(),
+                                              firstBst.getTenantRecordId(),
+                                              context);
 
         for (final BusinessOverdueStatusModelDao bst : businessOverdueStatuses) {
             transactional.create(bst.getTableName(), bst, context);

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java
index 8f5dcf0..307acf5 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessSubscriptionTransitionDao.java
@@ -48,7 +48,7 @@ public class BusinessSubscriptionTransitionDao extends BusinessAnalyticsDaoBase 
                                              final BusinessAccountDao businessAccountDao) {
         super(osgiKillbillDataSource);
         this.businessAccountDao = businessAccountDao;
-        this.businessBundleSummaryDao = new BusinessBundleSummaryDao(logService, osgiKillbillAPI, osgiKillbillDataSource);
+        this.businessBundleSummaryDao = new BusinessBundleSummaryDao(osgiKillbillDataSource);
         bacFactory = new BusinessAccountFactory(logService, osgiKillbillAPI);
         bbsFactory = new BusinessBundleSummaryFactory(logService, osgiKillbillAPI);
         bstFactory = new BusinessSubscriptionTransitionFactory(logService, osgiKillbillAPI);
@@ -79,11 +79,11 @@ public class BusinessSubscriptionTransitionDao extends BusinessAnalyticsDaoBase 
         });
     }
 
-    public void updateInTransaction(final BusinessAccountModelDao bac,
-                                    final Collection<BusinessBundleSummaryModelDao> bbss,
-                                    final Collection<BusinessSubscriptionTransitionModelDao> bsts,
-                                    final BusinessAnalyticsSqlDao transactional,
-                                    final CallContext context) {
+    private void updateInTransaction(final BusinessAccountModelDao bac,
+                                     final Collection<BusinessBundleSummaryModelDao> bbss,
+                                     final Collection<BusinessSubscriptionTransitionModelDao> bsts,
+                                     final BusinessAnalyticsSqlDao transactional,
+                                     final CallContext context) {
         // Update the subscription transitions
         transactional.deleteByAccountRecordId(BusinessSubscriptionTransitionModelDao.SUBSCRIPTION_TABLE_NAME,
                                               bac.getAccountRecordId(),

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessTagDao.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessTagDao.java
index 4516b65..38f177e 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessTagDao.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/dao/BusinessTagDao.java
@@ -23,7 +23,6 @@ import org.skife.jdbi.v2.Transaction;
 import org.skife.jdbi.v2.TransactionStatus;
 
 import com.ning.billing.osgi.bundles.analytics.AnalyticsRefreshException;
-import com.ning.billing.osgi.bundles.analytics.dao.factory.BusinessAccountFactory;
 import com.ning.billing.osgi.bundles.analytics.dao.factory.BusinessTagFactory;
 import com.ning.billing.osgi.bundles.analytics.dao.model.BusinessTagModelDao;
 import com.ning.billing.util.callcontext.CallContext;
@@ -33,14 +32,12 @@ import com.ning.killbill.osgi.libs.killbill.OSGIKillbillLogService;
 
 public class BusinessTagDao extends BusinessAnalyticsDaoBase {
 
-    private final BusinessAccountFactory bacFactory;
     private final BusinessTagFactory bTagFactory;
 
     public BusinessTagDao(final OSGIKillbillLogService logService,
                           final OSGIKillbillAPI osgiKillbillAPI,
                           final OSGIKillbillDataSource osgiKillbillDataSource) {
         super(osgiKillbillDataSource);
-        bacFactory = new BusinessAccountFactory(logService, osgiKillbillAPI);
         bTagFactory = new BusinessTagFactory(logService, osgiKillbillAPI);
     }
 
@@ -56,14 +53,20 @@ public class BusinessTagDao extends BusinessAnalyticsDaoBase {
         });
     }
 
-    private void updateInTransaction(final Collection<BusinessTagModelDao> tagModelDaos, final BusinessAnalyticsSqlDao transactional, final CallContext context) {
+    private void updateInTransaction(final Collection<BusinessTagModelDao> tagModelDaos,
+                                     final BusinessAnalyticsSqlDao transactional,
+                                     final CallContext context) {
+        // TODO We should delete first
         if (tagModelDaos.size() == 0) {
             return;
         }
 
         // We assume all tagModelDaos are for a single type
         final BusinessTagModelDao firstTagModelDao = tagModelDaos.iterator().next();
-        transactional.deleteByAccountRecordId(firstTagModelDao.getTableName(), firstTagModelDao.getAccountRecordId(), firstTagModelDao.getTenantRecordId(), context);
+        transactional.deleteByAccountRecordId(firstTagModelDao.getTableName(),
+                                              firstTagModelDao.getAccountRecordId(),
+                                              firstTagModelDao.getTenantRecordId(),
+                                              context);
 
         for (final BusinessTagModelDao tagModelDao : tagModelDaos) {
             transactional.create(tagModelDao.getTableName(), tagModelDao, context);