killbill-aplcache

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionDataRepair.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionDataRepair.java
index 85c42a6..0d4d1be 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionDataRepair.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/timeline/SubscriptionDataRepair.java
@@ -47,7 +47,6 @@ import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.clock.Clock;
 
 public class SubscriptionDataRepair extends SubscriptionData {
-
     private final AddonUtils addonUtils;
     private final Clock clock;
     private final EntitlementDao repairDao;
@@ -56,8 +55,7 @@ public class SubscriptionDataRepair extends SubscriptionData {
     private final List<EntitlementEvent> initialEvents;
 
     // Low level events are ONLY used for Repair APIs
-    protected List<EntitlementEvent> events;
-
+    private List<EntitlementEvent> events;
 
     public SubscriptionDataRepair(final SubscriptionBuilder builder, final List<EntitlementEvent> initialEvents, final SubscriptionApiService apiService,
                                   final EntitlementDao dao, final Clock clock, final AddonUtils addonUtils, final CatalogService catalogService) {
@@ -69,7 +67,6 @@ public class SubscriptionDataRepair extends SubscriptionData {
         this.initialEvents = initialEvents;
     }
 
-
     DateTime getLastUserEventEffectiveDate() {
         DateTime res = null;
         for (final EntitlementEvent cur : events) {
@@ -119,7 +116,7 @@ public class SubscriptionDataRepair extends SubscriptionData {
 
     public void addFutureAddonCancellation(final List<SubscriptionDataRepair> addOnSubscriptionInRepair, final CallContext context) {
 
-        if (category != ProductCategory.BASE) {
+        if (getCategory() != ProductCategory.BASE) {
             return;
         }
 
@@ -136,7 +133,7 @@ public class SubscriptionDataRepair extends SubscriptionData {
     private void trickleDownBPEffectForAddon(final List<SubscriptionDataRepair> addOnSubscriptionInRepair, final DateTime effectiveDate, final CallContext context)
             throws EntitlementUserApiException {
 
-        if (category != ProductCategory.BASE) {
+        if (getCategory() != ProductCategory.BASE) {
             return;
         }
 
@@ -145,7 +142,6 @@ public class SubscriptionDataRepair extends SubscriptionData {
         addAddonCancellationIfRequired(addOnSubscriptionInRepair, baseProduct, effectiveDate, context);
     }
 
-
     private void addAddonCancellationIfRequired(final List<SubscriptionDataRepair> addOnSubscriptionInRepair, final Product baseProduct, final DateTime effectiveDate, final CallContext context) {
 
         final DateTime now = clock.getUTCNow();
@@ -177,7 +173,7 @@ public class SubscriptionDataRepair extends SubscriptionData {
 
     private void checkAddonRights(final SubscriptionDataRepair baseSubscription)
             throws EntitlementUserApiException, CatalogApiException {
-        if (category == ProductCategory.ADD_ON) {
+        if (getCategory() == ProductCategory.ADD_ON) {
             addonUtils.checkAddonCreationRights(baseSubscription, getCurrentPlan());
         }
     }
@@ -195,7 +191,6 @@ public class SubscriptionDataRepair extends SubscriptionData {
         return initialEvents;
     }
 
-
     public Collection<EntitlementEvent> getNewEvents() {
         final Collection<EntitlementEvent> newEvents = Collections2.filter(events, new Predicate<EntitlementEvent>() {
             @Override

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
index 2c23f76..700f39f 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/user/SubscriptionData.java
@@ -54,35 +54,33 @@ import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.entity.EntityBase;
 
 public class SubscriptionData extends EntityBase implements Subscription {
-
     private static final Logger log = LoggerFactory.getLogger(SubscriptionData.class);
 
+    private final Clock clock;
+    private final SubscriptionApiService apiService;
 
-    protected final Clock clock;
-    protected final SubscriptionApiService apiService;
     //
     // Final subscription fields
     //
-    protected final UUID bundleId;
-    protected final DateTime startDate;
-    protected final DateTime bundleStartDate;
-    protected final ProductCategory category;
+    private final UUID bundleId;
+    private final DateTime startDate;
+    private final DateTime bundleStartDate;
+    private final ProductCategory category;
 
     //
     // Those can be modified through non User APIs, and a new Subscription
     // object would be created
     //
-    protected final long activeVersion;
-    protected final DateTime chargedThroughDate;
-    protected final DateTime paidThroughDate;
-
+    private final long activeVersion;
+    private final DateTime chargedThroughDate;
+    private final DateTime paidThroughDate;
 
     //
     // User APIs (create, change, cancel,...) will recompute those each time,
     // so the user holding that subscription object get the correct state when
     // the call completes
     //
-    protected LinkedList<SubscriptionTransitionData> transitions;
+    private LinkedList<SubscriptionTransitionData> transitions;
 
     // Transient object never returned at the API
     public SubscriptionData(final SubscriptionBuilder builder) {
@@ -281,7 +279,6 @@ public class SubscriptionData extends EntityBase implements Subscription {
         return result;
     }
 
-
     public SubscriptionEvent getTransitionFromEvent(final EntitlementEvent event, final int seqId) {
         if (transitions == null || event == null) {
             return null;
@@ -306,7 +303,6 @@ public class SubscriptionData extends EntityBase implements Subscription {
         return activeVersion;
     }
 
-
     public List<SubscriptionTransitionData> getAllTransitions() {
         return transitions;
     }