killbill-memoizeit

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.java
index d75dffc..05c434c 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.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.BusinessInvoiceField;
+import com.ning.billing.analytics.model.BusinessInvoiceFieldModelDao;
 
-public class BusinessInvoiceFieldMapper implements ResultSetMapper<BusinessInvoiceField> {
+public class BusinessInvoiceFieldMapper implements ResultSetMapper<BusinessInvoiceFieldModelDao> {
     @Override
-    public BusinessInvoiceField map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
-        return new BusinessInvoiceField(UUID.fromString(r.getString(1)), r.getString(2), r.getString(3));
+    public BusinessInvoiceFieldModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
+        return new BusinessInvoiceFieldModelDao(UUID.fromString(r.getString(1)), r.getString(2), r.getString(3));
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.java
index 96e69d1..44db7b5 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.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.BusinessInvoiceField;
+import com.ning.billing.analytics.model.BusinessInvoiceFieldModelDao;
 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 BusinessInvoiceFieldSqlDao {
 
     @SqlQuery
-    List<BusinessInvoiceField> getFieldsForInvoice(@Bind("invoice_id") final String invoiceId,
+    List<BusinessInvoiceFieldModelDao> getFieldsForInvoice(@Bind("invoice_id") final String invoiceId,
                                                    @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.java
index 72f70e0..ff6a238 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.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.BusinessInvoiceField;
+import com.ning.billing.analytics.model.BusinessInvoiceFieldModelDao;
 
 public class TestBusinessInvoiceFieldSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
     private BusinessInvoiceFieldSqlDao invoiceFieldSqlDao;
@@ -48,11 +48,11 @@ public class TestBusinessInvoiceFieldSqlDao extends AnalyticsTestSuiteWithEmbedd
 
         // Add an entry
         Assert.assertEquals(invoiceFieldSqlDao.addField(invoiceId, name, value, internalCallContext), 1);
-        final List<BusinessInvoiceField> fieldsForInvoice = invoiceFieldSqlDao.getFieldsForInvoice(invoiceId, internalCallContext);
+        final List<BusinessInvoiceFieldModelDao> fieldsForInvoice = invoiceFieldSqlDao.getFieldsForInvoice(invoiceId, internalCallContext);
         Assert.assertEquals(fieldsForInvoice.size(), 1);
 
         // Retrieve it
-        final BusinessInvoiceField invoiceField = fieldsForInvoice.get(0);
+        final BusinessInvoiceFieldModelDao invoiceField = fieldsForInvoice.get(0);
         Assert.assertEquals(invoiceField.getInvoiceId().toString(), invoiceId);
         Assert.assertEquals(invoiceField.getName(), name);
         Assert.assertEquals(invoiceField.getValue(), value);

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java
index b2c0937..7e584a7 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java
@@ -29,7 +29,7 @@ public class TestBusinessInvoiceField extends AnalyticsTestSuite {
         final UUID invoiceId = UUID.randomUUID();
         final String name = UUID.randomUUID().toString();
         final String value = UUID.randomUUID().toString();
-        final BusinessInvoiceField invoiceField = new BusinessInvoiceField(invoiceId,
+        final BusinessInvoiceFieldModelDao invoiceField = new BusinessInvoiceFieldModelDao(invoiceId,
                                                                            name,
                                                                            value);
         Assert.assertSame(invoiceField, invoiceField);
@@ -39,7 +39,7 @@ public class TestBusinessInvoiceField extends AnalyticsTestSuite {
         Assert.assertEquals(invoiceField.getName(), name);
         Assert.assertEquals(invoiceField.getValue(), value);
 
-        final BusinessInvoiceField otherInvoiceField = new BusinessInvoiceField(UUID.randomUUID(),
+        final BusinessInvoiceFieldModelDao otherInvoiceField = new BusinessInvoiceFieldModelDao(UUID.randomUUID(),
                                                                                 UUID.randomUUID().toString(),
                                                                                 UUID.randomUUID().toString());
         Assert.assertFalse(invoiceField.equals(otherInvoiceField));