killbill-aplcache

diff --git a/analytics/src/main/java/com/ning/billing/analytics/api/DefaultAnalyticsService.java b/analytics/src/main/java/com/ning/billing/analytics/api/DefaultAnalyticsService.java
index 3a54f5b..caf05e1 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/api/DefaultAnalyticsService.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/api/DefaultAnalyticsService.java
@@ -19,12 +19,14 @@ package com.ning.billing.analytics.api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.inject.Inject;
 import com.ning.billing.analytics.AnalyticsListener;
 import com.ning.billing.lifecycle.LifecycleHandlerType;
 import com.ning.billing.util.svcsapi.bus.InternalBus;
 
+import com.google.inject.Inject;
+
 public class DefaultAnalyticsService implements AnalyticsService {
+
     private static final Logger log = LoggerFactory.getLogger(DefaultAnalyticsService.class);
 
     private static final String ANALYTICS_SERVICE = "analytics-service";

diff --git a/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java b/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
index 49cc1db..b5e42de 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/api/user/DefaultAnalyticsUserApi.java
@@ -41,8 +41,8 @@ import com.ning.billing.analytics.api.TimeSeriesData;
 import com.ning.billing.analytics.dao.AnalyticsDao;
 import com.ning.billing.analytics.model.BusinessAccountModelDao;
 import com.ning.billing.analytics.model.BusinessAccountTagModelDao;
-import com.ning.billing.analytics.model.BusinessInvoiceModelDao;
 import com.ning.billing.analytics.model.BusinessInvoiceItemModelDao;
+import com.ning.billing.analytics.model.BusinessInvoiceModelDao;
 import com.ning.billing.analytics.model.BusinessInvoicePaymentModelDao;
 import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
 import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessOverdueStatusDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessOverdueStatusDao.java
index 83868c3..b0b30fd 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessOverdueStatusDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessOverdueStatusDao.java
@@ -104,7 +104,7 @@ public class BusinessOverdueStatusDao {
                     DateTime previousStartDate = null;
                     for (final BlockingState state : overdueStatesReversed) {
                         final BusinessOverdueStatusModelDao overdueStatus = new BusinessOverdueStatusModelDao(accountKey, bundleId, previousStartDate,
-                                                                                              externalKey, state.getTimestamp(), state.getStateName());
+                                                                                                              externalKey, state.getTimestamp(), state.getStateName());
                         log.info("Adding overdue state {}", overdueStatus);
                         overdueStatusSqlDao.createOverdueStatus(overdueStatus, context);
 

diff --git a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java
index 7a08253..c8ebb65 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/BusinessSubscriptionTransitionDao.java
@@ -242,7 +242,7 @@ public class BusinessSubscriptionTransitionDao {
     }
 
     private BusinessSubscriptionTransitionModelDao getPreviousBusinessSubscriptionTransitionForEvent(final EffectiveSubscriptionInternalEvent event,
-                                                                                             final ArrayList<BusinessSubscriptionTransitionModelDao> transitions) {
+                                                                                                     final ArrayList<BusinessSubscriptionTransitionModelDao> transitions) {
         BusinessSubscriptionTransitionModelDao transition = null;
         for (final BusinessSubscriptionTransitionModelDao candidate : transitions) {
             final BusinessSubscription nextSubscription = candidate.getNextSubscription();

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java
index 077361e..7a7e22d 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountBinder.java
@@ -36,7 +36,9 @@ import com.ning.billing.analytics.model.BusinessAccountModelDao;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface BusinessAccountBinder {
+
     public static class BacBinderFactory implements BinderFactory {
+
         public Binder build(final Annotation annotation) {
             return new Binder<BusinessAccountBinder, BusinessAccountModelDao>() {
                 public void bind(final SQLStatement q, final BusinessAccountBinder bind, final BusinessAccountModelDao account) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldMapper.java
index c45ecfe..2928ac4 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldMapper.java
@@ -26,6 +26,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessAccountFieldModelDao;
 
 public class BusinessAccountFieldMapper implements ResultSetMapper<BusinessAccountFieldModelDao> {
+
     @Override
     public BusinessAccountFieldModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         final UUID accountId = UUID.fromString(r.getString(1));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.java
index 6d6eb4a..f8ac268 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountFieldSqlDao.java
@@ -35,7 +35,7 @@ public interface BusinessAccountFieldSqlDao {
 
     @SqlQuery
     List<BusinessAccountFieldModelDao> getFieldsForAccountByKey(@Bind("account_key") final String accountKey,
-                                                        @InternalTenantContextBinder final InternalTenantContext context);
+                                                                @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int addField(@Bind("account_id") final String accountId,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java
index cc5f054..193b84f 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountSqlDao.java
@@ -40,11 +40,11 @@ public interface BusinessAccountSqlDao extends Transactional<BusinessAccountSqlD
 
     @SqlQuery
     BusinessAccountModelDao getAccount(@Bind("account_id") final String accountId,
-                               @InternalTenantContextBinder final InternalTenantContext context);
+                                       @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlQuery
     BusinessAccountModelDao getAccountByKey(@Bind("account_key") String accountKey,
-                                    @InternalTenantContextBinder final InternalTenantContext context);
+                                            @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int createAccount(@BusinessAccountBinder final BusinessAccountModelDao account,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagMapper.java
index 3df0d71..32654ff 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagMapper.java
@@ -26,6 +26,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessAccountTagModelDao;
 
 public class BusinessAccountTagMapper implements ResultSetMapper<BusinessAccountTagModelDao> {
+
     @Override
     public BusinessAccountTagModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         final UUID accountId = UUID.fromString(r.getString(1));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.java
index 7d84653..dd39791 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessAccountTagSqlDao.java
@@ -35,7 +35,7 @@ public interface BusinessAccountTagSqlDao {
 
     @SqlQuery
     List<BusinessAccountTagModelDao> getTagsForAccountByKey(@Bind("account_key") final String accountKey,
-                                                    @InternalTenantContextBinder final InternalTenantContext context);
+                                                            @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int addTag(@Bind("account_id") final String accountId,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceBinder.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceBinder.java
index a28c5e6..1b0db33 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceBinder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceBinder.java
@@ -37,7 +37,9 @@ import com.ning.billing.analytics.utils.Rounder;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface BusinessInvoiceBinder {
+
     public static class BinBinderFactory implements BinderFactory {
+
         public Binder build(final Annotation annotation) {
             return new Binder<BusinessInvoiceBinder, BusinessInvoiceModelDao>() {
                 public void bind(final SQLStatement q, final BusinessInvoiceBinder bind, final BusinessInvoiceModelDao invoice) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.java
index 05c434c..dcb1f61 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldMapper.java
@@ -26,6 +26,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessInvoiceFieldModelDao;
 
 public class BusinessInvoiceFieldMapper implements ResultSetMapper<BusinessInvoiceFieldModelDao> {
+
     @Override
     public BusinessInvoiceFieldModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         return new BusinessInvoiceFieldModelDao(UUID.fromString(r.getString(1)), r.getString(2), r.getString(3));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.java
index 44db7b5..6cbec80 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceFieldSqlDao.java
@@ -35,7 +35,7 @@ public interface BusinessInvoiceFieldSqlDao {
 
     @SqlQuery
     List<BusinessInvoiceFieldModelDao> getFieldsForInvoice(@Bind("invoice_id") final String invoiceId,
-                                                   @InternalTenantContextBinder final InternalTenantContext context);
+                                                           @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int addField(@Bind("invoice_id") final String invoiceId,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemMapper.java
index 06cb65a..4927546 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemMapper.java
@@ -54,7 +54,7 @@ public class BusinessInvoiceItemMapper extends MapperBase implements ResultSetMa
         final Currency currency = Currency.valueOf(r.getString("currency"));
 
         return new BusinessInvoiceItemModelDao(amount, billingPeriod, createdDate, currency, endDate, externalKey, invoiceId,
-                                       itemId, linkedItemId, itemType, phase, productCategory, productName, productType, slug,
-                                       startDate, updatedDate);
+                                               itemId, linkedItemId, itemType, phase, productCategory, productName, productType, slug,
+                                               startDate, updatedDate);
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java
index a98670a..041eb21 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceItemSqlDao.java
@@ -37,15 +37,15 @@ public interface BusinessInvoiceItemSqlDao extends Transactional<BusinessInvoice
 
     @SqlQuery
     BusinessInvoiceItemModelDao getInvoiceItem(@Bind("item_id") final String itemId,
-                                       @InternalTenantContextBinder final InternalTenantContext context);
+                                               @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlQuery
     List<BusinessInvoiceItemModelDao> getInvoiceItemsForInvoice(@Bind("invoice_id") final String invoiceId,
-                                                        @InternalTenantContextBinder final InternalTenantContext context);
+                                                                @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlQuery
     List<BusinessInvoiceItemModelDao> getInvoiceItemsForBundleByKey(@Bind("external_key") final String externalKey,
-                                                            @InternalTenantContextBinder final InternalTenantContext context);
+                                                                    @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int createInvoiceItem(@BusinessInvoiceItemBinder final BusinessInvoiceItemModelDao invoiceItem,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceMapper.java
index 032cf52..ac16b5b 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceMapper.java
@@ -32,6 +32,7 @@ import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.util.dao.MapperBase;
 
 public class BusinessInvoiceMapper extends MapperBase implements ResultSetMapper<BusinessInvoiceModelDao> {
+
     @Override
     public BusinessInvoiceModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         final UUID invoiceId = UUID.fromString(r.getString(1));
@@ -49,6 +50,6 @@ public class BusinessInvoiceMapper extends MapperBase implements ResultSetMapper
         final BigDecimal amountCredited = BigDecimal.valueOf(r.getDouble(13));
 
         return new BusinessInvoiceModelDao(accountId, accountKey, amountCharged, amountCredited, amountPaid, balance, createdDate, currency,
-                                   invoiceDate, invoiceId, invoiceNumber, targetDate, updatedDate);
+                                           invoiceDate, invoiceId, invoiceNumber, targetDate, updatedDate);
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentBinder.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentBinder.java
index b66156f..6bb75f1 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentBinder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentBinder.java
@@ -38,7 +38,9 @@ import com.ning.billing.analytics.utils.Rounder;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface BusinessInvoicePaymentBinder {
+
     public static class BipBinderFactory implements BinderFactory {
+
         @Override
         public Binder build(final Annotation annotation) {
             return new Binder<BusinessInvoicePaymentBinder, BusinessInvoicePaymentModelDao>() {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldMapper.java
index 6a9964b..3418e7f 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldMapper.java
@@ -26,6 +26,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessInvoicePaymentFieldModelDao;
 
 public class BusinessInvoicePaymentFieldMapper implements ResultSetMapper<BusinessInvoicePaymentFieldModelDao> {
+
     @Override
     public BusinessInvoicePaymentFieldModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         return new BusinessInvoicePaymentFieldModelDao(UUID.fromString(r.getString(1)), r.getString(2), r.getString(3));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.java
index 4e4c4af..7c7bfa9 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentFieldSqlDao.java
@@ -35,7 +35,7 @@ public interface BusinessInvoicePaymentFieldSqlDao {
 
     @SqlQuery
     List<BusinessInvoicePaymentFieldModelDao> getFieldsForInvoicePayment(@Bind("payment_id") final String paymentId,
-                                                                 @InternalTenantContextBinder final InternalTenantContext context);
+                                                                         @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int addField(@Bind("payment_id") final String paymentId,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentMapper.java
index b320f54..2a7be16 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentMapper.java
@@ -30,6 +30,7 @@ import com.ning.billing.analytics.model.BusinessInvoicePaymentModelDao;
 import com.ning.billing.catalog.api.Currency;
 
 public class BusinessInvoicePaymentMapper implements ResultSetMapper<BusinessInvoicePaymentModelDao> {
+
     @Override
     public BusinessInvoicePaymentModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         final UUID paymentId = UUID.fromString(r.getString(1));
@@ -61,8 +62,8 @@ public class BusinessInvoicePaymentMapper implements ResultSetMapper<BusinessInv
         }
 
         return new BusinessInvoicePaymentModelDao(accountKey, amount, extFirstPaymentRefId, extSecondPaymentRefId, cardCountry, cardType, createdDate, currency,
-                                          effectiveDate, invoiceId, paymentError, paymentId, paymentMethod, paymentType,
-                                          pluginName, processingStatus, requestedAmount, updatedDate, invoicePaymentType,
-                                          linkedInvoicePaymentId);
+                                                  effectiveDate, invoiceId, paymentError, paymentId, paymentMethod, paymentType,
+                                                  pluginName, processingStatus, requestedAmount, updatedDate, invoicePaymentType,
+                                                  linkedInvoicePaymentId);
     }
 }

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java
index fe1570e..3215556 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentSqlDao.java
@@ -37,11 +37,11 @@ public interface BusinessInvoicePaymentSqlDao extends Transactional<BusinessInvo
 
     @SqlQuery
     BusinessInvoicePaymentModelDao getInvoicePayment(@Bind("payment_id") final String paymentId,
-                                             @InternalTenantContextBinder final InternalTenantContext context);
+                                                     @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlQuery
     List<BusinessInvoicePaymentModelDao> getInvoicePaymentsForAccountByKey(@Bind("account_key") final String accountKey,
-                                                                   @InternalTenantContextBinder final InternalTenantContext context);
+                                                                           @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int createInvoicePayment(@BusinessInvoicePaymentBinder final BusinessInvoicePaymentModelDao payment,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagMapper.java
index ebcc287..d1310bc 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagMapper.java
@@ -26,6 +26,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessInvoicePaymentTagModelDao;
 
 public class BusinessInvoicePaymentTagMapper implements ResultSetMapper<BusinessInvoicePaymentTagModelDao> {
+
     @Override
     public BusinessInvoicePaymentTagModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         return new BusinessInvoicePaymentTagModelDao(UUID.fromString(r.getString(1)), r.getString(2));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.java
index 22643af..5a10eec 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoicePaymentTagSqlDao.java
@@ -35,7 +35,7 @@ public interface BusinessInvoicePaymentTagSqlDao {
 
     @SqlQuery
     List<BusinessInvoicePaymentTagModelDao> getTagsForInvoicePayment(@Bind("payment_id") final String paymentId,
-                                                             @InternalTenantContextBinder final InternalTenantContext context);
+                                                                     @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int addTag(@Bind("payment_id") final String paymentId,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.java
index 800d802..eed6999 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceSqlDao.java
@@ -37,15 +37,15 @@ public interface BusinessInvoiceSqlDao extends Transactional<BusinessInvoiceSqlD
 
     @SqlQuery
     BusinessInvoiceModelDao getInvoice(@Bind("invoice_id") final String invoiceId,
-                               @InternalTenantContextBinder final InternalTenantContext context);
+                                       @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlQuery
     List<BusinessInvoiceModelDao> getInvoicesForAccount(@Bind("account_id") final String accountId,
-                                                @InternalTenantContextBinder final InternalTenantContext context);
+                                                        @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlQuery
     List<BusinessInvoiceModelDao> getInvoicesForAccountByKey(@Bind("account_key") final String accountKey,
-                                                     @InternalTenantContextBinder final InternalTenantContext context);
+                                                             @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int createInvoice(@BusinessInvoiceBinder final BusinessInvoiceModelDao invoice,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java
index a8275db..8a6c850 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagMapper.java
@@ -26,6 +26,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessInvoiceTagModelDao;
 
 public class BusinessInvoiceTagMapper implements ResultSetMapper<BusinessInvoiceTagModelDao> {
+
     @Override
     public BusinessInvoiceTagModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         return new BusinessInvoiceTagModelDao(UUID.fromString(r.getString(1)), r.getString(2));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java
index 29c2d0e..1eb83ae 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessInvoiceTagSqlDao.java
@@ -35,7 +35,7 @@ public interface BusinessInvoiceTagSqlDao {
 
     @SqlQuery
     List<BusinessInvoiceTagModelDao> getTagsForInvoice(@Bind("invoice_id") final String invoiceId,
-                                               @InternalTenantContextBinder final InternalTenantContext context);
+                                                       @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int addTag(@Bind("invoice_id") final String invoiceId,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusBinder.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusBinder.java
index d4166d7..43adbde 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusBinder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusBinder.java
@@ -34,7 +34,9 @@ import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface BusinessOverdueStatusBinder {
+
     public static class BosBinderFactory implements BinderFactory {
+
         public Binder build(final Annotation annotation) {
             return new Binder<BusinessOverdueStatusBinder, BusinessOverdueStatusModelDao>() {
                 public void bind(final SQLStatement q, final BusinessOverdueStatusBinder bind, final BusinessOverdueStatusModelDao overdueStatus) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusMapper.java
index 8e8c6f6..02a963d 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusMapper.java
@@ -28,6 +28,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
 
 public class BusinessOverdueStatusMapper implements ResultSetMapper<BusinessOverdueStatusModelDao> {
+
     @Override
     public BusinessOverdueStatusModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         final UUID bundleId = UUID.fromString(r.getString(1));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.java
index a96a900..3a7a76f 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessOverdueStatusSqlDao.java
@@ -37,7 +37,7 @@ public interface BusinessOverdueStatusSqlDao extends Transactional<BusinessOverd
 
     @SqlQuery
     List<BusinessOverdueStatusModelDao> getOverdueStatusesForBundleByKey(@Bind("external_key") final String externalKey,
-                                                                 @InternalTenantContextBinder final InternalTenantContext context);
+                                                                         @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int createOverdueStatus(@BusinessOverdueStatusBinder final BusinessOverdueStatusModelDao status,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSqlProvider.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSqlProvider.java
index 4e28ee4..6d086e0 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSqlProvider.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSqlProvider.java
@@ -22,6 +22,7 @@ import com.google.inject.Inject;
 import com.google.inject.Provider;
 
 public class BusinessSqlProvider<T> implements Provider<T> {
+
     @Inject
     private IDBI dbi;
 

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java
index e25c604..83a5524 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionBinder.java
@@ -35,7 +35,9 @@ import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface BusinessSubscriptionTransitionBinder {
+
     public static class BstBinderFactory implements BinderFactory {
+
         public Binder build(final Annotation annotation) {
             return new Binder<BusinessSubscriptionTransitionBinder, BusinessSubscriptionTransitionModelDao>() {
                 public void bind(final SQLStatement q, final BusinessSubscriptionTransitionBinder bind, final BusinessSubscriptionTransitionModelDao arg) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldMapper.java
index b3bde2c..f3e9b43 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldMapper.java
@@ -26,6 +26,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessSubscriptionTransitionFieldModelDao;
 
 public class BusinessSubscriptionTransitionFieldMapper implements ResultSetMapper<BusinessSubscriptionTransitionFieldModelDao> {
+
     @Override
     public BusinessSubscriptionTransitionFieldModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         final UUID bundleId = UUID.fromString(r.getString(1));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.java
index a2daa87..0abf75d 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionFieldSqlDao.java
@@ -35,7 +35,7 @@ public interface BusinessSubscriptionTransitionFieldSqlDao {
 
     @SqlQuery
     List<BusinessSubscriptionTransitionFieldModelDao> getFieldsForBusinessSubscriptionTransitionByKey(@Bind("external_key") final String externalKey,
-                                                                                              @InternalTenantContextBinder final InternalTenantContext context);
+                                                                                                      @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int addField(@Bind("account_key") final String accountKey,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java
index bc67aeb..dce4638 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionMapper.java
@@ -34,6 +34,7 @@ import com.ning.billing.catalog.api.ProductCategory;
 import static com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
 
 public class BusinessSubscriptionTransitionMapper implements ResultSetMapper<BusinessSubscriptionTransitionModelDao> {
+
     @Override
     public BusinessSubscriptionTransitionModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         BusinessSubscription prev = new BusinessSubscription(

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java
index 7f20e21..873c51a 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionSqlDao.java
@@ -41,15 +41,15 @@ public interface BusinessSubscriptionTransitionSqlDao extends Transactional<Busi
 
     @SqlQuery
     List<BusinessSubscriptionTransitionModelDao> getTransitionsByKey(@Bind("external_key") final String externalKey,
-                                                             @InternalTenantContextBinder final InternalTenantContext context);
+                                                                     @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlQuery
     List<BusinessSubscriptionTransitionModelDao> getTransitionForSubscription(@Bind("subscription_id") final String subscriptionId,
-                                                                      @InternalTenantContextBinder final InternalTenantContext context);
+                                                                              @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlQuery
     List<BusinessSubscriptionTransitionModelDao> getTransitionsForAccount(@Bind("account_key") final String accountKey,
-                                                                  @InternalTenantContextBinder final InternalTenantContext context);
+                                                                          @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int createTransition(@BusinessSubscriptionTransitionBinder final BusinessSubscriptionTransitionModelDao transition,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagMapper.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagMapper.java
index 9d2bf30..b3f9bf9 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagMapper.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagMapper.java
@@ -26,6 +26,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
 import com.ning.billing.analytics.model.BusinessSubscriptionTransitionTagModelDao;
 
 public class BusinessSubscriptionTransitionTagMapper implements ResultSetMapper<BusinessSubscriptionTransitionTagModelDao> {
+
     @Override
     public BusinessSubscriptionTransitionTagModelDao map(final int index, final ResultSet r, final StatementContext ctx) throws SQLException {
         final UUID bundleId = UUID.fromString(r.getString(1));

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.java
index 96ef238..dbf1231 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/BusinessSubscriptionTransitionTagSqlDao.java
@@ -35,7 +35,7 @@ public interface BusinessSubscriptionTransitionTagSqlDao {
 
     @SqlQuery
     List<BusinessSubscriptionTransitionTagModelDao> getTagsForBusinessSubscriptionTransitionByKey(@Bind("external_key") final String externalKey,
-                                                                                          @InternalTenantContextBinder final InternalTenantContext context);
+                                                                                                  @InternalTenantContextBinder final InternalTenantContext context);
 
     @SqlUpdate
     int addTag(@Bind("account_key") final String accountKey,

diff --git a/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java b/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
index 81d3f9d..293218a 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/dao/DefaultAnalyticsDao.java
@@ -24,8 +24,8 @@ import com.ning.billing.analytics.api.DefaultTimeSeriesData;
 import com.ning.billing.analytics.api.TimeSeriesData;
 import com.ning.billing.analytics.model.BusinessAccountModelDao;
 import com.ning.billing.analytics.model.BusinessAccountTagModelDao;
-import com.ning.billing.analytics.model.BusinessInvoiceModelDao;
 import com.ning.billing.analytics.model.BusinessInvoiceItemModelDao;
+import com.ning.billing.analytics.model.BusinessInvoiceModelDao;
 import com.ning.billing.analytics.model.BusinessInvoicePaymentModelDao;
 import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
 import com.ning.billing.analytics.model.BusinessSubscriptionTransitionModelDao;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountFieldModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountFieldModelDao.java
index 98329c2..cbe99bd 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountFieldModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountFieldModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import java.util.UUID;
 
 public class BusinessAccountFieldModelDao extends BusinessFieldModelDao {
+
     private final UUID accountId;
     private final String accountKey;
 

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTagModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTagModelDao.java
index 00d51c0..e71a74c 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTagModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessAccountTagModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import java.util.UUID;
 
 public class BusinessAccountTagModelDao extends BusinessTagModelDao {
+
     private final UUID accountId;
     private final String accountKey;
 

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessFieldModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessFieldModelDao.java
index 6619387..56b2c94 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessFieldModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessFieldModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import com.ning.billing.util.entity.EntityBase;
 
 public abstract class BusinessFieldModelDao extends EntityBase {
+
     private final String name;
     private final String value;
 

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceFieldModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceFieldModelDao.java
index 50972ad..bae81c5 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceFieldModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceFieldModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import java.util.UUID;
 
 public class BusinessInvoiceFieldModelDao extends BusinessFieldModelDao {
+
     private final UUID invoiceId;
 
     public BusinessInvoiceFieldModelDao(final UUID invoiceId, final String name, final String value) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentFieldModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentFieldModelDao.java
index 1b343a9..827adc0 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentFieldModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentFieldModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import java.util.UUID;
 
 public class BusinessInvoicePaymentFieldModelDao extends BusinessFieldModelDao {
+
     private final UUID paymentId;
 
     public BusinessInvoicePaymentFieldModelDao(final UUID paymentId, final String name, final String value) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java
index 47ea69b..7fc5813 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentModelDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.catalog.api.Currency;
 import com.ning.billing.util.entity.EntityBase;
 
 public class BusinessInvoicePaymentModelDao extends EntityBase {
+
     private final UUID paymentId;
     private final String extFirstPaymentRefId;
     private final String extSecondPaymentRefId;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTagModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTagModelDao.java
index abaf9fa..51dade7 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTagModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoicePaymentTagModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import java.util.UUID;
 
 public class BusinessInvoicePaymentTagModelDao extends BusinessTagModelDao {
+
     private final UUID paymentId;
 
     public BusinessInvoicePaymentTagModelDao(final UUID paymentId, final String name) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTagModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTagModelDao.java
index fbd66f1..958ae9b 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTagModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessInvoiceTagModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import java.util.UUID;
 
 public class BusinessInvoiceTagModelDao extends BusinessTagModelDao {
+
     private final UUID invoiceId;
 
     public BusinessInvoiceTagModelDao(final UUID invoiceId, final String name) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessOverdueStatusModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessOverdueStatusModelDao.java
index 3bd2ef0..628c3b4 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessOverdueStatusModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessOverdueStatusModelDao.java
@@ -23,6 +23,7 @@ import org.joda.time.DateTime;
 import com.ning.billing.util.entity.EntityBase;
 
 public class BusinessOverdueStatusModelDao extends EntityBase {
+
     private final String accountKey;
     private final UUID bundleId;
     private final String externalKey;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionFieldModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionFieldModelDao.java
index 412396f..85d1054 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionFieldModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionFieldModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import java.util.UUID;
 
 public class BusinessSubscriptionTransitionFieldModelDao extends BusinessFieldModelDao {
+
     private final String accountKey;
     private final UUID bundleId;
     private final String externalKey;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionModelDao.java
index 5adf912..1dcd0d2 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionModelDao.java
@@ -26,6 +26,7 @@ import com.ning.billing.util.entity.EntityBase;
  * Describe a state change between two BusinessSubscription
  */
 public class BusinessSubscriptionTransitionModelDao extends EntityBase {
+
     private final long totalOrdering;
     private final UUID bundleId;
     private final String externalKey;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTagModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTagModelDao.java
index f286904..ef2ed40 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTagModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessSubscriptionTransitionTagModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import java.util.UUID;
 
 public class BusinessSubscriptionTransitionTagModelDao extends BusinessTagModelDao {
+
     private final String accountKey;
     private final UUID bundleId;
     private final String externalKey;

diff --git a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessTagModelDao.java b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessTagModelDao.java
index ea58d94..e6d4840 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/model/BusinessTagModelDao.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/model/BusinessTagModelDao.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.model;
 import com.ning.billing.util.entity.EntityBase;
 
 public abstract class BusinessTagModelDao extends EntityBase {
+
     private final String name;
 
     public BusinessTagModelDao(final String name) {

diff --git a/analytics/src/main/java/com/ning/billing/analytics/utils/Rounder.java b/analytics/src/main/java/com/ning/billing/analytics/utils/Rounder.java
index 6222a34..74ad689 100644
--- a/analytics/src/main/java/com/ning/billing/analytics/utils/Rounder.java
+++ b/analytics/src/main/java/com/ning/billing/analytics/utils/Rounder.java
@@ -19,6 +19,7 @@ package com.ning.billing.analytics.utils;
 import java.math.BigDecimal;
 
 public class Rounder {
+
     public static final int SCALE = 4;
 
     // Static only

diff --git a/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java b/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
index 23ff8a4..ca7ad62 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/AnalyticsTestModule.java
@@ -40,6 +40,7 @@ import com.ning.billing.util.glue.TagStoreModule;
 import com.ning.billing.util.tag.dao.TagDefinitionSqlDao;
 
 public class AnalyticsTestModule extends AnalyticsModule {
+
     @Override
     protected void configure() {
         super.configure();

diff --git a/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java b/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
index a5220a7..265631d 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
@@ -16,8 +16,6 @@
 
 package com.ning.billing.analytics.api;
 
-import static org.testng.Assert.fail;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.SQLException;
@@ -87,6 +85,8 @@ import com.ning.billing.util.svcsapi.bus.InternalBus;
 
 import com.google.inject.Inject;
 
+import static org.testng.Assert.fail;
+
 @Guice(modules = {AnalyticsTestModule.class})
 public class TestAnalyticsService extends AnalyticsTestSuiteWithEmbeddedDB {
 

diff --git a/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
index 97f447a..0dad057 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
@@ -110,7 +110,7 @@ public class TestDefaultAnalyticsUserApi extends AnalyticsTestSuiteWithEmbeddedD
     @Test(groups = "slow")
     public void testAccountsCreatedOverTime() throws Exception {
         final BusinessAccountModelDao account = new BusinessAccountModelDao(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
-                                                            BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "FRANCE", "USD", clock.getUTCNow(), clock.getUTCNow());
+                                                                            BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "FRANCE", "USD", clock.getUTCNow(), clock.getUTCNow());
         accountSqlDao.createAccount(account, internalCallContext);
 
         final TimeSeriesData data = analyticsUserApi.getAccountsCreatedOverTime(tenantContext);

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
index d0a5032..28d76a8 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
@@ -92,7 +92,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
         final BusinessSubscriptionEvent event = BusinessSubscriptionEvent.subscriptionCancelled(plan.getName(), catalog, requestedTimestamp, requestedTimestamp);
 
         transition = new BusinessSubscriptionTransitionModelDao(TOTAL_ORDERING, BUNDLE_ID, EXTERNAL_KEY, ACCOUNT_ID, ACCOUNT_KEY,
-                                                        UUID.randomUUID(), requestedTimestamp, event, prevSubscription, nextSubscription);
+                                                                UUID.randomUUID(), requestedTimestamp, event, prevSubscription, nextSubscription);
 
         final IDBI dbi = helper.getDBI();
         businessSubscriptionTransitionSqlDao = dbi.onDemand(BusinessSubscriptionTransitionSqlDao.class);
@@ -107,7 +107,7 @@ public class TestAnalyticsDao extends AnalyticsTestSuiteWithEmbeddedDB {
 
     private void setupBusinessAccount() {
         account = new BusinessAccountModelDao(UUID.randomUUID(), ACCOUNT_KEY, UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
-                                      BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "FRANCE", CURRENCY, clock.getUTCNow(), clock.getUTCNow());
+                                              BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "FRANCE", CURRENCY, clock.getUTCNow(), clock.getUTCNow());
 
         final IDBI dbi = helper.getDBI();
         businessAccountSqlDao = dbi.onDemand(BusinessAccountSqlDao.class);

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountFieldSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountFieldSqlDao.java
index 0276b43..9ac475a 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountFieldSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountFieldSqlDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessAccountFieldModelDao;
 
 public class TestBusinessAccountFieldSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessAccountFieldSqlDao accountFieldSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountTagSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountTagSqlDao.java
index fe44641..2631c25 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountTagSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessAccountTagSqlDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessAccountTagModelDao;
 
 public class TestBusinessAccountTagSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessAccountTagSqlDao accountTagSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.java
index ff6a238..920811e 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceFieldSqlDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessInvoiceFieldModelDao;
 
 public class TestBusinessInvoiceFieldSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessInvoiceFieldSqlDao invoiceFieldSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java
index f290032..a86074b 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceItemSqlDao.java
@@ -126,6 +126,6 @@ public class TestBusinessInvoiceItemSqlDao extends AnalyticsTestSuiteWithEmbedde
         final DateTime updatedDate = clock.getUTCNow();
 
         return new BusinessInvoiceItemModelDao(amount, billingPeriod, createdDate, currency, endDate, externalKey, invoiceId, itemId,
-                                       linkedItemId, itemType, phase, productCategory, productName, productType, slug, startDate, updatedDate);
+                                               linkedItemId, itemType, phase, productCategory, productName, productType, slug, startDate, updatedDate);
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentFieldSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentFieldSqlDao.java
index feb7ffb..8db50d9 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentFieldSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentFieldSqlDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessInvoicePaymentFieldModelDao;
 
 public class TestBusinessInvoicePaymentFieldSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessInvoicePaymentFieldSqlDao invoicePaymentFieldSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java
index 38be795..70058b8 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentSqlDao.java
@@ -31,6 +31,7 @@ import com.ning.billing.analytics.model.BusinessInvoicePaymentModelDao;
 import com.ning.billing.catalog.api.Currency;
 
 public class TestBusinessInvoicePaymentSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessInvoicePaymentSqlDao invoicePaymentSqlDao;
 
     @BeforeMethod(groups = "slow")
@@ -73,7 +74,7 @@ public class TestBusinessInvoicePaymentSqlDao extends AnalyticsTestSuiteWithEmbe
         final String extFirstPaymentRefId2 = UUID.randomUUID().toString();
         final String extSecondPaymentRefId2 = UUID.randomUUID().toString();
         final String accountKey2 = UUID.randomUUID().toString();
-        final BusinessInvoicePaymentModelDao invoicePayment2 = createInvoicePayment(extFirstPaymentRefId2, extSecondPaymentRefId2,  accountKey2);
+        final BusinessInvoicePaymentModelDao invoicePayment2 = createInvoicePayment(extFirstPaymentRefId2, extSecondPaymentRefId2, accountKey2);
 
         // Create both invoice payments
         Assert.assertEquals(invoicePaymentSqlDao.createInvoicePayment(invoicePayment1, internalCallContext), 1);
@@ -123,11 +124,11 @@ public class TestBusinessInvoicePaymentSqlDao extends AnalyticsTestSuiteWithEmbe
         final UUID linkedInvoicePaymentId = UUID.randomUUID();
 
         return new BusinessInvoicePaymentModelDao(accountKey, amount, extFirstPaymentRefId, extSecondPaymentRefId,
-                                          cardCountry, cardType, createdDate,
-                                          currency, effectiveDate, invoiceId,
-                                          paymentError, paymentId, paymentMethod,
-                                          paymentType, pluginName, processingStatus,
-                                          requestedAmount, updatedDate, invoicePaymentType,
-                                          linkedInvoicePaymentId);
+                                                  cardCountry, cardType, createdDate,
+                                                  currency, effectiveDate, invoiceId,
+                                                  paymentError, paymentId, paymentMethod,
+                                                  paymentType, pluginName, processingStatus,
+                                                  requestedAmount, updatedDate, invoicePaymentType,
+                                                  linkedInvoicePaymentId);
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentTagSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentTagSqlDao.java
index efcd05f..ad24025 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentTagSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoicePaymentTagSqlDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessInvoicePaymentTagModelDao;
 
 public class TestBusinessInvoicePaymentTagSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessInvoicePaymentTagSqlDao invoicePaymentTagSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceSqlDao.java
index 45e69ed..0bf6bf4 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceSqlDao.java
@@ -116,6 +116,6 @@ public class TestBusinessInvoiceSqlDao extends AnalyticsTestSuiteWithEmbeddedDB 
         final DateTime updatedDate = clock.getUTCNow();
 
         return new BusinessInvoiceModelDao(accountId, accountKey, amountCharged, amountCredited, amountPaid, balance,
-                                   createdDate, currency, invoiceDate, invoiceId, 12, targetDate, updatedDate);
+                                           createdDate, currency, invoiceDate, invoiceId, 12, targetDate, updatedDate);
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java
index 4dddca7..5d4cbc3 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessInvoiceTagSqlDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessInvoiceTagModelDao;
 
 public class TestBusinessInvoiceTagSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessInvoiceTagSqlDao invoiceTagSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessOverdueStatusSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessOverdueStatusSqlDao.java
index ffa0251..d26a03c 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessOverdueStatusSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessOverdueStatusSqlDao.java
@@ -29,6 +29,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessOverdueStatusModelDao;
 
 public class TestBusinessOverdueStatusSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessOverdueStatusSqlDao overdueStatusSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionFieldSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionFieldSqlDao.java
index 33d40ac..b24b162 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionFieldSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionFieldSqlDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessSubscriptionTransitionFieldModelDao;
 
 public class TestBusinessSubscriptionTransitionFieldSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessSubscriptionTransitionFieldSqlDao subscriptionTransitionFieldSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionTagSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionTagSqlDao.java
index b69aab8..d70e7ec 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionTagSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestBusinessSubscriptionTransitionTagSqlDao.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuiteWithEmbeddedDB;
 import com.ning.billing.analytics.model.BusinessSubscriptionTransitionTagModelDao;
 
 public class TestBusinessSubscriptionTransitionTagSqlDao extends AnalyticsTestSuiteWithEmbeddedDB {
+
     private BusinessSubscriptionTransitionTagSqlDao subscriptionTransitionTagSqlDao;
 
     @BeforeMethod(groups = "slow")

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java b/analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java
index 286342f..babc5d9 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockBusinessSubscriptionTransitionSqlDao.java
@@ -50,13 +50,13 @@ public class MockBusinessSubscriptionTransitionSqlDao implements BusinessSubscri
 
     @Override
     public List<BusinessSubscriptionTransitionModelDao> getTransitionsByKey(@Bind("event_key") final String key,
-                                                                    @InternalTenantContextBinder final InternalTenantContext context) {
+                                                                            @InternalTenantContextBinder final InternalTenantContext context) {
         return content.get(key);
     }
 
     @Override
     public List<BusinessSubscriptionTransitionModelDao> getTransitionForSubscription(@Bind("subscription_id") final String subscriptionId,
-                                                                             @InternalTenantContextBinder final InternalTenantContext context) {
+                                                                                     @InternalTenantContextBinder final InternalTenantContext context) {
         return ImmutableList.<BusinessSubscriptionTransitionModelDao>of();
     }
 

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java b/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
index c3779df..4fb496e 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockPhase.java
@@ -28,6 +28,7 @@ import com.ning.billing.catalog.api.PlanPhase;
 import com.ning.billing.catalog.api.Price;
 
 public class MockPhase implements PlanPhase {
+
     private final PhaseType cohort;
     private final Plan plan;
     private final Duration duration;

diff --git a/analytics/src/test/java/com/ning/billing/analytics/MockProduct.java b/analytics/src/test/java/com/ning/billing/analytics/MockProduct.java
index 624768e..95b8616 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/MockProduct.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/MockProduct.java
@@ -20,6 +20,7 @@ import com.ning.billing.catalog.api.Product;
 import com.ning.billing.catalog.api.ProductCategory;
 
 public class MockProduct implements Product {
+
     private final String name;
     private final String type;
     private final ProductCategory category;

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java
index 23a3132..a86a3c2 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccount.java
@@ -38,8 +38,8 @@ public class TestBusinessAccount extends AnalyticsTestSuite {
     @BeforeMethod(groups = "fast")
     public void setUp() throws Exception {
         account = new BusinessAccountModelDao(UUID.randomUUID(), "pierre", UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
-                                      BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "", UUID.randomUUID().toString(),
-                                      clock.getUTCNow(), clock.getUTCNow());
+                                              BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "", UUID.randomUUID().toString(),
+                                              clock.getUTCNow(), clock.getUTCNow());
     }
 
     @Test(groups = "fast")
@@ -49,9 +49,9 @@ public class TestBusinessAccount extends AnalyticsTestSuite {
         Assert.assertTrue(account.equals(account));
 
         final BusinessAccountModelDao otherAccount = new BusinessAccountModelDao(UUID.randomUUID(), "pierre cardin", UUID.randomUUID().toString(),
-                                                                 BigDecimal.ONE, clock.getUTCToday(),
-                                                                 BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa",
-                                                                 "", UUID.randomUUID().toString(), clock.getUTCNow(), clock.getUTCNow());
+                                                                                 BigDecimal.ONE, clock.getUTCToday(),
+                                                                                 BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa",
+                                                                                 "", UUID.randomUUID().toString(), clock.getUTCNow(), clock.getUTCNow());
         Assert.assertFalse(account.equals(otherAccount));
     }
 

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountField.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountField.java
index 247aa9c..ea104f8 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountField.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountField.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessAccountField extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final UUID accountId = UUID.randomUUID();
@@ -31,9 +32,9 @@ public class TestBusinessAccountField extends AnalyticsTestSuite {
         final String name = UUID.randomUUID().toString();
         final String value = UUID.randomUUID().toString();
         final BusinessAccountFieldModelDao accountField = new BusinessAccountFieldModelDao(accountId,
-                                                                           accountKey,
-                                                                           name,
-                                                                           value);
+                                                                                           accountKey,
+                                                                                           name,
+                                                                                           value);
         Assert.assertSame(accountField, accountField);
         Assert.assertEquals(accountField, accountField);
         Assert.assertTrue(accountField.equals(accountField));
@@ -43,9 +44,9 @@ public class TestBusinessAccountField extends AnalyticsTestSuite {
         Assert.assertEquals(accountField.getValue(), value);
 
         final BusinessAccountFieldModelDao otherAccountField = new BusinessAccountFieldModelDao(UUID.randomUUID(),
-                                                                                UUID.randomUUID().toString(),
-                                                                                UUID.randomUUID().toString(),
-                                                                                UUID.randomUUID().toString());
+                                                                                                UUID.randomUUID().toString(),
+                                                                                                UUID.randomUUID().toString(),
+                                                                                                UUID.randomUUID().toString());
         Assert.assertFalse(accountField.equals(otherAccountField));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountTag.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountTag.java
index 3252e99..bbaeed3 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountTag.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessAccountTag.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessAccountTag extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final UUID accountId = UUID.randomUUID();

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoice.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoice.java
index baf80b7..3b22900 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoice.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoice.java
@@ -49,7 +49,7 @@ public class TestBusinessInvoice extends AnalyticsTestSuite {
         final LocalDate targetDate = clock.getUTCToday();
         final DateTime updatedDate = clock.getUTCNow();
         final BusinessInvoiceModelDao invoice = new BusinessInvoiceModelDao(accountId, accountKey, amountCharged, amountCredited, amountPaid, balance,
-                                                            createdDate, currency, invoiceDate, invoiceId, invoiceNumber, targetDate, updatedDate);
+                                                                            createdDate, currency, invoiceDate, invoiceId, invoiceNumber, targetDate, updatedDate);
         Assert.assertSame(invoice, invoice);
         Assert.assertEquals(invoice, invoice);
         Assert.assertTrue(invoice.equals(invoice));
@@ -68,7 +68,7 @@ public class TestBusinessInvoice extends AnalyticsTestSuite {
         Assert.assertEquals(invoice.getUpdatedDate(), updatedDate);
 
         final BusinessInvoiceModelDao otherInvoice = new BusinessInvoiceModelDao(null, null, null, null, null, null, createdDate, null,
-                                                                 null, invoiceId, 0, null, null);
+                                                                                 null, invoiceId, 0, null, null);
         Assert.assertFalse(invoice.equals(otherInvoice));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java
index 7e584a7..66a26be 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceField.java
@@ -24,14 +24,15 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessInvoiceField extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final UUID invoiceId = UUID.randomUUID();
         final String name = UUID.randomUUID().toString();
         final String value = UUID.randomUUID().toString();
         final BusinessInvoiceFieldModelDao invoiceField = new BusinessInvoiceFieldModelDao(invoiceId,
-                                                                           name,
-                                                                           value);
+                                                                                           name,
+                                                                                           value);
         Assert.assertSame(invoiceField, invoiceField);
         Assert.assertEquals(invoiceField, invoiceField);
         Assert.assertTrue(invoiceField.equals(invoiceField));
@@ -40,8 +41,8 @@ public class TestBusinessInvoiceField extends AnalyticsTestSuite {
         Assert.assertEquals(invoiceField.getValue(), value);
 
         final BusinessInvoiceFieldModelDao otherInvoiceField = new BusinessInvoiceFieldModelDao(UUID.randomUUID(),
-                                                                                UUID.randomUUID().toString(),
-                                                                                UUID.randomUUID().toString());
+                                                                                                UUID.randomUUID().toString(),
+                                                                                                UUID.randomUUID().toString());
         Assert.assertFalse(invoiceField.equals(otherInvoiceField));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java
index e8bc936..1b1c84c 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceItem.java
@@ -53,9 +53,9 @@ public class TestBusinessInvoiceItem extends AnalyticsTestSuite {
         final LocalDate startDate = clock.getUTCToday();
         final DateTime updatedDate = clock.getUTCNow();
         final BusinessInvoiceItemModelDao invoiceItem = new BusinessInvoiceItemModelDao(amount, billingPeriod, createdDate, currency,
-                                                                        endDate, externalKey, invoiceId, itemId, linkedItemId,
-                                                                        itemType, phase, productCategory, productName, productType,
-                                                                        slug, startDate, updatedDate);
+                                                                                        endDate, externalKey, invoiceId, itemId, linkedItemId,
+                                                                                        itemType, phase, productCategory, productName, productType,
+                                                                                        slug, startDate, updatedDate);
         Assert.assertSame(invoiceItem, invoiceItem);
         Assert.assertEquals(invoiceItem, invoiceItem);
         Assert.assertTrue(invoiceItem.equals(invoiceItem));
@@ -78,7 +78,7 @@ public class TestBusinessInvoiceItem extends AnalyticsTestSuite {
         Assert.assertEquals(invoiceItem.getUpdatedDate(), updatedDate);
 
         final BusinessInvoiceItemModelDao otherInvoiceItem = new BusinessInvoiceItemModelDao(null, null, createdDate, null, null, null, null, itemId,
-                                                                             linkedItemId, null, null, null, null, null, null, null, null);
+                                                                                             linkedItemId, null, null, null, null, null, null, null, null);
         Assert.assertFalse(invoiceItem.equals(otherInvoiceItem));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java
index 263a74f..b4c29ca 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePayment.java
@@ -28,6 +28,7 @@ import com.ning.billing.analytics.AnalyticsTestSuite;
 import com.ning.billing.catalog.api.Currency;
 
 public class TestBusinessInvoicePayment extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final String accountKey = UUID.randomUUID().toString();
@@ -51,12 +52,12 @@ public class TestBusinessInvoicePayment extends AnalyticsTestSuite {
         final String invoicePaymentType = UUID.randomUUID().toString();
         final UUID linkedInvoicePaymentId = UUID.randomUUID();
         final BusinessInvoicePaymentModelDao invoicePayment = new BusinessInvoicePaymentModelDao(accountKey, amount, extFirstPaymentRefId, extSecondPaymentRefId,
-                                                                                 cardCountry, cardType, createdDate,
-                                                                                 currency, effectiveDate, invoiceId,
-                                                                                 paymentError, paymentId, paymentMethod,
-                                                                                 paymentType, pluginName, processingStatus,
-                                                                                 requestedAmount, updatedDate, invoicePaymentType,
-                                                                                 linkedInvoicePaymentId);
+                                                                                                 cardCountry, cardType, createdDate,
+                                                                                                 currency, effectiveDate, invoiceId,
+                                                                                                 paymentError, paymentId, paymentMethod,
+                                                                                                 paymentType, pluginName, processingStatus,
+                                                                                                 requestedAmount, updatedDate, invoicePaymentType,
+                                                                                                 linkedInvoicePaymentId);
         Assert.assertSame(invoicePayment, invoicePayment);
         Assert.assertEquals(invoicePayment, invoicePayment);
         Assert.assertTrue(invoicePayment.equals(invoicePayment));
@@ -82,8 +83,8 @@ public class TestBusinessInvoicePayment extends AnalyticsTestSuite {
         Assert.assertEquals(invoicePayment.getLinkedInvoicePaymentId(), linkedInvoicePaymentId);
 
         final BusinessInvoicePaymentModelDao otherInvoicePayment = new BusinessInvoicePaymentModelDao(null, null, extFirstPaymentRefId, extSecondPaymentRefId, null, null, createdDate,
-                                                                                      null, null, null, null, paymentId, null,
-                                                                                      null, null, null, null, null, null, null);
+                                                                                                      null, null, null, null, paymentId, null,
+                                                                                                      null, null, null, null, null, null, null);
         Assert.assertFalse(invoicePayment.equals(otherInvoicePayment));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentField.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentField.java
index faa0480..0ace55c 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentField.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentField.java
@@ -24,14 +24,15 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessInvoicePaymentField extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final UUID paymentId = UUID.randomUUID();
         final String name = UUID.randomUUID().toString();
         final String value = UUID.randomUUID().toString();
         final BusinessInvoicePaymentFieldModelDao invoiceField = new BusinessInvoicePaymentFieldModelDao(paymentId,
-                                                                                         name,
-                                                                                         value);
+                                                                                                         name,
+                                                                                                         value);
         Assert.assertSame(invoiceField, invoiceField);
         Assert.assertEquals(invoiceField, invoiceField);
         Assert.assertTrue(invoiceField.equals(invoiceField));
@@ -40,8 +41,8 @@ public class TestBusinessInvoicePaymentField extends AnalyticsTestSuite {
         Assert.assertEquals(invoiceField.getValue(), value);
 
         final BusinessInvoicePaymentFieldModelDao otherInvoicePaymentField = new BusinessInvoicePaymentFieldModelDao(UUID.randomUUID(),
-                                                                                                     UUID.randomUUID().toString(),
-                                                                                                     UUID.randomUUID().toString());
+                                                                                                                     UUID.randomUUID().toString(),
+                                                                                                                     UUID.randomUUID().toString());
         Assert.assertFalse(invoiceField.equals(otherInvoicePaymentField));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentTag.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentTag.java
index 98abd8d..1bd23e2 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentTag.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoicePaymentTag.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessInvoicePaymentTag extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final UUID paymentId = UUID.randomUUID();
@@ -36,7 +37,7 @@ public class TestBusinessInvoicePaymentTag extends AnalyticsTestSuite {
         Assert.assertEquals(invoicePaymentTag.getName(), name);
 
         final BusinessInvoicePaymentTagModelDao otherInvoicePaymentTag = new BusinessInvoicePaymentTagModelDao(UUID.randomUUID(),
-                                                                                               UUID.randomUUID().toString());
+                                                                                                               UUID.randomUUID().toString());
         Assert.assertFalse(invoicePaymentTag.equals(otherInvoicePaymentTag));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java
index 0d7253e..9211226 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessInvoiceTag.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessInvoiceTag extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final UUID invoiceId = UUID.randomUUID();

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessOverdueStatus.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessOverdueStatus.java
index 74d76e0..9d77303 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessOverdueStatus.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessOverdueStatus.java
@@ -26,6 +26,7 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessOverdueStatus extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final String accountKey = UUID.randomUUID().toString();
@@ -46,11 +47,11 @@ public class TestBusinessOverdueStatus extends AnalyticsTestSuite {
         Assert.assertEquals(overdueStatus.getStatus(), status);
 
         final BusinessOverdueStatusModelDao otherOverdueStatus = new BusinessOverdueStatusModelDao(UUID.randomUUID().toString(),
-                                                                                   UUID.randomUUID(),
-                                                                                   new DateTime(DateTimeZone.UTC),
-                                                                                   UUID.randomUUID().toString(),
-                                                                                   new DateTime(DateTimeZone.UTC),
-                                                                                   UUID.randomUUID().toString());
+                                                                                                   UUID.randomUUID(),
+                                                                                                   new DateTime(DateTimeZone.UTC),
+                                                                                                   UUID.randomUUID().toString(),
+                                                                                                   new DateTime(DateTimeZone.UTC),
+                                                                                                   UUID.randomUUID().toString());
         Assert.assertFalse(overdueStatus.equals(otherOverdueStatus));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionEvent.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionEvent.java
index de713a8..24b65ed 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionEvent.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionEvent.java
@@ -38,6 +38,7 @@ import com.ning.billing.mock.MockPlan;
 import com.ning.billing.mock.MockSubscription;
 
 public class TestBusinessSubscriptionEvent extends AnalyticsTestSuite {
+
     private Product product;
     private Plan plan;
     private PlanPhase phase;

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java
index c757084..fc362f5 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransition.java
@@ -43,6 +43,7 @@ import com.ning.billing.mock.MockSubscription;
 import static com.ning.billing.catalog.api.Currency.USD;
 
 public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
+
     private BusinessSubscription prevSubscription;
     private BusinessSubscription nextSubscription;
     private BusinessSubscriptionEvent event;
@@ -83,7 +84,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
         accountKey = "pierre-1234";
         subscriptionId = UUID.randomUUID();
         transition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
-                                                        subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
+                                                                subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
     }
 
     @Test(groups = "fast")
@@ -103,23 +104,23 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
         BusinessSubscriptionTransitionModelDao otherTransition;
 
         otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
-                                                             subscriptionId, new DateTime(), event, prevSubscription, nextSubscription);
+                                                                     subscriptionId, new DateTime(), event, prevSubscription, nextSubscription);
         Assert.assertTrue(!transition.equals(otherTransition));
 
         otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, "12345", accountId, accountKey,
-                                                             subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
+                                                                     subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
         Assert.assertTrue(!transition.equals(otherTransition));
 
         otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
-                                                             subscriptionId, requestedTimestamp, event, prevSubscription, prevSubscription);
+                                                                     subscriptionId, requestedTimestamp, event, prevSubscription, prevSubscription);
         Assert.assertTrue(!transition.equals(otherTransition));
 
         otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
-                                                             subscriptionId, requestedTimestamp, event, nextSubscription, nextSubscription);
+                                                                     subscriptionId, requestedTimestamp, event, nextSubscription, nextSubscription);
         Assert.assertTrue(!transition.equals(otherTransition));
 
         otherTransition = new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
-                                                             subscriptionId, requestedTimestamp, event, nextSubscription, prevSubscription);
+                                                                     subscriptionId, requestedTimestamp, event, nextSubscription, prevSubscription);
         Assert.assertTrue(!transition.equals(otherTransition));
     }
 
@@ -127,7 +128,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
     public void testRejectInvalidTransitions() throws Exception {
         try {
             new BusinessSubscriptionTransitionModelDao(null, bundleId, externalKey, accountId, accountKey,
-                                               subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
+                                                       subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
             Assert.fail();
         } catch (IllegalArgumentException e) {
             Assert.assertTrue(true);
@@ -135,7 +136,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
 
         try {
             new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, null, accountId, accountKey,
-                                               subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
+                                                       subscriptionId, requestedTimestamp, event, prevSubscription, nextSubscription);
             Assert.fail();
         } catch (IllegalArgumentException e) {
             Assert.assertTrue(true);
@@ -143,7 +144,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
 
         try {
             new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
-                                               subscriptionId, null, event, prevSubscription, nextSubscription);
+                                                       subscriptionId, null, event, prevSubscription, nextSubscription);
             Assert.fail();
         } catch (IllegalArgumentException e) {
             Assert.assertTrue(true);
@@ -151,7 +152,7 @@ public class TestBusinessSubscriptionTransition extends AnalyticsTestSuite {
 
         try {
             new BusinessSubscriptionTransitionModelDao(totalOrdering, bundleId, externalKey, accountId, accountKey,
-                                               subscriptionId, requestedTimestamp, null, prevSubscription, nextSubscription);
+                                                       subscriptionId, requestedTimestamp, null, prevSubscription, nextSubscription);
             Assert.fail();
         } catch (IllegalArgumentException e) {
             Assert.assertTrue(true);

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionField.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionField.java
index a506295..022190c 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionField.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionField.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessSubscriptionTransitionField extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final String accountKey = UUID.randomUUID().toString();
@@ -32,10 +33,10 @@ public class TestBusinessSubscriptionTransitionField extends AnalyticsTestSuite 
         final String name = UUID.randomUUID().toString();
         final String value = UUID.randomUUID().toString();
         final BusinessSubscriptionTransitionFieldModelDao subscriptionTransitionField = new BusinessSubscriptionTransitionFieldModelDao(accountKey,
-                                                                                                                        bundleId,
-                                                                                                                        externalKey,
-                                                                                                                        name,
-                                                                                                                        value);
+                                                                                                                                        bundleId,
+                                                                                                                                        externalKey,
+                                                                                                                                        name,
+                                                                                                                                        value);
         Assert.assertSame(subscriptionTransitionField, subscriptionTransitionField);
         Assert.assertEquals(subscriptionTransitionField, subscriptionTransitionField);
         Assert.assertTrue(subscriptionTransitionField.equals(subscriptionTransitionField));
@@ -46,10 +47,10 @@ public class TestBusinessSubscriptionTransitionField extends AnalyticsTestSuite 
         Assert.assertEquals(subscriptionTransitionField.getValue(), value);
 
         final BusinessSubscriptionTransitionFieldModelDao otherSubscriptionField = new BusinessSubscriptionTransitionFieldModelDao(UUID.randomUUID().toString(),
-                                                                                                                   UUID.randomUUID(),
-                                                                                                                   UUID.randomUUID().toString(),
-                                                                                                                   UUID.randomUUID().toString(),
-                                                                                                                   UUID.randomUUID().toString());
+                                                                                                                                   UUID.randomUUID(),
+                                                                                                                                   UUID.randomUUID().toString(),
+                                                                                                                                   UUID.randomUUID().toString(),
+                                                                                                                                   UUID.randomUUID().toString());
         Assert.assertFalse(subscriptionTransitionField.equals(otherSubscriptionField));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionTag.java b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionTag.java
index 916db4a..70972a9 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionTag.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/model/TestBusinessSubscriptionTransitionTag.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestBusinessSubscriptionTransitionTag extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testEquals() throws Exception {
         final String accountKey = UUID.randomUUID().toString();
@@ -31,9 +32,9 @@ public class TestBusinessSubscriptionTransitionTag extends AnalyticsTestSuite {
         final String externalKey = UUID.randomUUID().toString();
         final String name = UUID.randomUUID().toString();
         final BusinessSubscriptionTransitionTagModelDao subscriptionTransitionTag = new BusinessSubscriptionTransitionTagModelDao(accountKey,
-                                                                                                                  bundleId,
-                                                                                                                  externalKey,
-                                                                                                                  name);
+                                                                                                                                  bundleId,
+                                                                                                                                  externalKey,
+                                                                                                                                  name);
         Assert.assertSame(subscriptionTransitionTag, subscriptionTransitionTag);
         Assert.assertEquals(subscriptionTransitionTag, subscriptionTransitionTag);
         Assert.assertTrue(subscriptionTransitionTag.equals(subscriptionTransitionTag));
@@ -43,9 +44,9 @@ public class TestBusinessSubscriptionTransitionTag extends AnalyticsTestSuite {
         Assert.assertEquals(subscriptionTransitionTag.getName(), name);
 
         final BusinessSubscriptionTransitionTagModelDao otherTransitionTag = new BusinessSubscriptionTransitionTagModelDao(UUID.randomUUID().toString(),
-                                                                                                           UUID.randomUUID(),
-                                                                                                           UUID.randomUUID().toString(),
-                                                                                                           UUID.randomUUID().toString());
+                                                                                                                           UUID.randomUUID(),
+                                                                                                                           UUID.randomUUID().toString(),
+                                                                                                                           UUID.randomUUID().toString());
         Assert.assertFalse(subscriptionTransitionTag.equals(otherTransitionTag));
     }
 }

diff --git a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java
index e80ba57..05e27ec 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/TestBusinessSubscriptionTransitionRecorder.java
@@ -64,8 +64,6 @@ public class TestBusinessSubscriptionTransitionRecorder extends AnalyticsTestSui
         final EntitlementInternalApi entitlementApi = Mockito.mock(EntitlementInternalApi.class);
         Mockito.when(entitlementApi.getBundleFromId(Mockito.<UUID>any(), Mockito.<InternalTenantContext>any())).thenReturn(bundle);
 
-
-
         // Setup the account API
         final Account account = Mockito.mock(Account.class);
         Mockito.when(account.getExternalKey()).thenReturn(externalKey.toString());

diff --git a/analytics/src/test/java/com/ning/billing/analytics/utils/TestRounder.java b/analytics/src/test/java/com/ning/billing/analytics/utils/TestRounder.java
index e685641..b5a913f 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/utils/TestRounder.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/utils/TestRounder.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
 import com.ning.billing.analytics.AnalyticsTestSuite;
 
 public class TestRounder extends AnalyticsTestSuite {
+
     @Test(groups = "fast")
     public void testRound() throws Exception {
         Assert.assertEquals(Rounder.round(null), 0.0);