killbill-aplcache

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountField.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountField.java
index b990125..3d9df23 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountField.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountField.java
@@ -33,8 +33,8 @@ public class BusinessAccountField extends BusinessField {
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessAccountField");
         sb.append("{accountKey='").append(accountKey).append('\'');
-        sb.append(", name='").append(name).append('\'');
-        sb.append(", value='").append(value).append('\'');
+        sb.append(", name='").append(getName()).append('\'');
+        sb.append(", value='").append(getValue()).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -53,10 +53,10 @@ public class BusinessAccountField extends BusinessField {
         if (accountKey != null ? !accountKey.equals(that.accountKey) : that.accountKey != null) {
             return false;
         }
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
             return false;
         }
-        if (value != null ? !value.equals(that.value) : that.value != null) {
+        if (getValue() != null ? !getValue().equals(that.getValue()) : that.getValue() != null) {
             return false;
         }
 
@@ -66,8 +66,8 @@ public class BusinessAccountField extends BusinessField {
     @Override
     public int hashCode() {
         int result = accountKey != null ? accountKey.hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
-        result = 31 * result + (value != null ? value.hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        result = 31 * result + (getValue() != null ? getValue().hashCode() : 0);
         return result;
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTag.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTag.java
index 3a8de99..1461c6d 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTag.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTag.java
@@ -33,7 +33,7 @@ public class BusinessAccountTag extends BusinessTag {
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessAccountTag");
         sb.append("{accountKey='").append(accountKey).append('\'');
-        sb.append(", name='").append(name).append('\'');
+        sb.append(", name='").append(getName()).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -52,7 +52,7 @@ public class BusinessAccountTag extends BusinessTag {
         if (accountKey != null ? !accountKey.equals(that.accountKey) : that.accountKey != null) {
             return false;
         }
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
             return false;
         }
 
@@ -62,7 +62,7 @@ public class BusinessAccountTag extends BusinessTag {
     @Override
     public int hashCode() {
         int result = accountKey != null ? accountKey.hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
         return result;
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessField.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessField.java
index 68552d0..5d5e727 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessField.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessField.java
@@ -17,8 +17,8 @@
 package com.ning.billing.analytics.model;
 
 public abstract class BusinessField {
-    protected final String name;
-    protected final String value;
+    private final String name;
+    private final String value;
 
     public BusinessField(final String name, final String value) {
         this.name = name;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceField.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceField.java
index cf69497..d4597f4 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceField.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceField.java
@@ -35,8 +35,8 @@ public class BusinessInvoiceField extends BusinessField {
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessInvoiceField");
         sb.append("{invoiceId='").append(invoiceId).append('\'');
-        sb.append(", name='").append(name).append('\'');
-        sb.append(", value='").append(value).append('\'');
+        sb.append(", name='").append(getName()).append('\'');
+        sb.append(", value='").append(getValue()).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -55,10 +55,10 @@ public class BusinessInvoiceField extends BusinessField {
         if (invoiceId != null ? !invoiceId.equals(that.invoiceId) : that.invoiceId != null) {
             return false;
         }
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
             return false;
         }
-        if (value != null ? !value.equals(that.value) : that.value != null) {
+        if (getValue() != null ? !getValue().equals(that.getValue()) : that.getValue() != null) {
             return false;
         }
 
@@ -68,8 +68,8 @@ public class BusinessInvoiceField extends BusinessField {
     @Override
     public int hashCode() {
         int result = invoiceId != null ? invoiceId.hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
-        result = 31 * result + (value != null ? value.hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        result = 31 * result + (getValue() != null ? getValue().hashCode() : 0);
         return result;
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentField.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentField.java
index bcfc85b..c79b2b1 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentField.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentField.java
@@ -35,8 +35,8 @@ public class BusinessInvoicePaymentField extends BusinessField {
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessPaymentField");
         sb.append("{paymentId='").append(paymentId).append('\'');
-        sb.append(", name='").append(name).append('\'');
-        sb.append(", value='").append(value).append('\'');
+        sb.append(", name='").append(getName()).append('\'');
+        sb.append(", value='").append(getValue()).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -55,10 +55,10 @@ public class BusinessInvoicePaymentField extends BusinessField {
         if (paymentId != null ? !paymentId.equals(that.paymentId) : that.paymentId != null) {
             return false;
         }
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
             return false;
         }
-        if (value != null ? !value.equals(that.value) : that.value != null) {
+        if (getValue() != null ? !getValue().equals(that.getValue()) : that.getValue() != null) {
             return false;
         }
 
@@ -68,8 +68,8 @@ public class BusinessInvoicePaymentField extends BusinessField {
     @Override
     public int hashCode() {
         int result = paymentId != null ? paymentId.hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
-        result = 31 * result + (value != null ? value.hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        result = 31 * result + (getValue() != null ? getValue().hashCode() : 0);
         return result;
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTag.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTag.java
index fd48b1c..e1cbbd5 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTag.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTag.java
@@ -35,7 +35,7 @@ public class BusinessInvoicePaymentTag extends BusinessTag {
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessPaymentTag");
         sb.append("{paymentId='").append(paymentId).append('\'');
-        sb.append(", name='").append(name).append('\'');
+        sb.append(", name='").append(getName()).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -54,7 +54,7 @@ public class BusinessInvoicePaymentTag extends BusinessTag {
         if (paymentId != null ? !paymentId.equals(that.paymentId) : that.paymentId != null) {
             return false;
         }
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
             return false;
         }
 
@@ -64,7 +64,7 @@ public class BusinessInvoicePaymentTag extends BusinessTag {
     @Override
     public int hashCode() {
         int result = paymentId != null ? paymentId.hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
         return result;
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTag.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTag.java
index e9efe5a..41b7d27 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTag.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTag.java
@@ -35,7 +35,7 @@ public class BusinessInvoiceTag extends BusinessTag {
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessInvoiceTag");
         sb.append("{paymentId='").append(invoiceId).append('\'');
-        sb.append(", name='").append(name).append('\'');
+        sb.append(", name='").append(getName()).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -54,7 +54,7 @@ public class BusinessInvoiceTag extends BusinessTag {
         if (invoiceId != null ? !invoiceId.equals(that.invoiceId) : that.invoiceId != null) {
             return false;
         }
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
             return false;
         }
 
@@ -64,7 +64,7 @@ public class BusinessInvoiceTag extends BusinessTag {
     @Override
     public int hashCode() {
         int result = invoiceId != null ? invoiceId.hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
         return result;
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionField.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionField.java
index bab1259..4fe470a 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionField.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionField.java
@@ -33,8 +33,8 @@ public class BusinessSubscriptionTransitionField extends BusinessField {
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessSubscriptionTransitionField");
         sb.append("{externalKey='").append(externalKey).append('\'');
-        sb.append(", name='").append(name).append('\'');
-        sb.append(", value='").append(value).append('\'');
+        sb.append(", name='").append(getName()).append('\'');
+        sb.append(", value='").append(getValue()).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -53,10 +53,10 @@ public class BusinessSubscriptionTransitionField extends BusinessField {
         if (externalKey != null ? !externalKey.equals(that.externalKey) : that.externalKey != null) {
             return false;
         }
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
             return false;
         }
-        if (value != null ? !value.equals(that.value) : that.value != null) {
+        if (getValue() != null ? !getValue().equals(that.getValue()) : that.getValue() != null) {
             return false;
         }
 
@@ -66,8 +66,8 @@ public class BusinessSubscriptionTransitionField extends BusinessField {
     @Override
     public int hashCode() {
         int result = externalKey != null ? externalKey.hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
-        result = 31 * result + (value != null ? value.hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        result = 31 * result + (getValue() != null ? getValue().hashCode() : 0);
         return result;
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTag.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTag.java
index 522194a..eefa65c 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTag.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTag.java
@@ -33,7 +33,7 @@ public class BusinessSubscriptionTransitionTag extends BusinessTag {
         final StringBuilder sb = new StringBuilder();
         sb.append("BusinessSubscriptionTransitionTag");
         sb.append("{externalKey='").append(externalKey).append('\'');
-        sb.append(", name='").append(name).append('\'');
+        sb.append(", name='").append(getName()).append('\'');
         sb.append('}');
         return sb.toString();
     }
@@ -52,7 +52,7 @@ public class BusinessSubscriptionTransitionTag extends BusinessTag {
         if (externalKey != null ? !externalKey.equals(that.externalKey) : that.externalKey != null) {
             return false;
         }
-        if (name != null ? !name.equals(that.name) : that.name != null) {
+        if (getName() != null ? !getName().equals(that.getName()) : that.getName() != null) {
             return false;
         }
 
@@ -62,7 +62,7 @@ public class BusinessSubscriptionTransitionTag extends BusinessTag {
     @Override
     public int hashCode() {
         int result = externalKey != null ? externalKey.hashCode() : 0;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
         return result;
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessTag.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessTag.java
index 80343e1..64ddaa9 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessTag.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessTag.java
@@ -17,7 +17,7 @@
 package com.ning.billing.analytics.model;
 
 public abstract class BusinessTag {
-    protected final String name;
+    private final String name;
 
     public BusinessTag(final String name) {
         this.name = name;