killbill-memoizeit

diff --git a/api/src/main/java/org/killbill/billing/junction/DefaultBlockingState.java b/api/src/main/java/org/killbill/billing/junction/DefaultBlockingState.java
index ea7d757..2d73488 100644
--- a/api/src/main/java/org/killbill/billing/junction/DefaultBlockingState.java
+++ b/api/src/main/java/org/killbill/billing/junction/DefaultBlockingState.java
@@ -1,7 +1,9 @@
 /*
  * Copyright 2010-2012 Ning, Inc.
+ * Copyright 2014-2015 Groupon, Inc
+ * Copyright 2014-2015 The Billing Project, LLC
  *
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License.  You may obtain a copy of the License at:
  *
@@ -19,12 +21,10 @@ package org.killbill.billing.junction;
 import java.util.UUID;
 
 import org.joda.time.DateTime;
-
-import org.killbill.clock.Clock;
 import org.killbill.billing.entitlement.api.BlockingState;
 import org.killbill.billing.entitlement.api.BlockingStateType;
 import org.killbill.billing.entity.EntityBase;
-
+import org.killbill.clock.Clock;
 
 public class DefaultBlockingState extends EntityBase implements BlockingState {
 
@@ -98,9 +98,6 @@ public class DefaultBlockingState extends EntityBase implements BlockingState {
         return blockingId;
     }
 
-    /* (non-Javadoc)
-    * @see org.killbill.billing.junction.api.blocking.BlockingState#getStateName()
-    */
     @Override
     public String getStateName() {
         return stateName;
@@ -111,9 +108,6 @@ public class DefaultBlockingState extends EntityBase implements BlockingState {
         return type;
     }
 
-    /* (non-Javadoc)
-    * @see org.killbill.billing.junction.api.blocking.BlockingState#getTimestamp()
-    */
     @Override
     public DateTime getEffectiveDate() {
         return effectiveDate;
@@ -124,25 +118,16 @@ public class DefaultBlockingState extends EntityBase implements BlockingState {
         return service;
     }
 
-    /* (non-Javadoc)
-     * @see org.killbill.billing.junction.api.blocking.BlockingState#isBlockChange()
-     */
     @Override
     public boolean isBlockChange() {
         return blockChange;
     }
 
-    /* (non-Javadoc)
-     * @see org.killbill.billing.junction.api.blocking.BlockingState#isBlockEntitlement()
-     */
     @Override
     public boolean isBlockEntitlement() {
         return blockEntitlement;
     }
 
-    /* (non-Javadoc)
-     * @see org.killbill.billing.junction.api.blocking.BlockingState#isBlockBilling()
-     */
     @Override
     public boolean isBlockBilling() {
         return blockBilling;
@@ -226,9 +211,6 @@ public class DefaultBlockingState extends EntityBase implements BlockingState {
         return true;
     }
 
-    /* (non-Javadoc)
-    * @see org.killbill.billing.junction.api.blocking.BlockingState#getDescription()
-    */
     @Override
     public String getDescription() {
         final String entitlement = onOff(isBlockEntitlement());
@@ -249,7 +231,7 @@ public class DefaultBlockingState extends EntityBase implements BlockingState {
     @Override
     public String toString() {
         return "BlockingState [blockingId=" + blockingId + ", stateName=" + stateName + ", service="
-                + service + ", blockChange=" + blockChange + ", blockEntitlement=" + blockEntitlement
-                + ", blockBilling=" + blockBilling + ", effectiveDate=" + effectiveDate + "]";
+               + service + ", blockChange=" + blockChange + ", blockEntitlement=" + blockEntitlement
+               + ", blockBilling=" + blockBilling + ", effectiveDate=" + effectiveDate + "]";
     }
 }

diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionBundleTimeline.java b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionBundleTimeline.java
index 3ff2055..9ae7a68 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionBundleTimeline.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/api/DefaultSubscriptionBundleTimeline.java
@@ -1,7 +1,9 @@
 /*
  * Copyright 2010-2013 Ning, Inc.
+ * Copyright 2014-2015 Groupon, Inc
+ * Copyright 2014-2015 The Billing Project, LLC
  *
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License.  You may obtain a copy of the License at:
  *
@@ -34,9 +36,6 @@ import javax.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.killbill.billing.catalog.api.BillingPeriod;
 import org.killbill.billing.catalog.api.Plan;
 import org.killbill.billing.catalog.api.PlanPhase;
@@ -49,6 +48,8 @@ import org.killbill.billing.junction.DefaultBlockingState;
 import org.killbill.billing.subscription.api.SubscriptionBase;
 import org.killbill.billing.subscription.api.SubscriptionBaseTransitionType;
 import org.killbill.billing.subscription.api.user.SubscriptionBaseTransition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
@@ -93,7 +94,7 @@ public class DefaultSubscriptionBundleTimeline implements SubscriptionBundleTime
     //
     private List<SubscriptionEvent> computeEvents(final Collection<Entitlement> entitlements, final List<BlockingState> allBlockingStates, final DateTimeZone accountTimeZone) {
         // Extract ids for all entitlement in the list
-        final Set<UUID> allEntitlementUUIDs = new TreeSet(Collections2.transform(entitlements, new Function<Entitlement, UUID>() {
+        final Set<UUID> allEntitlementUUIDs = new TreeSet<UUID>(Collections2.transform(entitlements, new Function<Entitlement, UUID>() {
             @Override
             public UUID apply(final Entitlement input) {
                 return input.getId();

diff --git a/entitlement/src/main/java/org/killbill/billing/entitlement/dao/BlockingStateModelDao.java b/entitlement/src/main/java/org/killbill/billing/entitlement/dao/BlockingStateModelDao.java
index f69435a..f218edf 100644
--- a/entitlement/src/main/java/org/killbill/billing/entitlement/dao/BlockingStateModelDao.java
+++ b/entitlement/src/main/java/org/killbill/billing/entitlement/dao/BlockingStateModelDao.java
@@ -1,7 +1,9 @@
 /*
  * Copyright 2010-2013 Ning, Inc.
+ * Copyright 2014-2015 Groupon, Inc
+ * Copyright 2014-2015 The Billing Project, LLC
  *
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License.  You may obtain a copy of the License at:
  *
@@ -19,17 +21,15 @@ package org.killbill.billing.entitlement.dao;
 import java.util.UUID;
 
 import org.joda.time.DateTime;
-
 import org.killbill.billing.callcontext.InternalCallContext;
 import org.killbill.billing.entitlement.api.BlockingState;
 import org.killbill.billing.entitlement.api.BlockingStateType;
-import org.killbill.billing.entity.EntityBase;
 import org.killbill.billing.junction.DefaultBlockingState;
 import org.killbill.billing.util.dao.TableName;
 import org.killbill.billing.util.entity.dao.EntityModelDao;
 import org.killbill.billing.util.entity.dao.EntityModelDaoBase;
 
-public class BlockingStateModelDao extends EntityModelDaoBase implements EntityModelDao<BlockingState>{
+public class BlockingStateModelDao extends EntityModelDaoBase implements EntityModelDao<BlockingState> {
 
     private UUID blockableId;
     private BlockingStateType type;
@@ -143,7 +143,7 @@ public class BlockingStateModelDao extends EntityModelDaoBase implements EntityM
         return isActive;
     }
 
-    public static BlockingState toBlockingState(BlockingStateModelDao src) {
+    public static BlockingState toBlockingState(final BlockingStateModelDao src) {
         if (src == null) {
             return null;
         }