killbill-memoizeit

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java
index c812143..a8275db 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java
@@ -23,11 +23,11 @@ import java.util.UUID;
 import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
-import com.ning.billing.analytics.model.BusinessInvoiceTag;
+import com.ning.billing.analytics.model.BusinessInvoiceTagModelDao;
 
-public class BusinessInvoiceTagMapper implements ResultSetMapper<BusinessInvoiceTag> {
+public class BusinessInvoiceTagMapper implements ResultSetMapper<BusinessInvoiceTagModelDao> {
     @Override
-    public BusinessInvoiceTag map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
-        return new BusinessInvoiceTag(UUID.fromString(r.getString(1)), r.getString(2));
+    public BusinessInvoiceTagModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
+        return new BusinessInvoiceTagModelDao(UUID.fromString(r.getString(1)), r.getString(2));
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java
index 9e3e6f7..29c2d0e 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java
@@ -24,7 +24,7 @@ import org.skife.jdbi.v2.sqlobject.SqlUpdate;
 import org.skife.jdbi.v2.sqlobject.customizers.RegisterMapper;
 import org.skife.jdbi.v2.sqlobject.stringtemplate.ExternalizedSqlViaStringTemplate3;
 
-import com.ning.billing.analytics.model.BusinessInvoiceTag;
+import com.ning.billing.analytics.model.BusinessInvoiceTagModelDao;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
 import com.ning.billing.util.callcontext.InternalTenantContextBinder;
@@ -34,7 +34,7 @@ import com.ning.billing.util.callcontext.InternalTenantContextBinder;
 public interface BusinessInvoiceTagSqlDao {
 
     @SqlQuery
-    List<BusinessInvoiceTag> getTagsForInvoice(@Bind("invoice_id") final String invoiceId,
+    List<BusinessInvoiceTagModelDao> getTagsForInvoice(@Bind("invoice_id") final String invoiceId,
                                                @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java
index 7f99aab..4dddca7 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java
@@ -25,7 +25,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
-import com.ning.billing.analytics.model.BusinessInvoiceTag;
+import com.ning.billing.analytics.model.BusinessInvoiceTagModelDao;
 
 public class TestBusinessInvoiceTagSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
     private BusinessInvoiceTagSqlDao invoiceTagSqlDao;
@@ -47,11 +47,11 @@ public class TestBusinessInvoiceTagSqlDao extends AnalyticsTestSuiteWithEmbedded
 
         // Add an entry
         Assert.assertEquals(invoiceTagSqlDao.addTag(invoiceId, name, internalCallContext), 1);
-        final List<BusinessInvoiceTag> tagsForInvoice = invoiceTagSqlDao.getTagsForInvoice(invoiceId, internalCallContext);
+        final List<BusinessInvoiceTagModelDao> tagsForInvoice = invoiceTagSqlDao.getTagsForInvoice(invoiceId, internalCallContext);
         Assert.assertEquals(tagsForInvoice.size(), 1);
 
         // Retrieve it
-        final BusinessInvoiceTag invoiceTag = tagsForInvoice.get(0);
+        final BusinessInvoiceTagModelDao invoiceTag = tagsForInvoice.get(0);
         Assert.assertEquals(invoiceTag.getInvoiceId().toString(), invoiceId);
         Assert.assertEquals(invoiceTag.getName(), name);
 

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java
index 3e92eae..0d7253e 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java
@@ -28,14 +28,14 @@ public class TestBusinessInvoiceTag extends AnalyticsTestSuite {
     public void testEquals() throws Exception {
         final UUID invoiceId = UUID.randomUUID();
         final String name = UUID.randomUUID().toString();
-        final BusinessInvoiceTag invoiceTag = new BusinessInvoiceTag(invoiceId, name);
+        final BusinessInvoiceTagModelDao invoiceTag = new BusinessInvoiceTagModelDao(invoiceId, name);
         Assert.assertSame(invoiceTag, invoiceTag);
         Assert.assertEquals(invoiceTag, invoiceTag);
         Assert.assertTrue(invoiceTag.equals(invoiceTag));
         Assert.assertEquals(invoiceTag.getInvoiceId(), invoiceId);
         Assert.assertEquals(invoiceTag.getName(), name);
 
-        final BusinessInvoiceTag otherInvoiceTag = new BusinessInvoiceTag(UUID.randomUUID(), UUID.randomUUID().toString());
+        final BusinessInvoiceTagModelDao otherInvoiceTag = new BusinessInvoiceTagModelDao(UUID.randomUUID(), UUID.randomUUID().toString());
         Assert.assertFalse(invoiceTag.equals(otherInvoiceTag));
     }
 }