killbill-memoizeit

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceTrackingSqlDao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceTrackingSqlDao.java
index 57d1b2c..a9525e2 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceTrackingSqlDao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceTrackingSqlDao.java
@@ -23,7 +23,6 @@ import java.util.List;
 import org.killbill.billing.callcontext.InternalCallContext;
 import org.killbill.billing.callcontext.InternalTenantContext;
 import org.killbill.billing.util.audit.ChangeType;
-import org.killbill.billing.util.callcontext.InternalTenantContextBinder;
 import org.killbill.billing.util.entity.Entity;
 import org.killbill.billing.util.entity.dao.Audited;
 import org.killbill.billing.util.entity.dao.EntitySqlDao;
@@ -40,8 +39,7 @@ public interface InvoiceTrackingSqlDao extends EntitySqlDao<InvoiceTrackingModel
     @SqlUpdate
     @Audited(ChangeType.UPDATE)
     public void deactivateForInvoice(@Bind("invoiceId") String invoiceId,
-                              @SmartBindBean final InternalCallContext context);
-
+                                     @SmartBindBean final InternalCallContext context);
 
     @SqlBatch
     void create(@SmartBindBean Iterable<InvoiceTrackingModelDao> trackings,
@@ -52,10 +50,9 @@ public interface InvoiceTrackingSqlDao extends EntitySqlDao<InvoiceTrackingModel
                                                           @Bind("endDate") final Date endDate,
                                                           @SmartBindBean final InternalTenantContext context);
 
-
     @SqlQuery
     List<InvoiceTrackingModelDao> getTrackingsForInvoice(@Bind("invoiceId") final String invoiceId,
-                                                          @SmartBindBean final InternalTenantContext context);
+                                                         @SmartBindBean final InternalTenantContext context);
 
 }
 

diff --git a/usage/src/main/java/org/killbill/billing/usage/dao/RolledUpUsageSqlDao.java b/usage/src/main/java/org/killbill/billing/usage/dao/RolledUpUsageSqlDao.java
index e947fa5..9e9ed9d 100644
--- a/usage/src/main/java/org/killbill/billing/usage/dao/RolledUpUsageSqlDao.java
+++ b/usage/src/main/java/org/killbill/billing/usage/dao/RolledUpUsageSqlDao.java
@@ -24,12 +24,11 @@ import java.util.UUID;
 
 import org.killbill.billing.callcontext.InternalCallContext;
 import org.killbill.billing.callcontext.InternalTenantContext;
-import org.killbill.billing.util.callcontext.InternalTenantContextBinder;
 import org.killbill.billing.util.entity.Entity;
 import org.killbill.billing.util.entity.dao.EntitySqlDao;
+import org.killbill.commons.jdbi.binder.SmartBindBean;
 import org.killbill.commons.jdbi.template.KillBillSqlDaoStringTemplate;
 import org.skife.jdbi.v2.sqlobject.Bind;
-import org.killbill.commons.jdbi.binder.SmartBindBean;
 import org.skife.jdbi.v2.sqlobject.SqlBatch;
 import org.skife.jdbi.v2.sqlobject.SqlQuery;
 
@@ -38,28 +37,28 @@ public interface RolledUpUsageSqlDao extends EntitySqlDao<RolledUpUsageModelDao,
 
     @SqlBatch
     void create(@SmartBindBean Iterable<RolledUpUsageModelDao> usages,
-                @InternalTenantContextBinder final InternalCallContext context);
+                @SmartBindBean final InternalCallContext context);
 
     @SqlQuery
     Long recordsWithTrackingIdExist(@Bind("subscriptionId") final UUID subscriptionId,
                                     @Bind("trackingId") final String trackingId,
-                                    @InternalTenantContextBinder final InternalTenantContext context);
+                                    @SmartBindBean final InternalTenantContext context);
 
     @SqlQuery
     List<RolledUpUsageModelDao> getUsageForSubscription(@Bind("subscriptionId") final UUID subscriptionId,
                                                         @Bind("startDate") final Date startDate,
                                                         @Bind("endDate") final Date endDate,
                                                         @Bind("unitType") final String unitType,
-                                                        @InternalTenantContextBinder final InternalTenantContext context);
+                                                        @SmartBindBean final InternalTenantContext context);
 
     @SqlQuery
     List<RolledUpUsageModelDao> getAllUsageForSubscription(@Bind("subscriptionId") final UUID subscriptionId,
                                                            @Bind("startDate") final Date startDate,
                                                            @Bind("endDate") final Date endDate,
-                                                           @InternalTenantContextBinder final InternalTenantContext context);
+                                                           @SmartBindBean final InternalTenantContext context);
 
     @SqlQuery
     List<RolledUpUsageModelDao> getRawUsageForAccount(@Bind("startDate") final Date startDate,
                                                       @Bind("endDate") final Date endDate,
-                                                      @InternalTenantContextBinder final InternalTenantContext context);
+                                                      @SmartBindBean final InternalTenantContext context);
 }

diff --git a/usage/src/main/resources/org/killbill/billing/usage/dao/RolledUpUsageSqlDao.sql.stg b/usage/src/main/resources/org/killbill/billing/usage/dao/RolledUpUsageSqlDao.sql.stg
index 44db9b9..a61f71f 100644
--- a/usage/src/main/resources/org/killbill/billing/usage/dao/RolledUpUsageSqlDao.sql.stg
+++ b/usage/src/main/resources/org/killbill/billing/usage/dao/RolledUpUsageSqlDao.sql.stg
@@ -19,7 +19,7 @@ tableValues() ::= <<
 , :recordDate
 , :amount
 , :trackingId
-, :userName
+, :createdBy
 , :createdDate
 >>
 

diff --git a/util/src/main/java/org/killbill/billing/util/entity/dao/Audited.java b/util/src/main/java/org/killbill/billing/util/entity/dao/Audited.java
index 9e7f3cb..1844a02 100644
--- a/util/src/main/java/org/killbill/billing/util/entity/dao/Audited.java
+++ b/util/src/main/java/org/killbill/billing/util/entity/dao/Audited.java
@@ -33,7 +33,7 @@ import org.killbill.billing.util.audit.ChangeType;
  *         @Audited(type = ChangeType.UPDATE)
  *         @SqlUpdate public void updateChargedThroughDate(@Bind("id") String id,
  *                                                         @Bind("chargedThroughDate") Date chargedThroughDate,
- *                                                         @InternalTenantContextBinder final InternalCallContext callcontext);
+ *                                                         @SmartBindBean  final InternalCallContext callcontext);
  * </pre>
  */
 @Retention(RetentionPolicy.RUNTIME)