killbill-memoizeit

diff --git a/api/src/main/java/com/ning/billing/payment/api/PaymentInfo.java b/api/src/main/java/com/ning/billing/payment/api/PaymentInfo.java
index d187b1e..d67f93c 100644
--- a/api/src/main/java/com/ning/billing/payment/api/PaymentInfo.java
+++ b/api/src/main/java/com/ning/billing/payment/api/PaymentInfo.java
@@ -37,8 +37,8 @@ public class PaymentInfo implements EventBusNotification {
     private final String referenceId;
     private final String paymentMethodId;
     private final String paymentMethod;
-    private final String creditCardType;
-    private final String creditCardCountry;
+    private final String cardType;
+    private final String cardCoutry;
     private final DateTime effectiveDate;
     private final DateTime createdDate;
     private final DateTime updatedDate;
@@ -54,8 +54,8 @@ public class PaymentInfo implements EventBusNotification {
                        @JsonProperty("referenceId") String referenceId,
                        @JsonProperty("paymentMethodId") String paymentMethodId,
                        @JsonProperty("paymentMethod") String paymentMethod,
-                       @JsonProperty("creditCardType") String creditCardType,
-                       @JsonProperty("creditCardCountry") String creditCardCountry,
+                       @JsonProperty("cardType") String cardType,
+                       @JsonProperty("cardCountry") String cardCountry,
                        @JsonProperty("effectiveDate") DateTime effectiveDate,
                        @JsonProperty("createdDate") DateTime createdDate,
                        @JsonProperty("updatedDate") DateTime updatedDate) {
@@ -69,8 +69,8 @@ public class PaymentInfo implements EventBusNotification {
         this.referenceId = referenceId;
         this.paymentMethodId = paymentMethodId;
         this.paymentMethod = paymentMethod;
-        this.creditCardType = creditCardType;
-        this.creditCardCountry = creditCardCountry;
+        this.cardType = cardType;
+        this.cardCoutry = cardCountry;
         this.effectiveDate = effectiveDate;
         this.createdDate = createdDate == null ? new DateTime(DateTimeZone.UTC) : createdDate;
         this.updatedDate = updatedDate == null ? new DateTime(DateTimeZone.UTC) : updatedDate;
@@ -87,8 +87,8 @@ public class PaymentInfo implements EventBusNotification {
              src.referenceId,
              src.paymentMethodId,
              src.paymentMethod,
-             src.creditCardType,
-             src.creditCardCountry,
+             src.cardType,
+             src.cardCoutry,
              src.effectiveDate,
              src.createdDate,
              src.updatedDate);
@@ -126,34 +126,22 @@ public class PaymentInfo implements EventBusNotification {
         return paymentMethod;
     }
 
-    public String getCreditCardType() {
-        return creditCardType;
+    public String getCardType() {
+        return cardType;
     }
 
-    public String getCreditCardCountry() {
-        return creditCardCountry;
+    public String getCardCountry() {
+        return cardCoutry;
     }
 
     public String getReferenceId() {
         return referenceId;
     }
 
-    public String getPaymentMethodType() {
-        return paymentMethod;
-    }
-
-    public String getCardType() {
-        return creditCardType;
-    }
-
     public String getPaymentMethodId() {
         return paymentMethodId;
     }
 
-    public String getCardCountry() {
-        return creditCardCountry;
-    }
-
     public BigDecimal getRefundAmount() {
         return refundAmount;
     }
@@ -181,8 +169,8 @@ public class PaymentInfo implements EventBusNotification {
         private String referenceId;
         private String paymentMethodId;
         private String paymentMethod;
-        private String creditCardType;
-        private String creditCardCountry;
+        private String cardType;
+        private String cardCountry;
         private DateTime effectiveDate;
         private DateTime createdDate;
         private DateTime updatedDate;
@@ -202,8 +190,8 @@ public class PaymentInfo implements EventBusNotification {
             this.referenceId = src.referenceId;
             this.paymentMethodId = src.paymentMethodId;
             this.paymentMethod = src.paymentMethod;
-            this.creditCardType = src.creditCardType;
-            this.creditCardCountry = src.creditCardCountry;
+            this.cardType = src.cardType;
+            this.cardCountry = src.cardCoutry;
             this.createdDate = src.createdDate;
             this.updatedDate = src.updatedDate;
         }
@@ -263,18 +251,18 @@ public class PaymentInfo implements EventBusNotification {
             return this;
         }
 
-        public Builder setPaymentMethodType(String paymentMethodType) {
-            this.paymentMethod = paymentMethodType;
+        public Builder setPaymentMethod(String paymentMethod) {
+            this.paymentMethod = paymentMethod;
             return this;
         }
 
-        public Builder setCreditCardType(String creditCardType) {
-            this.creditCardType = creditCardType;
+        public Builder setCardType(String cardType) {
+            this.cardType = cardType;
             return this;
         }
 
-        public Builder setCreditCardCountry(String creditCardCountry) {
-            this.creditCardCountry = creditCardCountry;
+        public Builder setCardCountry(String cardCountry) {
+            this.cardCountry = cardCountry;
             return this;
         }
 
@@ -294,8 +282,8 @@ public class PaymentInfo implements EventBusNotification {
                                    referenceId,
                                    paymentMethodId,
                                    paymentMethod,
-                                   creditCardType,
-                                   creditCardCountry,
+                                   cardType,
+                                   cardCountry,
                                    effectiveDate,
                                    createdDate,
                                    updatedDate);
@@ -314,8 +302,8 @@ public class PaymentInfo implements EventBusNotification {
                                 referenceId,
                                 paymentMethodId,
                                 paymentMethod,
-                                creditCardType,
-                                creditCardCountry,
+                                cardType,
+                                cardCoutry,
                                 effectiveDate,
                                 createdDate,
                                 updatedDate);
@@ -339,8 +327,8 @@ public class PaymentInfo implements EventBusNotification {
                        Objects.equal(type, other.type) &&
                        Objects.equal(paymentMethodId, other.paymentMethodId) &&
                        Objects.equal(paymentMethod, other.paymentMethod) &&
-                       Objects.equal(creditCardType, other.creditCardType) &&
-                       Objects.equal(creditCardCountry, other.creditCardCountry) &&
+                       Objects.equal(cardType, other.cardType) &&
+                       Objects.equal(cardCoutry, other.cardCoutry) &&
                        Objects.equal(effectiveDate, other.effectiveDate) &&
                        Objects.equal(createdDate, other.createdDate) &&
                        Objects.equal(updatedDate, other.updatedDate);
@@ -351,7 +339,7 @@ public class PaymentInfo implements EventBusNotification {
 
     @Override
     public String toString() {
-        return "PaymentInfo [paymentId=" + paymentId + ", amount=" + amount + ", refundAmount=" + refundAmount + ", paymentNumber=" + paymentNumber + ", bankIdentificationNumber=" + bankIdentificationNumber + ", status=" + status + ", type=" + type + ", referenceId=" + referenceId + ", paymentMethodId=" + paymentMethodId + ", paymentMethod=" + paymentMethod + ", creditCardType=" + creditCardType + ", creditCardCountry=" + creditCardCountry + ", effectiveDate=" + effectiveDate + ", createdDate=" + createdDate + ", updatedDate=" + updatedDate + "]";
+        return "PaymentInfo [paymentId=" + paymentId + ", amount=" + amount + ", refundAmount=" + refundAmount + ", paymentNumber=" + paymentNumber + ", bankIdentificationNumber=" + bankIdentificationNumber + ", status=" + status + ", type=" + type + ", referenceId=" + referenceId + ", paymentMethodId=" + paymentMethodId + ", paymentMethod=" + paymentMethod + ", cardType=" + cardType + ", cardCountry=" + cardCoutry + ", effectiveDate=" + effectiveDate + ", createdDate=" + createdDate + ", updatedDate=" + updatedDate + "]";
     }
 
 }

diff --git a/payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java b/payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java
index 8e08404..972ee64 100644
--- a/payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java
+++ b/payment/src/main/java/com/ning/billing/payment/dao/PaymentSqlDao.java
@@ -146,7 +146,7 @@ public interface PaymentSqlDao extends Transactional<PaymentSqlDao>, CloseMe, Tr
             stmt.bind("payment_type", paymentInfo.getType());
             stmt.bind("reference_id", paymentInfo.getReferenceId());
             stmt.bind("payment_method_id", paymentInfo.getPaymentMethodId());
-            stmt.bind("payment_method", paymentInfo.getPaymentMethodType());
+            stmt.bind("payment_method", paymentInfo.getPaymentMethod());
             stmt.bind("card_type", paymentInfo.getCardType());
             stmt.bind("card_country", paymentInfo.getCardCountry());
             stmt.bind("effective_dt", getDate(paymentInfo.getEffectiveDate()));