killbill-aplcache

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccountEmail.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccountEmail.java
index e6bdb24..b738270 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccountEmail.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccountEmail.java
@@ -18,10 +18,10 @@ package com.ning.billing.account.api;
 
 import java.util.UUID;
 
-import com.ning.billing.util.entity.Entity;
 import com.ning.billing.util.entity.EntityBase;
 
 public class DefaultAccountEmail extends EntityBase implements AccountEmail {
+
     private final UUID accountId;
     private final String email;
 

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccountService.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccountService.java
index 9b0cfc1..d630f70 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccountService.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccountService.java
@@ -16,7 +16,6 @@
 
 package com.ning.billing.account.api;
 
-
 public class DefaultAccountService implements AccountService {
 
     private static final String ACCOUNT_SERVICE_NAME = "account-service";
@@ -26,7 +25,7 @@ public class DefaultAccountService implements AccountService {
         return ACCOUNT_SERVICE_NAME;
     }
 
-//    @LifecycleHandlerType(LifecycleLevel.INIT_SERVICE)
-//    public void initialize() {
-//    }
+    //    @LifecycleHandlerType(LifecycleLevel.INIT_SERVICE)
+    //    public void initialize() {
+    //    }
 }

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultBillCycleDay.java b/account/src/main/java/com/ning/billing/account/api/DefaultBillCycleDay.java
index e5587be..faa33e5 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultBillCycleDay.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultBillCycleDay.java
@@ -61,13 +61,21 @@ public class DefaultBillCycleDay implements BillCycleDay {
 
     @Override
     public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         final DefaultBillCycleDay that = (DefaultBillCycleDay) o;
 
-        if (dayOfMonthLocal != that.dayOfMonthLocal) return false;
-        if (dayOfMonthUTC != that.dayOfMonthUTC) return false;
+        if (dayOfMonthLocal != that.dayOfMonthLocal) {
+            return false;
+        }
+        if (dayOfMonthUTC != that.dayOfMonthUTC) {
+            return false;
+        }
 
         return true;
     }

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultChangedField.java b/account/src/main/java/com/ning/billing/account/api/DefaultChangedField.java
index 0b762fd..09a971e 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultChangedField.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultChangedField.java
@@ -47,7 +47,6 @@ public class DefaultChangedField implements ChangedField {
         this(fieldName, oldValue, newValue, new DateTime());
     }
 
-
     @Override
     public String getFieldName() {
         return fieldName;
@@ -73,13 +72,13 @@ public class DefaultChangedField implements ChangedField {
         final int prime = 31;
         int result = 1;
         result = prime * result
-                + ((changeDate == null) ? 0 : changeDate.hashCode());
+                 + ((changeDate == null) ? 0 : changeDate.hashCode());
         result = prime * result
-                + ((fieldName == null) ? 0 : fieldName.hashCode());
+                 + ((fieldName == null) ? 0 : fieldName.hashCode());
         result = prime * result
-                + ((newValue == null) ? 0 : newValue.hashCode());
+                 + ((newValue == null) ? 0 : newValue.hashCode());
         result = prime * result
-                + ((oldValue == null) ? 0 : oldValue.hashCode());
+                 + ((oldValue == null) ? 0 : oldValue.hashCode());
         return result;
     }
 

diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
index 39cc93d..2d8ed85 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountChangeEvent.java
@@ -21,9 +21,9 @@ import java.util.List;
 import java.util.UUID;
 
 import com.ning.billing.account.api.Account;
-import com.ning.billing.util.events.ChangedField;
 import com.ning.billing.account.api.DefaultChangedField;
 import com.ning.billing.util.events.AccountChangeInternalEvent;
+import com.ning.billing.util.events.ChangedField;
 import com.ning.billing.util.events.DefaultBusInternalEvent;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -50,7 +50,7 @@ public class DefaultAccountChangeEvent extends DefaultBusInternalEvent implement
     }
 
     public DefaultAccountChangeEvent(final UUID id, final UUID userToken, final Account oldData, final Account newData,
-            final Long accountRecordId, final Long tenantRecordId) {
+                                     final Long accountRecordId, final Long tenantRecordId) {
         super(userToken, accountRecordId, tenantRecordId);
         this.accountId = id;
         this.userToken = userToken;

diff --git a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
index ba2210f..6980388 100644
--- a/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
+++ b/account/src/main/java/com/ning/billing/account/api/user/DefaultAccountCreationEvent.java
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class DefaultAccountCreationEvent  extends DefaultBusInternalEvent implements AccountCreationInternalEvent {
+public class DefaultAccountCreationEvent extends DefaultBusInternalEvent implements AccountCreationInternalEvent {
 
     private final UUID id;
     private final AccountData data;
@@ -70,7 +70,6 @@ public class DefaultAccountCreationEvent  extends DefaultBusInternalEvent implem
         return data;
     }
 
-
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -109,8 +108,8 @@ public class DefaultAccountCreationEvent  extends DefaultBusInternalEvent implem
         return true;
     }
 
-
     public static class DefaultAccountData implements AccountData {
+
         private final String externalKey;
         private final String name;
         private final Integer firstNameLength;
@@ -303,41 +302,41 @@ public class DefaultAccountCreationEvent  extends DefaultBusInternalEvent implem
             final int prime = 31;
             int result = 1;
             result = prime * result
-                    + ((address1 == null) ? 0 : address1.hashCode());
+                     + ((address1 == null) ? 0 : address1.hashCode());
             result = prime * result
-                    + ((address2 == null) ? 0 : address2.hashCode());
+                     + ((address2 == null) ? 0 : address2.hashCode());
             result = prime * result
-                    + ((billCycleDay == null) ? 0 : billCycleDay.hashCode());
+                     + ((billCycleDay == null) ? 0 : billCycleDay.hashCode());
             result = prime * result + ((city == null) ? 0 : city.hashCode());
             result = prime * result
-                    + ((companyName == null) ? 0 : companyName.hashCode());
+                     + ((companyName == null) ? 0 : companyName.hashCode());
             result = prime * result
-                    + ((country == null) ? 0 : country.hashCode());
+                     + ((country == null) ? 0 : country.hashCode());
             result = prime * result
-                    + ((currency == null) ? 0 : currency.hashCode());
+                     + ((currency == null) ? 0 : currency.hashCode());
             result = prime * result + ((email == null) ? 0 : email.hashCode());
             result = prime * result
-                    + ((externalKey == null) ? 0 : externalKey.hashCode());
+                     + ((externalKey == null) ? 0 : externalKey.hashCode());
             result = prime
-                    * result
-                    + ((firstNameLength == null) ? 0 : firstNameLength
+                     * result
+                     + ((firstNameLength == null) ? 0 : firstNameLength
                     .hashCode());
             result = prime * result
-                    + ((locale == null) ? 0 : locale.hashCode());
+                     + ((locale == null) ? 0 : locale.hashCode());
             result = prime * result + ((name == null) ? 0 : name.hashCode());
             result = prime
-                    * result
-                    + ((paymentMethodId == null) ? 0 : paymentMethodId
+                     * result
+                     + ((paymentMethodId == null) ? 0 : paymentMethodId
                     .hashCode());
             result = prime * result + ((phone == null) ? 0 : phone.hashCode());
             result = prime * result
-                    + ((postalCode == null) ? 0 : postalCode.hashCode());
+                     + ((postalCode == null) ? 0 : postalCode.hashCode());
             result = prime
-                    * result
-                    + ((stateOrProvince == null) ? 0 : stateOrProvince
+                     * result
+                     + ((stateOrProvince == null) ? 0 : stateOrProvince
                     .hashCode());
             result = prime * result
-                    + ((timeZone == null) ? 0 : timeZone.hashCode());
+                     + ((timeZone == null) ? 0 : timeZone.hashCode());
             return result;
         }
 

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountBinder.java b/account/src/main/java/com/ning/billing/account/dao/AccountBinder.java
index 3a413f0..9f0e744 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountBinder.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountBinder.java
@@ -35,7 +35,9 @@ import com.ning.billing.catalog.api.Currency;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface AccountBinder {
+
     public static class AccountBinderFactory implements BinderFactory {
+
         @Override
         public Binder<AccountBinder, Account> build(final Annotation annotation) {
             return new Binder<AccountBinder, Account>() {

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountDao.java b/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
index 4c2002e..5c5243a 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountDao.java
@@ -24,7 +24,6 @@ import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
 import com.ning.billing.util.entity.EntityPersistenceException;
 import com.ning.billing.util.entity.dao.EntityDao;
-import com.ning.billing.util.entity.dao.UpdatableEntityDao;
 
 public interface AccountDao extends EntityDao<Account, AccountApiException> {
 

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailBinder.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailBinder.java
index bf2cb77..7d60b3b 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailBinder.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailBinder.java
@@ -33,7 +33,9 @@ import com.ning.billing.account.api.AccountEmail;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface AccountEmailBinder {
+
     public static class AccountEmailBinderFactory implements BinderFactory {
+
         @Override
         public Binder<AccountEmailBinder, AccountEmail> build(final Annotation annotation) {
             return new Binder<AccountEmailBinder, AccountEmail>() {

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailHistoryBinder.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailHistoryBinder.java
index 866063c..ef79ae4 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailHistoryBinder.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailHistoryBinder.java
@@ -34,7 +34,9 @@ import com.ning.billing.util.dao.EntityHistory;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface AccountEmailHistoryBinder {
+
     public static class AccountEmailHistoryBinderFactory implements BinderFactory {
+
         @Override
         public Binder<AccountEmailHistoryBinder, EntityHistory<AccountEmail>> build(final Annotation annotation) {
             return new Binder<AccountEmailHistoryBinder, EntityHistory<AccountEmail>>() {

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountEmailMapper.java b/account/src/main/java/com/ning/billing/account/dao/AccountEmailMapper.java
index 9bfcbee..e668bba 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountEmailMapper.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountEmailMapper.java
@@ -28,6 +28,7 @@ import com.ning.billing.account.api.DefaultAccountEmail;
 import com.ning.billing.util.dao.MapperBase;
 
 public class AccountEmailMapper extends MapperBase implements ResultSetMapper<AccountEmail> {
+
     @Override
     public AccountEmail map(final int index, final ResultSet result, final StatementContext context) throws SQLException {
         final UUID id = UUID.fromString(result.getString("id"));

diff --git a/account/src/main/java/com/ning/billing/account/dao/AccountHistoryBinder.java b/account/src/main/java/com/ning/billing/account/dao/AccountHistoryBinder.java
index 7c70303..ba8eec0 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AccountHistoryBinder.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AccountHistoryBinder.java
@@ -36,7 +36,9 @@ import com.ning.billing.util.dao.EntityHistory;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PARAMETER})
 public @interface AccountHistoryBinder {
+
     public static class AccountHistoryBinderFactory implements BinderFactory {
+
         @Override
         public Binder<AccountHistoryBinder, EntityHistory<Account>> build(final Annotation annotation) {
             return new Binder<AccountHistoryBinder, EntityHistory<Account>>() {

diff --git a/account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java b/account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java
index 4d3f0b3..30d38a9 100644
--- a/account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java
+++ b/account/src/main/java/com/ning/billing/account/dao/AuditedAccountDao.java
@@ -83,7 +83,6 @@ public class AuditedAccountDao implements AccountDao {
         return accountSqlDao.getByRecordId(recordId, context);
     }
 
-
     @Override
     public List<Account> get(final InternalTenantContext context) {
         return accountSqlDao.get(context);

diff --git a/account/src/main/java/com/ning/billing/account/glue/DefaultAccountModule.java b/account/src/main/java/com/ning/billing/account/glue/DefaultAccountModule.java
index b419725..f595130 100644
--- a/account/src/main/java/com/ning/billing/account/glue/DefaultAccountModule.java
+++ b/account/src/main/java/com/ning/billing/account/glue/DefaultAccountModule.java
@@ -32,6 +32,7 @@ import com.ning.billing.util.svcapi.account.AccountInternalApi;
 import com.google.inject.AbstractModule;
 
 public class DefaultAccountModule extends AbstractModule implements AccountModule {
+
     private void installConfig() {
     }
 
@@ -49,6 +50,7 @@ public class DefaultAccountModule extends AbstractModule implements AccountModul
     public void installInternalApi() {
         bind(AccountInternalApi.class).to(DefaultAccountInternalApi.class).asEagerSingleton();
     }
+
     private void installAccountService() {
         bind(AccountService.class).to(DefaultAccountService.class).asEagerSingleton();
     }

diff --git a/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java b/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
index 8dd87bb..f19d940 100644
--- a/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
+++ b/account/src/test/java/com/ning/billing/account/api/user/TestEventJson.java
@@ -24,14 +24,15 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.ning.billing.account.AccountTestSuite;
-import com.ning.billing.util.events.ChangedField;
 import com.ning.billing.account.api.DefaultBillCycleDay;
 import com.ning.billing.account.api.DefaultChangedField;
 import com.ning.billing.account.api.user.DefaultAccountCreationEvent.DefaultAccountData;
 import com.ning.billing.util.events.AccountChangeInternalEvent;
+import com.ning.billing.util.events.ChangedField;
 import com.ning.billing.util.jackson.ObjectMapper;
 
 public class TestEventJson extends AccountTestSuite {
+
     private final ObjectMapper mapper = new ObjectMapper();
 
     @Test(groups = "fast")
@@ -52,7 +53,7 @@ public class TestEventJson extends AccountTestSuite {
     public void testAccountCreationEvent() throws Exception {
         final DefaultAccountData data = new DefaultAccountData("dsfdsf", "bobo", 3, "bobo@yahoo.com", new DefaultBillCycleDay(12), "USD", UUID.randomUUID(),
                                                                "UTC", "US", "21 avenue", "", "Gling", "San Franciso", "CA", "94110", "USA", "4126789887", false, false);
-        final DefaultAccountCreationEvent e = new DefaultAccountCreationEvent(data, UUID.randomUUID(), UUID.randomUUID(),  1L, 45L);
+        final DefaultAccountCreationEvent e = new DefaultAccountCreationEvent(data, UUID.randomUUID(), UUID.randomUUID(), 1L, 45L);
         final String json = mapper.writeValueAsString(e);
 
         final DefaultAccountCreationEvent obj = mapper.readValue(json, DefaultAccountCreationEvent.class);

diff --git a/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java b/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
index f28c777..a7e159c 100644
--- a/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
+++ b/account/src/test/java/com/ning/billing/account/dao/AccountDaoTestBase.java
@@ -22,13 +22,12 @@ import org.skife.jdbi.v2.IDBI;
 import org.testng.annotations.BeforeClass;
 
 import com.ning.billing.account.AccountTestSuiteWithEmbeddedDB;
+import com.ning.billing.util.bus.DefaultBusService;
+import com.ning.billing.util.bus.InMemoryInternalBus;
 import com.ning.billing.util.callcontext.InternalCallContextFactory;
 import com.ning.billing.util.clock.ClockMock;
-import com.ning.billing.util.clock.DefaultClock;
-import com.ning.billing.util.svcsapi.bus.InternalBus;
 import com.ning.billing.util.svcsapi.bus.BusService;
-import com.ning.billing.util.bus.DefaultBusService;
-import com.ning.billing.util.bus.InMemoryInternalBus;
+import com.ning.billing.util.svcsapi.bus.InternalBus;
 import com.ning.billing.util.tag.api.user.TagEventBuilder;
 
 import static org.testng.Assert.fail;

diff --git a/account/src/test/java/com/ning/billing/account/dao/TestAccountDao.java b/account/src/test/java/com/ning/billing/account/dao/TestAccountDao.java
index 05168f9..e69f69a 100644
--- a/account/src/test/java/com/ning/billing/account/dao/TestAccountDao.java
+++ b/account/src/test/java/com/ning/billing/account/dao/TestAccountDao.java
@@ -144,7 +144,7 @@ public class TestAccountDao extends AccountDaoTestBase {
     }
 
     @Test(groups = "slow")
-    public void testCustomFields() throws  CustomFieldApiException {
+    public void testCustomFields() throws CustomFieldApiException {
         final String fieldName = "testField1";
         final String fieldValue = "testField1_value";
 
@@ -170,7 +170,6 @@ public class TestAccountDao extends AccountDaoTestBase {
 
         final TagDao tagDao = new AuditedTagDao(dbi, tagEventBuilder, bus, new DefaultClock());
 
-
         final TagDefinition tagDefinition = tagDefinitionDao.getById(definition.getId().toString(), internalCallContext);
         final Tag tag = tagDefinition.isControlTag() ? new DefaultControlTag(ControlTagType.getTypeFromId(tagDefinition.getId()), ObjectType.ACCOUNT, account.getId(), internalCallContext.getCreatedDate()) :
                         new DescriptiveTag(tagDefinition.getId(), ObjectType.ACCOUNT, account.getId(), internalCallContext.getCreatedDate());

diff --git a/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java b/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
index 5db6b80..226f505 100644
--- a/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
+++ b/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
@@ -25,6 +25,7 @@ import com.ning.billing.mock.glue.MockClockModule;
 import com.ning.billing.util.glue.CallContextModule;
 
 public class AccountModuleWithMocks extends DefaultAccountModule {
+
     @Override
     protected void installAccountDao() {
         bind(MockAccountDao.class).asEagerSingleton();