killbill-memoizeit

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoice.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoice.java
index c35527c..26d0042 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoice.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoice.java
@@ -143,16 +143,16 @@ public class BusinessInvoice extends BusinessEntityBase {
 
         final BusinessInvoice that = (BusinessInvoice) o;
 
-        if (amountCharged != null ? !amountCharged.equals(that.amountCharged) : that.amountCharged != null) {
+        if (amountCharged != null ? !(amountCharged.compareTo(that.amountCharged) == 0) : that.amountCharged != null) {
             return false;
         }
-        if (amountCredited != null ? !amountCredited.equals(that.amountCredited) : that.amountCredited != null) {
+        if (amountCredited != null ? !(amountCredited.compareTo(that.amountCredited) == 0) : that.amountCredited != null) {
             return false;
         }
-        if (amountPaid != null ? !amountPaid.equals(that.amountPaid) : that.amountPaid != null) {
+        if (amountPaid != null ? !(amountPaid.compareTo(that.amountPaid) == 0) : that.amountPaid != null) {
             return false;
         }
-        if (balance != null ? !balance.equals(that.balance) : that.balance != null) {
+        if (balance != null ? !(balance.compareTo(that.balance) == 0) : that.balance != null) {
             return false;
         }
         if (currency != null ? !currency.equals(that.currency) : that.currency != null) {
@@ -170,7 +170,7 @@ public class BusinessInvoice extends BusinessEntityBase {
         if (invoiceNumber != null ? !invoiceNumber.equals(that.invoiceNumber) : that.invoiceNumber != null) {
             return false;
         }
-        if (originalAmountCharged != null ? !originalAmountCharged.equals(that.originalAmountCharged) : that.originalAmountCharged != null) {
+        if (originalAmountCharged != null ? !(originalAmountCharged.compareTo(that.originalAmountCharged) == 0) : that.originalAmountCharged != null) {
             return false;
         }
         if (targetDate != null ? !targetDate.equals(that.targetDate) : that.targetDate != null) {

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoiceItem.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoiceItem.java
index 5b29a8a..ef5b517 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoiceItem.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoiceItem.java
@@ -242,7 +242,7 @@ public class BusinessInvoiceItem extends BusinessEntityBase {
 
         final BusinessInvoiceItem that = (BusinessInvoiceItem) o;
 
-        if (amount != null ? !amount.equals(that.amount) : that.amount != null) {
+        if (amount != null ? !(amount.compareTo(that.amount) == 0) : that.amount != null) {
             return false;
         }
         if (billingPeriod != null ? !billingPeriod.equals(that.billingPeriod) : that.billingPeriod != null) {
@@ -257,16 +257,16 @@ public class BusinessInvoiceItem extends BusinessEntityBase {
         if (endDate != null ? !endDate.equals(that.endDate) : that.endDate != null) {
             return false;
         }
-        if (invoiceAmountCharged != null ? !invoiceAmountCharged.equals(that.invoiceAmountCharged) : that.invoiceAmountCharged != null) {
+        if (invoiceAmountCharged != null ? !(invoiceAmountCharged.compareTo(that.invoiceAmountCharged) == 0) : that.invoiceAmountCharged != null) {
             return false;
         }
-        if (invoiceAmountCredited != null ? !invoiceAmountCredited.equals(that.invoiceAmountCredited) : that.invoiceAmountCredited != null) {
+        if (invoiceAmountCredited != null ? !(invoiceAmountCredited.compareTo(that.invoiceAmountCredited) == 0) : that.invoiceAmountCredited != null) {
             return false;
         }
-        if (invoiceAmountPaid != null ? !invoiceAmountPaid.equals(that.invoiceAmountPaid) : that.invoiceAmountPaid != null) {
+        if (invoiceAmountPaid != null ? !(invoiceAmountPaid.compareTo(that.invoiceAmountPaid) == 0) : that.invoiceAmountPaid != null) {
             return false;
         }
-        if (invoiceBalance != null ? !invoiceBalance.equals(that.invoiceBalance) : that.invoiceBalance != null) {
+        if (invoiceBalance != null ? !(invoiceBalance.compareTo(that.invoiceBalance) == 0) : that.invoiceBalance != null) {
             return false;
         }
         if (invoiceCreatedDate != null ? !invoiceCreatedDate.equals(that.invoiceCreatedDate) : that.invoiceCreatedDate != null) {
@@ -284,7 +284,7 @@ public class BusinessInvoiceItem extends BusinessEntityBase {
         if (invoiceNumber != null ? !invoiceNumber.equals(that.invoiceNumber) : that.invoiceNumber != null) {
             return false;
         }
-        if (invoiceOriginalAmountCharged != null ? !invoiceOriginalAmountCharged.equals(that.invoiceOriginalAmountCharged) : that.invoiceOriginalAmountCharged != null) {
+        if (invoiceOriginalAmountCharged != null ? !(invoiceOriginalAmountCharged.compareTo(that.invoiceOriginalAmountCharged) == 0) : that.invoiceOriginalAmountCharged != null) {
             return false;
         }
         if (invoiceTargetDate != null ? !invoiceTargetDate.equals(that.invoiceTargetDate) : that.invoiceTargetDate != null) {

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoicePayment.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoicePayment.java
index 97189d3..1b05d1a 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoicePayment.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessInvoicePayment.java
@@ -43,6 +43,27 @@ public class BusinessInvoicePayment extends BusinessEntityBase {
     private final UUID linkedInvoicePaymentId;
     private final BigDecimal amount;
     private final String currency;
+    private final DateTime pluginCreatedDate;
+    private final DateTime pluginEffectiveDate;
+    private final String pluginStatus;
+    private final String pluginGatewayError;
+    private final String pluginGatewayErrorCode;
+    private final String pluginFirstReferenceId;
+    private final String pluginSecondReferenceId;
+    private final String pluginPmId;
+    private final Boolean pluginPmIsDefault;
+    private final String pluginPmType;
+    private final String pluginPmCcName;
+    private final String pluginPmCcType;
+    private final String pluginPmCcExpirationMonth;
+    private final String pluginPmCcExpirationYear;
+    private final String pluginPmCcLast4;
+    private final String pluginPmAddress1;
+    private final String pluginPmAddress2;
+    private final String pluginPmCity;
+    private final String pluginPmState;
+    private final String pluginPmZip;
+    private final String pluginPmCountry;
 
     public BusinessInvoicePayment(final BusinessInvoicePaymentBaseModelDao businessInvoicePaymentBaseModelDao) {
         super(businessInvoicePaymentBaseModelDao.getCreatedDate(),
@@ -70,6 +91,27 @@ public class BusinessInvoicePayment extends BusinessEntityBase {
         this.linkedInvoicePaymentId = businessInvoicePaymentBaseModelDao.getLinkedInvoicePaymentId();
         this.amount = businessInvoicePaymentBaseModelDao.getAmount();
         this.currency = businessInvoicePaymentBaseModelDao.getCurrency();
+        this.pluginCreatedDate = businessInvoicePaymentBaseModelDao.getPluginCreatedDate();
+        this.pluginEffectiveDate = businessInvoicePaymentBaseModelDao.getPluginEffectiveDate();
+        this.pluginStatus = businessInvoicePaymentBaseModelDao.getPluginStatus();
+        this.pluginGatewayError = businessInvoicePaymentBaseModelDao.getPluginGatewayError();
+        this.pluginGatewayErrorCode = businessInvoicePaymentBaseModelDao.getPluginGatewayErrorCode();
+        this.pluginFirstReferenceId = businessInvoicePaymentBaseModelDao.getPluginFirstReferenceId();
+        this.pluginSecondReferenceId = businessInvoicePaymentBaseModelDao.getPluginSecondReferenceId();
+        this.pluginPmId = businessInvoicePaymentBaseModelDao.getPluginPmId();
+        this.pluginPmIsDefault = businessInvoicePaymentBaseModelDao.getPluginPmIsDefault();
+        this.pluginPmType = businessInvoicePaymentBaseModelDao.getPluginPmType();
+        this.pluginPmCcName = businessInvoicePaymentBaseModelDao.getPluginPmCcName();
+        this.pluginPmCcType = businessInvoicePaymentBaseModelDao.getPluginPmCcType();
+        this.pluginPmCcExpirationMonth = businessInvoicePaymentBaseModelDao.getPluginPmCcExpirationMonth();
+        this.pluginPmCcExpirationYear = businessInvoicePaymentBaseModelDao.getPluginPmCcExpirationYear();
+        this.pluginPmCcLast4 = businessInvoicePaymentBaseModelDao.getPluginPmCcLast4();
+        this.pluginPmAddress1 = businessInvoicePaymentBaseModelDao.getPluginPmAddress1();
+        this.pluginPmAddress2 = businessInvoicePaymentBaseModelDao.getPluginPmAddress2();
+        this.pluginPmCity = businessInvoicePaymentBaseModelDao.getPluginPmCity();
+        this.pluginPmState = businessInvoicePaymentBaseModelDao.getPluginPmState();
+        this.pluginPmZip = businessInvoicePaymentBaseModelDao.getPluginPmZip();
+        this.pluginPmCountry = businessInvoicePaymentBaseModelDao.getPluginPmCountry();
     }
 
     public UUID getInvoicePaymentId() {
@@ -140,11 +182,94 @@ public class BusinessInvoicePayment extends BusinessEntityBase {
         return currency;
     }
 
+    public DateTime getPluginCreatedDate() {
+        return pluginCreatedDate;
+    }
+
+    public DateTime getPluginEffectiveDate() {
+        return pluginEffectiveDate;
+    }
+
+    public String getPluginStatus() {
+        return pluginStatus;
+    }
+
+    public String getPluginGatewayError() {
+        return pluginGatewayError;
+    }
+
+    public String getPluginGatewayErrorCode() {
+        return pluginGatewayErrorCode;
+    }
+
+    public String getPluginFirstReferenceId() {
+        return pluginFirstReferenceId;
+    }
+
+    public String getPluginSecondReferenceId() {
+        return pluginSecondReferenceId;
+    }
+
+    public String getPluginPmId() {
+        return pluginPmId;
+    }
+
+    public Boolean getPluginPmIsDefault() {
+        return pluginPmIsDefault;
+    }
+
+    public String getPluginPmType() {
+        return pluginPmType;
+    }
+
+    public String getPluginPmCcName() {
+        return pluginPmCcName;
+    }
+
+    public String getPluginPmCcType() {
+        return pluginPmCcType;
+    }
+
+    public String getPluginPmCcExpirationMonth() {
+        return pluginPmCcExpirationMonth;
+    }
+
+    public String getPluginPmCcExpirationYear() {
+        return pluginPmCcExpirationYear;
+    }
+
+    public String getPluginPmCcLast4() {
+        return pluginPmCcLast4;
+    }
+
+    public String getPluginPmAddress1() {
+        return pluginPmAddress1;
+    }
+
+    public String getPluginPmAddress2() {
+        return pluginPmAddress2;
+    }
+
+    public String getPluginPmCity() {
+        return pluginPmCity;
+    }
+
+    public String getPluginPmState() {
+        return pluginPmState;
+    }
+
+    public String getPluginPmZip() {
+        return pluginPmZip;
+    }
+
+    public String getPluginPmCountry() {
+        return pluginPmCountry;
+    }
+
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("BusinessInvoicePayment");
-        sb.append("{invoicePaymentId=").append(invoicePaymentId);
+        final StringBuilder sb = new StringBuilder("BusinessInvoicePayment{");
+        sb.append("invoicePaymentId=").append(invoicePaymentId);
         sb.append(", invoiceId=").append(invoiceId);
         sb.append(", invoiceNumber=").append(invoiceNumber);
         sb.append(", invoiceCreatedDate=").append(invoiceCreatedDate);
@@ -161,6 +286,27 @@ public class BusinessInvoicePayment extends BusinessEntityBase {
         sb.append(", linkedInvoicePaymentId=").append(linkedInvoicePaymentId);
         sb.append(", amount=").append(amount);
         sb.append(", currency='").append(currency).append('\'');
+        sb.append(", pluginCreatedDate=").append(pluginCreatedDate);
+        sb.append(", pluginEffectiveDate=").append(pluginEffectiveDate);
+        sb.append(", pluginStatus='").append(pluginStatus).append('\'');
+        sb.append(", pluginGatewayError='").append(pluginGatewayError).append('\'');
+        sb.append(", pluginGatewayErrorCode='").append(pluginGatewayErrorCode).append('\'');
+        sb.append(", pluginFirstReferenceId='").append(pluginFirstReferenceId).append('\'');
+        sb.append(", pluginSecondReferenceId='").append(pluginSecondReferenceId).append('\'');
+        sb.append(", pluginPmId='").append(pluginPmId).append('\'');
+        sb.append(", pluginPmIsDefault=").append(pluginPmIsDefault);
+        sb.append(", pluginPmType='").append(pluginPmType).append('\'');
+        sb.append(", pluginPmCcName='").append(pluginPmCcName).append('\'');
+        sb.append(", pluginPmCcType='").append(pluginPmCcType).append('\'');
+        sb.append(", pluginPmCcExpirationMonth='").append(pluginPmCcExpirationMonth).append('\'');
+        sb.append(", pluginPmCcExpirationYear='").append(pluginPmCcExpirationYear).append('\'');
+        sb.append(", pluginPmCcLast4='").append(pluginPmCcLast4).append('\'');
+        sb.append(", pluginPmAddress1='").append(pluginPmAddress1).append('\'');
+        sb.append(", pluginPmAddress2='").append(pluginPmAddress2).append('\'');
+        sb.append(", pluginPmCity='").append(pluginPmCity).append('\'');
+        sb.append(", pluginPmState='").append(pluginPmState).append('\'');
+        sb.append(", pluginPmZip='").append(pluginPmZip).append('\'');
+        sb.append(", pluginPmCountry='").append(pluginPmCountry).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -179,22 +325,22 @@ public class BusinessInvoicePayment extends BusinessEntityBase {
 
         final BusinessInvoicePayment that = (BusinessInvoicePayment) o;
 
-        if (amount != null ? !amount.equals(that.amount) : that.amount != null) {
+        if (amount != null ? !(amount.compareTo(that.amount) == 0) : that.amount != null) {
             return false;
         }
         if (currency != null ? !currency.equals(that.currency) : that.currency != null) {
             return false;
         }
-        if (invoiceAmountCharged != null ? !invoiceAmountCharged.equals(that.invoiceAmountCharged) : that.invoiceAmountCharged != null) {
+        if (invoiceAmountCharged != null ? !(invoiceAmountCharged.compareTo(that.invoiceAmountCharged) == 0) : that.invoiceAmountCharged != null) {
             return false;
         }
-        if (invoiceAmountCredited != null ? !invoiceAmountCredited.equals(that.invoiceAmountCredited) : that.invoiceAmountCredited != null) {
+        if (invoiceAmountCredited != null ? !(invoiceAmountCredited.compareTo(that.invoiceAmountCredited) == 0) : that.invoiceAmountCredited != null) {
             return false;
         }
-        if (invoiceAmountPaid != null ? !invoiceAmountPaid.equals(that.invoiceAmountPaid) : that.invoiceAmountPaid != null) {
+        if (invoiceAmountPaid != null ? !(invoiceAmountPaid.compareTo(that.invoiceAmountPaid) == 0) : that.invoiceAmountPaid != null) {
             return false;
         }
-        if (invoiceBalance != null ? !invoiceBalance.equals(that.invoiceBalance) : that.invoiceBalance != null) {
+        if (invoiceBalance != null ? !(invoiceBalance.compareTo(that.invoiceBalance) == 0) : that.invoiceBalance != null) {
             return false;
         }
         if (invoiceCreatedDate != null ? !invoiceCreatedDate.equals(that.invoiceCreatedDate) : that.invoiceCreatedDate != null) {
@@ -212,7 +358,7 @@ public class BusinessInvoicePayment extends BusinessEntityBase {
         if (invoiceNumber != null ? !invoiceNumber.equals(that.invoiceNumber) : that.invoiceNumber != null) {
             return false;
         }
-        if (invoiceOriginalAmountCharged != null ? !invoiceOriginalAmountCharged.equals(that.invoiceOriginalAmountCharged) : that.invoiceOriginalAmountCharged != null) {
+        if (invoiceOriginalAmountCharged != null ? !(invoiceOriginalAmountCharged.compareTo(that.invoiceOriginalAmountCharged) == 0) : that.invoiceOriginalAmountCharged != null) {
             return false;
         }
         if (invoicePaymentId != null ? !invoicePaymentId.equals(that.invoicePaymentId) : that.invoicePaymentId != null) {
@@ -230,6 +376,69 @@ public class BusinessInvoicePayment extends BusinessEntityBase {
         if (paymentNumber != null ? !paymentNumber.equals(that.paymentNumber) : that.paymentNumber != null) {
             return false;
         }
+        if (pluginCreatedDate != null ? !pluginCreatedDate.equals(that.pluginCreatedDate) : that.pluginCreatedDate != null) {
+            return false;
+        }
+        if (pluginEffectiveDate != null ? !pluginEffectiveDate.equals(that.pluginEffectiveDate) : that.pluginEffectiveDate != null) {
+            return false;
+        }
+        if (pluginFirstReferenceId != null ? !pluginFirstReferenceId.equals(that.pluginFirstReferenceId) : that.pluginFirstReferenceId != null) {
+            return false;
+        }
+        if (pluginGatewayError != null ? !pluginGatewayError.equals(that.pluginGatewayError) : that.pluginGatewayError != null) {
+            return false;
+        }
+        if (pluginGatewayErrorCode != null ? !pluginGatewayErrorCode.equals(that.pluginGatewayErrorCode) : that.pluginGatewayErrorCode != null) {
+            return false;
+        }
+        if (pluginPmAddress1 != null ? !pluginPmAddress1.equals(that.pluginPmAddress1) : that.pluginPmAddress1 != null) {
+            return false;
+        }
+        if (pluginPmAddress2 != null ? !pluginPmAddress2.equals(that.pluginPmAddress2) : that.pluginPmAddress2 != null) {
+            return false;
+        }
+        if (pluginPmCcExpirationMonth != null ? !pluginPmCcExpirationMonth.equals(that.pluginPmCcExpirationMonth) : that.pluginPmCcExpirationMonth != null) {
+            return false;
+        }
+        if (pluginPmCcExpirationYear != null ? !pluginPmCcExpirationYear.equals(that.pluginPmCcExpirationYear) : that.pluginPmCcExpirationYear != null) {
+            return false;
+        }
+        if (pluginPmCcLast4 != null ? !pluginPmCcLast4.equals(that.pluginPmCcLast4) : that.pluginPmCcLast4 != null) {
+            return false;
+        }
+        if (pluginPmCcName != null ? !pluginPmCcName.equals(that.pluginPmCcName) : that.pluginPmCcName != null) {
+            return false;
+        }
+        if (pluginPmCcType != null ? !pluginPmCcType.equals(that.pluginPmCcType) : that.pluginPmCcType != null) {
+            return false;
+        }
+        if (pluginPmCity != null ? !pluginPmCity.equals(that.pluginPmCity) : that.pluginPmCity != null) {
+            return false;
+        }
+        if (pluginPmCountry != null ? !pluginPmCountry.equals(that.pluginPmCountry) : that.pluginPmCountry != null) {
+            return false;
+        }
+        if (pluginPmId != null ? !pluginPmId.equals(that.pluginPmId) : that.pluginPmId != null) {
+            return false;
+        }
+        if (pluginPmIsDefault != null ? !pluginPmIsDefault.equals(that.pluginPmIsDefault) : that.pluginPmIsDefault != null) {
+            return false;
+        }
+        if (pluginPmState != null ? !pluginPmState.equals(that.pluginPmState) : that.pluginPmState != null) {
+            return false;
+        }
+        if (pluginPmType != null ? !pluginPmType.equals(that.pluginPmType) : that.pluginPmType != null) {
+            return false;
+        }
+        if (pluginPmZip != null ? !pluginPmZip.equals(that.pluginPmZip) : that.pluginPmZip != null) {
+            return false;
+        }
+        if (pluginSecondReferenceId != null ? !pluginSecondReferenceId.equals(that.pluginSecondReferenceId) : that.pluginSecondReferenceId != null) {
+            return false;
+        }
+        if (pluginStatus != null ? !pluginStatus.equals(that.pluginStatus) : that.pluginStatus != null) {
+            return false;
+        }
 
         return true;
     }
@@ -254,6 +463,27 @@ public class BusinessInvoicePayment extends BusinessEntityBase {
         result = 31 * result + (linkedInvoicePaymentId != null ? linkedInvoicePaymentId.hashCode() : 0);
         result = 31 * result + (amount != null ? amount.hashCode() : 0);
         result = 31 * result + (currency != null ? currency.hashCode() : 0);
+        result = 31 * result + (pluginCreatedDate != null ? pluginCreatedDate.hashCode() : 0);
+        result = 31 * result + (pluginEffectiveDate != null ? pluginEffectiveDate.hashCode() : 0);
+        result = 31 * result + (pluginStatus != null ? pluginStatus.hashCode() : 0);
+        result = 31 * result + (pluginGatewayError != null ? pluginGatewayError.hashCode() : 0);
+        result = 31 * result + (pluginGatewayErrorCode != null ? pluginGatewayErrorCode.hashCode() : 0);
+        result = 31 * result + (pluginFirstReferenceId != null ? pluginFirstReferenceId.hashCode() : 0);
+        result = 31 * result + (pluginSecondReferenceId != null ? pluginSecondReferenceId.hashCode() : 0);
+        result = 31 * result + (pluginPmId != null ? pluginPmId.hashCode() : 0);
+        result = 31 * result + (pluginPmIsDefault != null ? pluginPmIsDefault.hashCode() : 0);
+        result = 31 * result + (pluginPmType != null ? pluginPmType.hashCode() : 0);
+        result = 31 * result + (pluginPmCcName != null ? pluginPmCcName.hashCode() : 0);
+        result = 31 * result + (pluginPmCcType != null ? pluginPmCcType.hashCode() : 0);
+        result = 31 * result + (pluginPmCcExpirationMonth != null ? pluginPmCcExpirationMonth.hashCode() : 0);
+        result = 31 * result + (pluginPmCcExpirationYear != null ? pluginPmCcExpirationYear.hashCode() : 0);
+        result = 31 * result + (pluginPmCcLast4 != null ? pluginPmCcLast4.hashCode() : 0);
+        result = 31 * result + (pluginPmAddress1 != null ? pluginPmAddress1.hashCode() : 0);
+        result = 31 * result + (pluginPmAddress2 != null ? pluginPmAddress2.hashCode() : 0);
+        result = 31 * result + (pluginPmCity != null ? pluginPmCity.hashCode() : 0);
+        result = 31 * result + (pluginPmState != null ? pluginPmState.hashCode() : 0);
+        result = 31 * result + (pluginPmZip != null ? pluginPmZip.hashCode() : 0);
+        result = 31 * result + (pluginPmCountry != null ? pluginPmCountry.hashCode() : 0);
         return result;
     }
 }

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessOverdueStatus.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessOverdueStatus.java
index a6151a3..06ac63c 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessOverdueStatus.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessOverdueStatus.java
@@ -86,7 +86,7 @@ public class BusinessOverdueStatus extends BusinessEntityBase {
         if (endDate != null ? !endDate.equals(that.endDate) : that.endDate != null) {
             return false;
         }
-        if (objectType != that.objectType) {
+        if (objectType != null ? !objectType.equals(that.objectType) : that.objectType != null) {
             return false;
         }
         if (startDate != null ? !startDate.equals(that.startDate) : that.startDate != null) {

diff --git a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessSubscriptionTransition.java b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessSubscriptionTransition.java
index 660fdc7..2f12870 100644
--- a/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessSubscriptionTransition.java
+++ b/osgi-bundles/bundles/analytics/src/main/java/com/ning/billing/osgi/bundles/analytics/api/BusinessSubscriptionTransition.java
@@ -310,13 +310,13 @@ public class BusinessSubscriptionTransition extends BusinessEntityBase {
         if (nextEndDate != null ? !nextEndDate.equals(that.nextEndDate) : that.nextEndDate != null) {
             return false;
         }
-        if (nextMrr != null ? !nextMrr.equals(that.nextMrr) : that.nextMrr != null) {
+        if (nextMrr != null ? !(nextMrr.compareTo(that.nextMrr) == 0) : that.nextMrr != null) {
             return false;
         }
         if (nextPhase != null ? !nextPhase.equals(that.nextPhase) : that.nextPhase != null) {
             return false;
         }
-        if (nextPrice != null ? !nextPrice.equals(that.nextPrice) : that.nextPrice != null) {
+        if (nextPrice != null ? !(nextPrice.compareTo(that.nextPrice) == 0) : that.nextPrice != null) {
             return false;
         }
         if (nextPriceList != null ? !nextPriceList.equals(that.nextPriceList) : that.nextPriceList != null) {
@@ -349,13 +349,13 @@ public class BusinessSubscriptionTransition extends BusinessEntityBase {
         if (prevCurrency != null ? !prevCurrency.equals(that.prevCurrency) : that.prevCurrency != null) {
             return false;
         }
-        if (prevMrr != null ? !prevMrr.equals(that.prevMrr) : that.prevMrr != null) {
+        if (prevMrr != null ? !(prevMrr.compareTo(that.prevMrr) == 0) : that.prevMrr != null) {
             return false;
         }
         if (prevPhase != null ? !prevPhase.equals(that.prevPhase) : that.prevPhase != null) {
             return false;
         }
-        if (prevPrice != null ? !prevPrice.equals(that.prevPrice) : that.prevPrice != null) {
+        if (prevPrice != null ? !(prevPrice.compareTo(that.prevPrice) == 0) : that.prevPrice != null) {
             return false;
         }
         if (prevPriceList != null ? !prevPriceList.equals(that.prevPriceList) : that.prevPriceList != null) {