killbill-uncached

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/RefundJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/RefundJson.java
index 04e796c..3a52b58 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/RefundJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/RefundJson.java
@@ -37,7 +37,7 @@ public class RefundJson extends JsonBase {
 
     private final String refundId;
     private final String paymentId;
-    private final BigDecimal refundAmount;
+    private final BigDecimal amount;
     private final String currency;
     private final Boolean isAdjusted;
     private final DateTime requestedDate;
@@ -47,7 +47,7 @@ public class RefundJson extends JsonBase {
     @JsonCreator
     public RefundJson(@JsonProperty("refundId") final String refundId,
                       @JsonProperty("paymentId") final String paymentId,
-                      @JsonProperty("refundAmount") final BigDecimal refundAmount,
+                      @JsonProperty("amount") final BigDecimal amount,
                       @JsonProperty("currency") final String currency,
                       @JsonProperty("adjusted") final Boolean isAdjusted,
                       @JsonProperty("requestedDate") final DateTime requestedDate,
@@ -57,7 +57,7 @@ public class RefundJson extends JsonBase {
         super(auditLogs);
         this.refundId = refundId;
         this.paymentId = paymentId;
-        this.refundAmount = refundAmount;
+        this.amount = amount;
         this.currency = currency;
         this.isAdjusted = isAdjusted;
         this.requestedDate = requestedDate;
@@ -85,8 +85,8 @@ public class RefundJson extends JsonBase {
         return paymentId;
     }
 
-    public BigDecimal getRefundAmount() {
-        return refundAmount;
+    public BigDecimal getAmount() {
+        return amount;
     }
 
     public String getCurrency() {
@@ -115,7 +115,7 @@ public class RefundJson extends JsonBase {
         sb.append("RefundJson");
         sb.append("{refundId='").append(refundId).append('\'');
         sb.append(", paymentId='").append(paymentId).append('\'');
-        sb.append(", refundAmount=").append(refundAmount);
+        sb.append(", amount=").append(amount);
         sb.append(", currency=").append(currency);
         sb.append(", isAdjusted=").append(isAdjusted);
         sb.append(", requestedDate=").append(requestedDate);
@@ -129,7 +129,7 @@ public class RefundJson extends JsonBase {
     public int hashCode() {
         int result = refundId != null ? refundId.hashCode() : 0;
         result = 31 * result + (paymentId != null ? paymentId.hashCode() : 0);
-        result = 31 * result + (refundAmount != null ? refundAmount.hashCode() : 0);
+        result = 31 * result + (amount != null ? amount.hashCode() : 0);
         result = 31 * result + (currency != null ? currency.hashCode() : 0);
         result = 31 * result + (isAdjusted != null ? isAdjusted.hashCode() : 0);
         result = 31 * result + (requestedDate != null ? requestedDate.hashCode() : 0);
@@ -202,11 +202,11 @@ public class RefundJson extends JsonBase {
             return false;
         }
 
-        if (refundAmount == null) {
-            if (other.refundAmount != null) {
+        if (amount == null) {
+            if (other.amount != null) {
                 return false;
             }
-        } else if (!refundAmount.equals(other.refundAmount)) {
+        } else if (!amount.equals(other.amount)) {
             return false;
         }
 

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java
index e2ce6f4..24f6bc2 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/PaymentResource.java
@@ -125,11 +125,11 @@ public class PaymentResource extends JaxRsResourceBase {
                 result = paymentApi.createRefundWithItemsAdjustments(account, paymentUuid, adjustments, context.createContext(createdBy, reason, comment));
             } else {
                 // Invoice adjustment
-                result = paymentApi.createRefundWithAdjustment(account, paymentUuid, json.getRefundAmount(), context.createContext(createdBy, reason, comment));
+                result = paymentApi.createRefundWithAdjustment(account, paymentUuid, json.getAmount(), context.createContext(createdBy, reason, comment));
             }
         } else {
             // Refund without adjustment
-            result = paymentApi.createRefund(account, paymentUuid, json.getRefundAmount(), context.createContext(createdBy, reason, comment));
+            result = paymentApi.createRefund(account, paymentUuid, json.getAmount(), context.createContext(createdBy, reason, comment));
         }
 
         return uriBuilder.buildResponse(RefundResource.class, "getRefund", result.getId(), uriInfo.getBaseUri().toString());

diff --git a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestRefundJson.java b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestRefundJson.java
index f46c8a4..b31626a 100644
--- a/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestRefundJson.java
+++ b/jaxrs/src/test/java/com/ning/billing/jaxrs/json/TestRefundJson.java
@@ -40,18 +40,18 @@ public class TestRefundJson extends JaxrsTestSuite {
     public void testJson() throws Exception {
         final String refundId = UUID.randomUUID().toString();
         final String paymentId = UUID.randomUUID().toString();
-        final BigDecimal refundAmount = BigDecimal.TEN;
+        final BigDecimal amount = BigDecimal.TEN;
         final String currency = "USD";
         final boolean isAdjusted = true;
         final DateTime requestedDate = clock.getUTCNow();
         final DateTime effectiveDate = clock.getUTCNow();
         final List<InvoiceItemJsonSimple> adjustments = ImmutableList.<InvoiceItemJsonSimple>of(createInvoiceItemJson());
         final List<AuditLogJson> auditLogs = createAuditLogsJson();
-        final RefundJson refundJson = new RefundJson(refundId, paymentId, refundAmount, currency, isAdjusted, requestedDate,
+        final RefundJson refundJson = new RefundJson(refundId, paymentId, amount, currency, isAdjusted, requestedDate,
                                                      effectiveDate, adjustments, auditLogs);
         Assert.assertEquals(refundJson.getRefundId(), refundId);
         Assert.assertEquals(refundJson.getPaymentId(), paymentId);
-        Assert.assertEquals(refundJson.getRefundAmount(), refundAmount);
+        Assert.assertEquals(refundJson.getAmount(), amount);
         Assert.assertEquals(refundJson.getCurrency(), currency);
         Assert.assertEquals(refundJson.isAdjusted(), isAdjusted);
         Assert.assertEquals(refundJson.getRequestedDate(), requestedDate);

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestAccountTimeline.java b/server/src/test/java/com/ning/billing/jaxrs/TestAccountTimeline.java
index 27b0dab..5bfea52 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestAccountTimeline.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestAccountTimeline.java
@@ -105,7 +105,7 @@ public class TestAccountTimeline extends TestJaxrsBase {
             Assert.assertEquals(paymentJson.getRefunds().size(), 1);
             final RefundJson refundJson = paymentJson.getRefunds().get(0);
             Assert.assertEquals(refundJson.getPaymentId(), paymentJson.getPaymentId());
-            Assert.assertEquals(refundJson.getRefundAmount().compareTo(refundAmount), 0);
+            Assert.assertEquals(refundJson.getAmount().compareTo(refundAmount), 0);
 
             // Verify chargebacks
             Assert.assertEquals(paymentJson.getChargebacks().size(), 1);

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestPayment.java b/server/src/test/java/com/ning/billing/jaxrs/TestPayment.java
index d207d48..a95ac00 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestPayment.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestPayment.java
@@ -169,7 +169,7 @@ public class TestPayment extends TestJaxrsBase {
 
     private void verifyRefund(final PaymentJsonSimple paymentJsonSimple, final RefundJson refundJsonCheck, final BigDecimal refundAmount) throws IOException {
         Assert.assertEquals(refundJsonCheck.getPaymentId(), paymentJsonSimple.getPaymentId());
-        Assert.assertEquals(refundJsonCheck.getRefundAmount().setScale(2, RoundingMode.HALF_UP), refundAmount.setScale(2, RoundingMode.HALF_UP));
+        Assert.assertEquals(refundJsonCheck.getAmount().setScale(2, RoundingMode.HALF_UP), refundAmount.setScale(2, RoundingMode.HALF_UP));
         Assert.assertEquals(refundJsonCheck.getCurrency(), DEFAULT_CURRENCY);
         Assert.assertEquals(refundJsonCheck.getEffectiveDate().getYear(), clock.getUTCNow().getYear());
         Assert.assertEquals(refundJsonCheck.getEffectiveDate().getMonthOfYear(), clock.getUTCNow().getMonthOfYear());