killbill-memoizeit

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
index f928ba5..ef891d8 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/DefaultInvoiceDao.java
@@ -359,7 +359,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
                             checkAgainstExistingInvoiceItemState(existingInvoiceItem, invoiceItemModelDao);
 
                             // We allow plugins to override these 3 fields
-                            final BigDecimal updatedAmount = invoiceItemModelDao.getAmount() != null ? invoiceItemModelDao.getAmount() :  existingInvoiceItem.getAmount();
+                            final BigDecimal updatedAmount = invoiceItemModelDao.getAmount();
                             final String updatedDescription = invoiceItemModelDao.getDescription() != null ? invoiceItemModelDao.getDescription() : existingInvoiceItem.getDescription();
                             final String updatedItemDetails = invoiceItemModelDao.getItemDetails() != null ? invoiceItemModelDao.getItemDetails() : existingInvoiceItem.getItemDetails();
 
@@ -1214,7 +1214,7 @@ public class DefaultInvoiceDao extends EntityDaoBase<InvoiceModelDao, Invoice, I
                     throw new InvoiceApiException(ErrorCode.INVOICE_ITEM_NOT_FOUND, invoiceItemId);
                 }
 
-                transactional.updateAmount(invoiceItemId.toString(), amount, context);
+                transactional.updateItemFields(invoiceItemId.toString(), amount, null, null, context);
                 return null;
             }
         });

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceItemSqlDao.java b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceItemSqlDao.java
index cb7c841..47fde47 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceItemSqlDao.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/dao/InvoiceItemSqlDao.java
@@ -50,12 +50,6 @@ public interface InvoiceItemSqlDao extends EntitySqlDao<InvoiceItemModelDao, Inv
 
     @SqlUpdate
     @Audited(ChangeType.UPDATE)
-    void updateAmount(@Bind("id") String invoiceItemId,
-                      @Bind("amount")BigDecimal amount,
-                      @SmartBindBean final InternalCallContext context);
-
-    @SqlUpdate
-    @Audited(ChangeType.UPDATE)
     void updateItemFields(@Bind("id") String invoiceItemId,
                           @Bind("amount") BigDecimal amount,
                           @Bind("description") String description,

diff --git a/invoice/src/main/resources/org/killbill/billing/invoice/dao/InvoiceItemSqlDao.sql.stg b/invoice/src/main/resources/org/killbill/billing/invoice/dao/InvoiceItemSqlDao.sql.stg
index b4fe07f..8dfc05f 100644
--- a/invoice/src/main/resources/org/killbill/billing/invoice/dao/InvoiceItemSqlDao.sql.stg
+++ b/invoice/src/main/resources/org/killbill/billing/invoice/dao/InvoiceItemSqlDao.sql.stg
@@ -76,14 +76,6 @@ getAdjustedOrRepairedInvoiceItemsByLinkedId() ::= <<
   ;
 >>
 
-updateAmount() ::= <<
-    UPDATE <tableName()>
-    SET amount = :amount
-    WHERE id = :id
-    <AND_CHECK_TENANT("")>;
->>
-
-
 updateItemFields() ::= <<
     UPDATE <tableName()>
     SET amount = coalesce(:amount, amount),

diff --git a/invoice/src/test/java/org/killbill/billing/invoice/dao/TestInvoiceItemSqlDao.java b/invoice/src/test/java/org/killbill/billing/invoice/dao/TestInvoiceItemSqlDao.java
index e39f7df..f3655b9 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/dao/TestInvoiceItemSqlDao.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/dao/TestInvoiceItemSqlDao.java
@@ -22,21 +22,21 @@ import java.util.UUID;
 
 import org.joda.time.LocalDate;
 import org.killbill.billing.catalog.api.Currency;
+import org.killbill.billing.invoice.InvoiceTestSuiteWithEmbeddedDB;
 import org.killbill.billing.invoice.api.InvoiceItemType;
-import org.killbill.billing.util.UtilTestSuiteWithEmbeddedDB;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-public class TestInvoiceItemSqlDao extends UtilTestSuiteWithEmbeddedDB {
+public class TestInvoiceItemSqlDao extends InvoiceTestSuiteWithEmbeddedDB {
 
     @Test(groups = "slow")
-    public void testUpdateItemFields() throws Exception {
+    public void testUpdaiteteItemFields() throws Exception {
         final InvoiceItemSqlDao dao = dbi.onDemand(InvoiceItemSqlDao.class);
 
         final UUID invoiceItemId = UUID.randomUUID();
 
         dao.create(new InvoiceItemModelDao(invoiceItemId, null, InvoiceItemType.FIXED, UUID.randomUUID(), UUID.randomUUID(), null, null, null, "description",
-                                                                                                  null, null, null, null, new LocalDate(), null, BigDecimal.ONE, null, Currency.USD, null), internalCallContext);
+                                           null, null, null, null, new LocalDate(), null, BigDecimal.ONE, null, Currency.USD, null), internalCallContext);
 
         // Update all fields
         dao.updateItemFields(invoiceItemId.toString(), new BigDecimal("2.00"), "new description", "new items", internalCallContext);
@@ -53,7 +53,6 @@ public class TestInvoiceItemSqlDao extends UtilTestSuiteWithEmbeddedDB {
         Assert.assertEquals(UpdatedItem.getDescription(), "new description");
         Assert.assertEquals(UpdatedItem.getItemDetails(), "new items");
 
-
         // Update just description
         dao.updateItemFields(invoiceItemId.toString(), null, "newer description", null, internalCallContext);
         UpdatedItem = dao.getById(invoiceItemId.toString(), internalCallContext);
@@ -61,7 +60,5 @@ public class TestInvoiceItemSqlDao extends UtilTestSuiteWithEmbeddedDB {
         Assert.assertEquals(UpdatedItem.getDescription(), "newer description");
         Assert.assertEquals(UpdatedItem.getItemDetails(), "new items");
 
-
-
     }
 }