killbill-uncached

diff --git a/util/src/test/java/com/ning/billing/GuicyKillbillTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/GuicyKillbillTestSuiteWithEmbeddedDB.java
index fbd40aa..12cbf65 100644
--- a/util/src/test/java/com/ning/billing/GuicyKillbillTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/GuicyKillbillTestSuiteWithEmbeddedDB.java
@@ -50,7 +50,7 @@ public class GuicyKillbillTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuite
     public void beforeMethod() throws Exception {
         try {
             DBTestingHelper.get().cleanupAllTables();
-        } catch (Exception ignored) {
+        } catch (final Exception ignored) {
         }
     }
 
@@ -66,7 +66,7 @@ public class GuicyKillbillTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuite
 
         try {
             DBTestingHelper.get().stop();
-        } catch (Exception ignored) {
+        } catch (final Exception ignored) {
         }
     }
 }

diff --git a/util/src/test/java/com/ning/billing/GuicyKillbillTestWithEmbeddedDBModule.java b/util/src/test/java/com/ning/billing/GuicyKillbillTestWithEmbeddedDBModule.java
index 43810bd..4575117 100644
--- a/util/src/test/java/com/ning/billing/GuicyKillbillTestWithEmbeddedDBModule.java
+++ b/util/src/test/java/com/ning/billing/GuicyKillbillTestWithEmbeddedDBModule.java
@@ -37,7 +37,7 @@ public class GuicyKillbillTestWithEmbeddedDBModule extends GuicyKillbillTestModu
         try {
             bind(DataSource.class).toInstance(DBTestingHelper.get().getDataSource());
             bind(IDBI.class).toInstance(DBTestingHelper.getDBI());
-        } catch (IOException e) {
+        } catch (final IOException e) {
             Assert.fail(e.toString());
         }
     }

diff --git a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
index 5df635a..c0d79e9 100644
--- a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
@@ -40,7 +40,7 @@ public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
     public void cleanupTablesBetweenMethods() {
         try {
             DBTestingHelper.get().cleanupAllTables();
-        } catch (Exception ignored) {
+        } catch (final Exception ignored) {
         }
     }
 
@@ -56,7 +56,7 @@ public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
 
         try {
             DBTestingHelper.get().stop();
-        } catch (Exception ignored) {
+        } catch (final Exception ignored) {
         }
     }
 }

diff --git a/util/src/test/java/com/ning/billing/util/cache/TestCache.java b/util/src/test/java/com/ning/billing/util/cache/TestCache.java
index f1c4570..dba32b3 100644
--- a/util/src/test/java/com/ning/billing/util/cache/TestCache.java
+++ b/util/src/test/java/com/ning/billing/util/cache/TestCache.java
@@ -33,8 +33,7 @@ import com.ning.billing.util.tag.dao.TagSqlDao;
 
 public class TestCache extends UtilTestSuiteWithEmbeddedDB {
 
-    private  EntitySqlDaoTransactionalJdbiWrapper transactionalSqlDao;
-
+    private EntitySqlDaoTransactionalJdbiWrapper transactionalSqlDao;
 
     private void insertTag(final TagModelDao modelDao) {
         transactionalSqlDao.execute(new EntitySqlDaoTransactionWrapper<Void>() {
@@ -60,7 +59,7 @@ public class TestCache extends UtilTestSuiteWithEmbeddedDB {
         return cache != null ? cache.size() : 0;
     }
 
-    private Long retrieveRecordIdFromCache(UUID tagId) {
+    private Long retrieveRecordIdFromCache(final UUID tagId) {
         final CacheController<Object, Object> cache = controlCacheDispatcher.getCacheController(CacheType.RECORD_ID);
         Object result = null;
         if (cache != null) {
@@ -72,7 +71,6 @@ public class TestCache extends UtilTestSuiteWithEmbeddedDB {
 
     @Test(groups = "slow")
     public void testCacheRecordId() throws Exception {
-
         this.transactionalSqlDao = new EntitySqlDaoTransactionalJdbiWrapper(dbi, clock, controlCacheDispatcher, nonEntityDao);
         final TagModelDao tag = new TagModelDao(clock.getUTCNow(), UUID.randomUUID(), UUID.randomUUID(), ObjectType.TAG);
 

diff --git a/util/src/test/java/com/ning/billing/util/dao/TestNonEntityDao.java b/util/src/test/java/com/ning/billing/util/dao/TestNonEntityDao.java
index efbe509..4bad609 100644
--- a/util/src/test/java/com/ning/billing/util/dao/TestNonEntityDao.java
+++ b/util/src/test/java/com/ning/billing/util/dao/TestNonEntityDao.java
@@ -33,20 +33,15 @@ public class TestNonEntityDao extends UtilTestSuiteWithEmbeddedDB {
     final Long tenantRecordId = 123123123L;
     final UUID tenantId = UUID.fromString("121c59d4-0458-4038-a683-698c9a121c12");
 
-
     final UUID accountId = UUID.fromString("a01c59d4-0458-4038-a683-698c9a121c69");
     final Long accountRecordId = 333333L;
 
-    final UUID accountHistoryId = UUID.fromString("2b1c59d4-0458-4038-a683-698c9a121c78");
-    final Long accountHistoryRecordId = 777777L;
-
     final UUID tagDefinitionId = UUID.fromString("e01c59d4-0458-4038-a683-698c9a121c34");
     final Long tagDefinitionRecordId = 44444444L;
 
     final UUID tagId = UUID.fromString("123c59d4-0458-4038-a683-698c9a121456");
     final Long tagRecordId = 55555555L;
 
-
     @Test(groups = "slow")
     public void testRetrieveRecordIdFromObject() throws IOException {
         insertAccount();
@@ -63,7 +58,6 @@ public class TestNonEntityDao extends UtilTestSuiteWithEmbeddedDB {
         Assert.assertEquals(resultAccountRecordId, accountRecordId);
     }
 
-
     @Test(groups = "slow")
     public void testRetrieveAccountRecordIdFromTagDefinitionObject() throws IOException {
         insertTagDefinition();
@@ -96,6 +90,7 @@ public class TestNonEntityDao extends UtilTestSuiteWithEmbeddedDB {
         final Long resultTenantRecordId = nonEntityDao.retrieveTenantRecordIdFromObject(tenantId, ObjectType.TENANT, null);
         Assert.assertEquals(resultTenantRecordId, tenantRecordId);
     }
+
     private void insertAccount() throws IOException {
         dbi.withHandle(new HandleCallback<Void>() {
             @Override
@@ -120,7 +115,6 @@ public class TestNonEntityDao extends UtilTestSuiteWithEmbeddedDB {
         });
     }
 
-
     private void insertTagDefinition() throws IOException {
         dbi.withHandle(new HandleCallback<Void>() {
             @Override

diff --git a/util/src/test/java/com/ning/billing/util/security/shiro/dao/TestJDBCSessionDao.java b/util/src/test/java/com/ning/billing/util/security/shiro/dao/TestJDBCSessionDao.java
index 1b13ce7..c4f8d3b 100644
--- a/util/src/test/java/com/ning/billing/util/security/shiro/dao/TestJDBCSessionDao.java
+++ b/util/src/test/java/com/ning/billing/util/security/shiro/dao/TestJDBCSessionDao.java
@@ -33,7 +33,7 @@ public class TestJDBCSessionDao extends UtilTestSuiteWithEmbeddedDB {
     @Test(groups = "slow")
     public void testCRUD() throws Exception {
         // Note! We are testing the do* methods here to bypass the caching layer
-        final JDBCSessionDao jdbcSessionDao = new JDBCSessionDao((DBI) dbi);
+        final JDBCSessionDao jdbcSessionDao = new JDBCSessionDao(dbi);
 
         // Retrieve
         final SimpleSession session = createSession();

diff --git a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
index 6d2fc68..4fd30cf 100644
--- a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
+++ b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
@@ -33,11 +33,9 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
 public class TestTagStore extends UtilTestSuiteWithEmbeddedDB {
 
-
     @Test(groups = "slow")
     public void testTagCreationAndRetrieval() throws TagApiException, TagDefinitionApiException {
         final UUID accountId = UUID.randomUUID();