killbill-memoizeit

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java
index c22d415..f94293a 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java
@@ -44,9 +44,6 @@ public interface BusinessInvoiceItemSqlDao extends Transactional<BusinessInvoice
     int createInvoiceItem(@BusinessInvoiceItemBinder final BusinessInvoiceItem invoiceItem);
 
     @SqlUpdate
-    int updateInvoiceItem(@BusinessInvoiceItemBinder final BusinessInvoiceItem invoiceItem);
-
-    @SqlUpdate
     int deleteInvoiceItem(@Bind("item_id") final String itemId);
 
     @SqlUpdate

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java
index 3d50f1c..9c651d9 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java
@@ -42,9 +42,6 @@ public interface BusinessInvoicePaymentSqlDao {
     int createInvoicePayment(@BusinessInvoicePaymentBinder final BusinessInvoicePayment payment);
 
     @SqlUpdate
-    int updateInvoicePaymentForPaymentAttempt(@BusinessInvoicePaymentBinder final BusinessInvoicePayment payment);
-
-    @SqlUpdate
     int deleteInvoicePaymentForPaymentAttempt(@Bind("attempt_id") final String attemptId);
 
     @SqlUpdate

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg
index 43b90ab..2fd6b5c 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.sql.stg
@@ -1,6 +1,6 @@
 group BusinessAccountField;
 
-getFieldsForAccount(account_key) ::=<<
+getFieldsForAccountByKey(account_key) ::=<<
 select
   account_id
 , account_key

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg
index 1b4762c..5c9a954 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.sql.stg
@@ -1,6 +1,6 @@
 group BusinessAccountTag;
 
-getTagsForAccount(account_key) ::=<<
+getTagsForAccountByKey(account_key) ::=<<
 select
   account_id
 , account_key

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg
index 7952eb6..2d55e1f 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.sql.stg
@@ -48,7 +48,7 @@ order by created_date asc
 ;
 >>
 
-getInvoiceItemsForBundle(external_key) ::= <<
+getInvoiceItemsForBundleByKey(external_key) ::= <<
 select
   item_id
 , created_date
@@ -110,30 +110,10 @@ insert into bii (
 );
 >>
 
-updateInvoiceItem() ::= <<
-update bii set
-  updated_date = :updated_date
-, invoice_id = :invoice_id
-, item_type = :item_type
-, external_key = :external_key
-, product_name = :product_name
-, product_type = :product_type
-, product_category = :product_category
-, slug = :slug
-, phase = :phase
-, billing_period = :billing_period
-, start_date = :start_date
-, end_date = :end_date
-, amount = :amount
-, currency = :currency
-where item_id = :item_id
-;
->>
-
 deleteInvoiceItem(item_id) ::= <<
 delete from bii where item_id = :item_id;
 >>
 
 test() ::= <<
 select 1 from bii;
->>
\ No newline at end of file
+>>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg
index c5d0fb8..4d87398 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.sql.stg
@@ -115,30 +115,10 @@ insert into bip (
 );
 >>
 
-updateInvoicePaymentForPaymentAttempt() ::= <<
-update bip set
-  updated_date = :updated_date
-, account_key = :account_key
-, invoice_id = :invoice_id
-, effective_date = :effective_date
-, amount = :amount
-, currency = :currency
-, payment_error = :payment_error
-, processing_status = :processing_status
-, requested_amount = :requested_amount
-, plugin_name = :plugin_name
-, payment_type = :payment_type
-, payment_method = :payment_method
-, card_type = :card_type
-, card_country = :card_country
-where attempt_id = :attempt_id
-;
->>
-
 deleteInvoicePaymentForPaymentAttempt(attempt_id) ::= <<
 delete from bip where attempt_id = :attempt_id
 >>
 
 test() ::= <<
 select 1 from bip;
->>
\ No newline at end of file
+>>

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg
index fddafdb..532a39b 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.sql.stg
@@ -1,6 +1,6 @@
 group BusinessOverdueStatus;
 
-getOverdueStatusesForBundle(external_key) ::= <<
+getOverdueStatusesForBundleByKey(external_key) ::= <<
 select
   bundle_id
 , external_key

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg
index a9e9a2b..8480e3f 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.sql.stg
@@ -1,6 +1,6 @@
 group BusinessSubscriptionTransitionField;
 
-getFieldsForBusinessSubscriptionTransition(external_key) ::=<<
+getFieldsForBusinessSubscriptionTransitionByKey(external_key) ::=<<
 select
   bundle_id
 , external_key

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg
index 58d04f4..6bda4e4 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.sql.stg
@@ -1,6 +1,6 @@
 group BusinessSubscriptionTransition;
 
-getTransitions(external_key) ::= <<
+getTransitionsByKey(external_key) ::= <<
   select
     total_ordering
   , bundle_id

diff --git a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg
index c33c98e..2eb6f37 100644
--- a/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg
+++ b/analytics/src/main/resources/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.sql.stg
@@ -1,6 +1,6 @@
 group BusinessSubscriptionTransitionTag;
 
-getTagsForBusinessSubscriptionTransition(external_key) ::=<<
+getTagsForBusinessSubscriptionTransitionByKey(external_key) ::=<<
 select
   bundle_id
 , external_key