From aa53742a07d254a1c05486e49fea89690192d775 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 17:24:33 +1200 Subject: [PATCH] #2352 - Rename ServerCache methods with deprecation --- .../main/java/io/ebean/cache/ServerCache.java | 18 ++++- .../io/ebean/cache/ServerCacheManager.java | 65 ++++++++++++++++--- .../server/cache/DefaultCacheAdapter.java | 16 ++--- .../server/core/DefaultServer.java | 2 +- .../src/test/java/io/ebean/BaseTestCase.java | 2 +- .../ebean/cache/ServerCacheManagerTest.java | 28 ++++---- .../server/cache/DefaultServerCacheTest.java | 8 +-- .../DefaultServerCache_RunEvictionTest.java | 2 +- .../transaction/JdbcTransactionTest.java | 16 ++--- .../tests/basic/TestBeanReferenceRefresh.java | 2 +- .../org/tests/basic/TestQueryWithCache.java | 2 +- .../batchload/TestBatchLazyWithCacheHits.java | 8 +-- .../org/tests/batchload/TestQueryJoin.java | 2 +- .../java/org/tests/cache/TestBeanCache.java | 10 +-- .../tests/cache/TestBeanFetchJoinCache.java | 24 +++---- .../java/org/tests/cache/TestCacheBasic.java | 6 +- .../tests/cache/TestCacheCollectionIds.java | 10 +-- .../org/tests/cache/TestCacheNaturalId.java | 10 +-- .../tests/cache/TestExternalNotification.java | 2 +- .../cache/TestL2CacheWithSharedBean.java | 6 +- .../java/org/tests/cache/TestQueryCache.java | 2 +- .../tests/cache/TestQueryCacheCountry.java | 24 +++---- .../org/tests/cache/TestQueryCacheInsert.java | 6 +- .../cache/TestQueryCacheTableDependency.java | 10 +-- .../cache/personinfo/PersonCacheTests.java | 18 ++--- .../cache/TestInheritCacheRefLoad.java | 2 +- .../cache/TestCacheViaComplexNaturalKey.java | 12 ++-- .../cache/TestCacheViaComplexNaturalKey3.java | 12 ++-- .../basic/cache/TestCacheWithSoftDelete.java | 4 +- .../embedded/TestMultipleEmbeddedLoading.java | 8 +-- .../org/tests/readaudit/TestReadAudit.java | 16 ++--- .../src/test/java/io/ebean/BaseTestCase.java | 2 +- .../java/org/integration/ClusterTest.java | 6 +- 33 files changed, 212 insertions(+), 149 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java index 724b71531..1476e567d 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCache.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCache.java @@ -10,12 +10,10 @@ import java.util.Set; * Represents part of the "L2" server side cache. *

* This is used to cache beans or query results (bean collections). - *

*

* There are 2 ServerCache's for each bean type. One is used as the 'bean cache' * which holds beans of a given type. The other is the 'query cache' holding * query results for a given type. - *

*/ public interface ServerCache { @@ -75,6 +73,14 @@ public interface ServerCache { /** * Return the hit ratio the cache is currently getting. */ + default int hitRatio() { + return getHitRatio(); + } + + /** + * Deprecated migrate to hitRatio(). + */ + @Deprecated int getHitRatio(); /** @@ -82,6 +88,14 @@ public interface ServerCache { * * @param reset if true the statistics are reset. */ + default ServerCacheStatistics statistics(boolean reset) { + return getStatistics(reset); + } + + /** + * Deprecated migrate to statistics(). + */ + @Deprecated ServerCacheStatistics getStatistics(boolean reset); /** diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java index 82b85c956..67156a642 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java @@ -21,7 +21,15 @@ public interface ServerCacheManager { * rather than background processing. *

*/ - boolean isLocalL2Caching(); + boolean localL2Caching(); + + /** + * Deprecated migrate to localL2Caching(). + */ + @Deprecated + default boolean isLocalL2Caching() { + return localL2Caching(); + } /** * Return all the cache regions. @@ -36,37 +44,78 @@ public interface ServerCacheManager { * * @param regions A region name or comma delimited list of region names. */ - void setEnabledRegions(String regions); + void enabledRegions(String regions); + + /** + * Deprecated migrate to enabledRegions(). + */ + @Deprecated + default void setEnabledRegions(String regions) { + enabledRegions(regions); + } /** * Enable or disable all the cache regions. */ - void setAllRegionsEnabled(boolean enabled); + void allRegionsEnabled(boolean enabled); + + /** + * Deprecated migrate to allRegionsEnabled(). + */ + @Deprecated + default void setAllRegionsEnabled(boolean enabled) { + allRegionsEnabled(enabled); + } /** * Return the cache region by name. Typically, to enable or disable the region. */ - ServerCacheRegion getRegion(String name); + ServerCacheRegion region(String name); + + @Deprecated + default ServerCacheRegion getRegion(String name) { + return region(name); + } /** * Return the cache for mapping natural keys to id values. */ - ServerCache getNaturalKeyCache(Class beanType); + ServerCache naturalKeyCache(Class beanType); + + @Deprecated + default ServerCache getNaturalKeyCache(Class beanType) { + return naturalKeyCache(beanType); + } /** * Return the cache for beans of a particular type. */ - ServerCache getBeanCache(Class beanType); + ServerCache beanCache(Class beanType); + + @Deprecated + default ServerCache getBeanCache(Class beanType) { + return beanCache(beanType); + } /** * Return the cache for associated many properties of a bean type. */ - ServerCache getCollectionIdsCache(Class beanType, String propertyName); + ServerCache collectionIdsCache(Class beanType, String propertyName); + + @Deprecated + default ServerCache getCollectionIdsCache(Class beanType, String propertyName) { + return collectionIdsCache(beanType, propertyName); + } /** * Return the cache for query results of a particular type of bean. */ - ServerCache getQueryCache(Class beanType); + ServerCache queryCache(Class beanType); + + @Deprecated + default ServerCache getQueryCache(Class beanType) { + return queryCache(beanType); + } /** * This clears both the bean and query cache for a given type. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java index 413af049d..e9b3752d6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheAdapter.java @@ -27,7 +27,7 @@ public final class DefaultCacheAdapter implements ServerCacheManager { } @Override - public boolean isLocalL2Caching() { + public boolean localL2Caching() { return cacheManager.isLocalL2Caching(); } @@ -37,37 +37,37 @@ public final class DefaultCacheAdapter implements ServerCacheManager { } @Override - public void setEnabledRegions(String regions) { + public void enabledRegions(String regions) { cacheManager.setEnabledRegions(regions); } @Override - public ServerCacheRegion getRegion(String region) { + public ServerCacheRegion region(String region) { return cacheManager.getRegion(region); } @Override - public void setAllRegionsEnabled(boolean enabled) { + public void allRegionsEnabled(boolean enabled) { cacheManager.setAllRegionsEnabled(enabled); } @Override - public ServerCache getNaturalKeyCache(Class beanType) { + public ServerCache naturalKeyCache(Class beanType) { return cacheManager.getNaturalKeyCache(beanType); } @Override - public ServerCache getBeanCache(Class beanType) { + public ServerCache beanCache(Class beanType) { return cacheManager.getBeanCache(beanType); } @Override - public ServerCache getCollectionIdsCache(Class beanType, String propertyName) { + public ServerCache collectionIdsCache(Class beanType, String propertyName) { return cacheManager.getCollectionIdsCache(beanType, propertyName); } @Override - public ServerCache getQueryCache(Class beanType) { + public ServerCache queryCache(Class beanType) { return cacheManager.getQueryCache(beanType); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 469cc148f..e517b37ec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -381,7 +381,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (encryptKeyManager != null) { encryptKeyManager.initialise(); } - serverCacheManager.setEnabledRegions(config.getEnabledL2Regions()); + serverCacheManager.enabledRegions(config.getEnabledL2Regions()); } /** diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index dd3c949f9..e33900534 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -242,7 +242,7 @@ public abstract class BaseTestCase { } protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { - return server().cacheManager().getBeanCache(cls).getStatistics(reset); + return server().cacheManager().beanCache(cls).statistics(reset); } protected Platform platform() { diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java index beaa1b31f..977b38b42 100644 --- a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java +++ b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java @@ -18,28 +18,28 @@ public class ServerCacheManagerTest { assertTrue(region.isEnabled()); } - cacheManager.setEnabledRegions("r0,doesNotExist"); - assertThat(cacheManager.getRegion("email").isEnabled()).isFalse(); - assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue(); + cacheManager.enabledRegions("r0,doesNotExist"); + assertThat(cacheManager.region("email").isEnabled()).isFalse(); + assertThat(cacheManager.region("r0").isEnabled()).isTrue(); - cacheManager.setEnabledRegions("r0"); - assertThat(cacheManager.getRegion("email").isEnabled()).isFalse(); - assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue(); + cacheManager.enabledRegions("r0"); + assertThat(cacheManager.region("email").isEnabled()).isFalse(); + assertThat(cacheManager.region("r0").isEnabled()).isTrue(); - cacheManager.setEnabledRegions(null); - assertThat(cacheManager.getRegion("email").isEnabled()).isFalse(); - assertThat(cacheManager.getRegion("r0").isEnabled()).isTrue(); + cacheManager.enabledRegions(null); + assertThat(cacheManager.region("email").isEnabled()).isFalse(); + assertThat(cacheManager.region("r0").isEnabled()).isTrue(); - cacheManager.setEnabledRegions("email"); - assertThat(cacheManager.getRegion("email").isEnabled()).isTrue(); - assertThat(cacheManager.getRegion("r0").isEnabled()).isFalse(); + cacheManager.enabledRegions("email"); + assertThat(cacheManager.region("email").isEnabled()).isTrue(); + assertThat(cacheManager.region("r0").isEnabled()).isFalse(); - cacheManager.setAllRegionsEnabled(false); + cacheManager.allRegionsEnabled(false); for (ServerCacheRegion region : cacheManager.allRegions()) { assertFalse(region.isEnabled()); } - cacheManager.setAllRegionsEnabled(true); + cacheManager.allRegionsEnabled(true); for (ServerCacheRegion region : cacheManager.allRegions()) { assertTrue(region.isEnabled()); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java index e86a4cea0..9bf023c6e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java @@ -26,20 +26,20 @@ public class DefaultServerCacheTest { public void testGetHitRatio() { DefaultServerCache cache = createCache(); - assertEquals(0, cache.getHitRatio()); + assertEquals(0, cache.hitRatio()); assertEquals(0, cache.getHitCount()); assertEquals(0, cache.getMissCount()); cache.put("A", "A"); cache.get("A"); - assertEquals(100, cache.getHitRatio()); + assertEquals(100, cache.hitRatio()); assertEquals(1, cache.getHitCount()); assertEquals(0, cache.getMissCount()); cache.get("B"); - assertEquals(50, cache.getHitRatio()); + assertEquals(50, cache.hitRatio()); assertEquals(1, cache.getMissCount()); cache.get("B"); cache.get("B"); - assertEquals(25, cache.getHitRatio()); + assertEquals(25, cache.hitRatio()); assertEquals(3, cache.getMissCount()); assertEquals(1, cache.getHitCount()); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java index aa79cf71e..184783627 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java @@ -40,7 +40,7 @@ public class DefaultServerCache_RunEvictionTest { for (int i = 0; i < 15; i++) { doStuff(); cache.runEviction(); - ServerCacheStatistics statistics = cache.getStatistics(true); + ServerCacheStatistics statistics = cache.statistics(true); System.out.println(statistics); Thread.sleep(500); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java index ad5a4e1a6..ae7405354 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java @@ -44,18 +44,18 @@ public class JdbcTransactionTest { public void skipCacheAfterSave() { ServerCacheManager cacheManager = DB.getDefault().cacheManager(); - ServerCache customerBeanCache = cacheManager.getBeanCache(Customer.class); - ServerCache contactNatKeyCache = cacheManager.getNaturalKeyCache(Contact.class); + ServerCache customerBeanCache = cacheManager.beanCache(Customer.class); + ServerCache contactNatKeyCache = cacheManager.naturalKeyCache(Contact.class); try (Transaction transaction = DB.beginTransaction()) { - customerBeanCache.getStatistics(true); - contactNatKeyCache.getStatistics(true); + customerBeanCache.statistics(true); + contactNatKeyCache.statistics(true); Customer.find.byId(19898989); DB.find(Contact.class).where().eq("email", "junk@foo.com").findOne(); - assertThat(customerBeanCache.getStatistics(true).getMissCount()).isEqualTo(1); - assertThat(contactNatKeyCache.getStatistics(true).getMissCount()).isEqualTo(1); + assertThat(customerBeanCache.statistics(true).getMissCount()).isEqualTo(1); + assertThat(contactNatKeyCache.statistics(true).getMissCount()).isEqualTo(1); EBasic basic = new EBasic("b1"); DB.save(basic); @@ -64,8 +64,8 @@ public class JdbcTransactionTest { Customer.find.byId(29898989); DB.find(Contact.class).where().eq("email", "junk2@foo.com").findOne(); - assertThat(customerBeanCache.getStatistics(true).getMissCount()).isEqualTo(0); - assertThat(contactNatKeyCache.getStatistics(true).getMissCount()).isEqualTo(0); + assertThat(customerBeanCache.statistics(true).getMissCount()).isEqualTo(0); + assertThat(contactNatKeyCache.statistics(true).getMissCount()).isEqualTo(0); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 4827e46f0..d20ceb952 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -19,7 +19,7 @@ public class TestBeanReferenceRefresh extends BaseTestCase { ResetBasicData.reset(); - ServerCache beanCache = Ebean.getServerCacheManager().getBeanCache(Order.class); + ServerCache beanCache = Ebean.getServerCacheManager().beanCache(Order.class); beanCache.clear(); Order order = Ebean.getReference(Order.class, 1); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 06ef39bdf..914191cc9 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -33,7 +33,7 @@ public class TestQueryWithCache extends BaseTestCase { ServerCacheManager serverCacheManager = server.cacheManager(); serverCacheManager.clear(Country.class); - ServerCache beanCache = serverCacheManager.getBeanCache(Country.class); + ServerCache beanCache = serverCacheManager.beanCache(Country.class); assertEquals(0, beanCache.size()); Country nz1 = Ebean.getReference(Country.class, "NZ"); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 3d78cd137..4558594a5 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertNotNull; public class TestBatchLazyWithCacheHits extends BaseTestCase { - private final ServerCache beanCache = server().cacheManager().getBeanCache(UUOne.class); + private final ServerCache beanCache = server().cacheManager().beanCache(UUOne.class); private UUOne insert(String name) { UUOne one = new UUOne(); @@ -61,19 +61,19 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { platformAssertIn(sql.get(1), "from uuone t0 where t0.id"); // not lazy loading into bean cache - final ServerCacheStatistics stats = beanCache.getStatistics(true); + final ServerCacheStatistics stats = beanCache.statistics(true); assertThat(stats.getHitCount()).isEqualTo(10); assertThat(stats.getSize()).isEqualTo(10); } private void assertBeanCacheHits(int hits) { - ServerCacheStatistics statistics = beanCache.getStatistics(true); + ServerCacheStatistics statistics = beanCache.statistics(true); assertEquals(statistics.getHitCount(), hits); } private void clearCacheAndStatistics() { beanCache.clear(); - beanCache.getStatistics(true); + beanCache.statistics(true); } private List insertData() { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 71b5a4b4d..822f80a21 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -23,7 +23,7 @@ public class TestQueryJoin extends BaseTestCase { // Need to make sure the customer cache is cleared for the later // asserts on the lazy loading - ServerCache custCache = Ebean.getServerCacheManager().getBeanCache(Customer.class); + ServerCache custCache = Ebean.getServerCacheManager().beanCache(Customer.class); custCache.clear(); Query query = Ebean.find(Order.class).select("status") diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java index 280848b95..80ef3b99d 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java @@ -27,7 +27,7 @@ public class TestBeanCache extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestBeanCache.class); - private final ServerCache beanCache = DB.getDefault().cacheManager().getBeanCache(OCachedBean.class); + private final ServerCache beanCache = DB.getDefault().cacheManager().beanCache(OCachedBean.class); @Test public void findById_when_idTypeConverted() { @@ -61,7 +61,7 @@ public class TestBeanCache extends BaseTestCase { List ids = beans.stream().map(OCachedBean::getId).collect(Collectors.toList()); beanCache.clear(); - beanCache.getStatistics(true); + beanCache.statistics(true); try (Transaction transaction = DB.beginTransaction()) { // skipCacheAfterWrite set after this write ... @@ -77,7 +77,7 @@ public class TestBeanCache extends BaseTestCase { transaction.commit(); } - ServerCacheStatistics statistics = beanCache.getStatistics(true); + ServerCacheStatistics statistics = beanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(0); assertThat(statistics.getMissCount()).isEqualTo(2); assertThat(statistics.getPutCount()).isEqualTo(2); @@ -90,7 +90,7 @@ public class TestBeanCache extends BaseTestCase { List ids = beans.stream().map(OCachedBean::getId).collect(Collectors.toList()); beanCache.clear(); - beanCache.getStatistics(true); + beanCache.statistics(true); LoggedSqlCollector.start(); @@ -158,7 +158,7 @@ public class TestBeanCache extends BaseTestCase { } private void assertBeanCacheHitMiss(int hitCount, int missCount) { - ServerCacheStatistics statistics = beanCache.getStatistics(true); + ServerCacheStatistics statistics = beanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(hitCount); assertThat(statistics.getMissCount()).isEqualTo(missCount); } diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index c0d632abc..4144ca557 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -18,13 +18,13 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestBeanFetchJoinCache extends BaseTestCase { - private final ServerCache customerBeanCache = server().cacheManager().getBeanCache(Customer.class); + private final ServerCache customerBeanCache = server().cacheManager().beanCache(Customer.class); @Test public void fetchCache_when_allHits() { initDataClearCache(); loadCustomerBeanCache(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); LoggedSqlCollector.start(); @@ -35,7 +35,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { final List sql0 = LoggedSqlCollector.current(); assertThat(sql0).hasSize(1); - final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics = customerBeanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(2); assertThat(trimSql(sql0.get(0))).doesNotContain("t1.status"); @@ -64,7 +64,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { .where().lt("id", 2) .findList(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); LoggedSqlCollector.start(); @@ -77,7 +77,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(sql0.get(0)).contains(" from o_order "); assertThat(sql0.get(1)).contains(" from o_customer t0 where t0.id "); - final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics = customerBeanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(1); for (Order order : orders) { @@ -98,7 +98,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { .select("name") // not included status in bean cache .findList(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); LoggedSqlCollector.start(); @@ -112,7 +112,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { final List sql0 = LoggedSqlCollector.current(); assertThat(sql0).hasSize(1); - final ServerCacheStatistics statistics = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics = customerBeanCache.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(2); assertThat(trimSql(sql0.get(0))).doesNotContain("t1.status"); @@ -129,7 +129,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(sql1.get(0)).contains(" from o_customer t0 "); // assert we didn't hit the L2 bean cache the second time around - final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); assertThat(statistics1.getHitCount()).isGreaterThan(0); } @@ -141,7 +141,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { public void fetchGroup_fetchCache() { initDataClearCache(); loadCustomerBeanCache(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); List orders = DB.find(Order.class) .select(fgBasic) @@ -149,7 +149,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(orders).isNotEmpty(); - final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); assertThat(statistics1.getHitCount()).isEqualTo(2); } @@ -160,7 +160,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { @Test public void fetchGroup_fetchCache_partial() { initDataClearCache(); - customerBeanCache.getStatistics(true); + customerBeanCache.statistics(true); LoggedSqlCollector.start(); @@ -170,7 +170,7 @@ public class TestBeanFetchJoinCache extends BaseTestCase { assertThat(orders).isNotEmpty(); - final ServerCacheStatistics statistics1 = customerBeanCache.getStatistics(true); + final ServerCacheStatistics statistics1 = customerBeanCache.statistics(true); assertThat(statistics1.getMissCount()).isEqualTo(2); final List sql = LoggedSqlCollector.stop(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java index 390e3e4e4..20fa503c7 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java @@ -17,16 +17,16 @@ public class TestCacheBasic extends BaseTestCase { ResetBasicData.reset(); Ebean.getServerCacheManager().clear(Country.class); - ServerCache countryCache = Ebean.getServerCacheManager().getBeanCache(Country.class); + ServerCache countryCache = Ebean.getServerCacheManager().beanCache(Country.class); loadCountryCache(); Assert.assertTrue(countryCache.size() > 0); // reset the statistics - countryCache.getStatistics(true); + countryCache.statistics(true); Country c0 = Ebean.getReference(Country.class, "NZ"); - ServerCacheStatistics statistics = countryCache.getStatistics(false); + ServerCacheStatistics statistics = countryCache.statistics(false); long hc = statistics.getHitCount(); Assert.assertEquals(1, hc); Assert.assertNotNull(c0); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java index 5cff419c4..0fcef9cee 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -39,8 +39,8 @@ public class TestCacheCollectionIds extends BaseTestCase { ResetBasicData.reset(); awaitL2Cache(); - ServerCache custCache = cacheManager.getBeanCache(Customer.class); - ServerCache custManyIdsCache = cacheManager.getCollectionIdsCache(Customer.class, "contacts"); + ServerCache custCache = cacheManager.beanCache(Customer.class); + ServerCache custManyIdsCache = cacheManager.collectionIdsCache(Customer.class, "contacts"); // cacheManager.setCaching(Customer.class, true); // cacheManager.setCaching(Contact.class, true); @@ -121,7 +121,7 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); dummyToLoad.getCountries().size(); - ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries"); + ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId()); // confirm the starting data and cache entry @@ -249,7 +249,7 @@ public class TestCacheCollectionIds extends BaseTestCase { OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); dummyToLoad.getCountries().size(); - ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries"); + ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId()); // confirm the starting data and cache entry @@ -293,7 +293,7 @@ public class TestCacheCollectionIds extends BaseTestCase { Ebean.save(cachedBean); // clear the cache - ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries"); + ServerCache cachedBeanCountriesCache = cacheManager.collectionIdsCache(OCachedBean.class, "countries"); cachedBeanCountriesCache.clear(); assertEquals(0, cachedBeanCountriesCache.size()); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java index 8e64c2327..608b481d7 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -22,7 +22,7 @@ public class TestCacheNaturalId extends BaseTestCase { ResetBasicData.reset(); - ServerCache contactCache = Ebean.getServerCacheManager().getBeanCache(Contact.class); + ServerCache contactCache = Ebean.getServerCacheManager().beanCache(Contact.class); List list = Ebean.find(Contact.class).setBeanCacheMode(CacheMode.PUT).findList(); @@ -36,15 +36,15 @@ public class TestCacheNaturalId extends BaseTestCase { } } - contactCache.getStatistics(true); + contactCache.statistics(true); Contact c0 = Ebean.find(Contact.class).where().eq("email", emailToSearch).findOne(); - ServerCacheStatistics stats0 = contactCache.getStatistics(false); + ServerCacheStatistics stats0 = contactCache.statistics(false); Contact c1 = Ebean.find(Contact.class).where().eq("email", emailToSearch).findOne(); - ServerCacheStatistics stats1 = contactCache.getStatistics(false); + ServerCacheStatistics stats1 = contactCache.statistics(false); assertNotNull(c0); assertNotNull(c1); @@ -59,7 +59,7 @@ public class TestCacheNaturalId extends BaseTestCase { Contact c2 = Ebean.find(Contact.class).where().eq("email", "mychangedemail@what.com") .findOne(); - ServerCacheStatistics stats2 = contactCache.getStatistics(false); + ServerCacheStatistics stats2 = contactCache.statistics(false); assertNotNull(c2); assertEquals(c2.getId(), c1.getId()); diff --git a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java index b55135f30..ef863dc65 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java @@ -21,7 +21,7 @@ public class TestExternalNotification extends BaseTestCase { loadCountryCache(); - ServerCache countryCache = Ebean.getServerCacheManager().getBeanCache(Country.class); + ServerCache countryCache = Ebean.getServerCacheManager().beanCache(Country.class); assertTrue(countryCache.size() > 0); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index cbc736cc5..7e02c995c 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -28,8 +28,8 @@ public class TestL2CacheWithSharedBean extends BaseTestCase { Ebean.save(f1); - ServerCache beanCache = Ebean.getServerCacheManager().getBeanCache(FeatureDescription.class); - beanCache.getStatistics(true); + ServerCache beanCache = Ebean.getServerCacheManager().beanCache(FeatureDescription.class); + beanCache.statistics(true); OrmQueryDetail tunedDetail = new OrmQueryDetail(); tunedDetail.select("name"); @@ -49,7 +49,7 @@ public class TestL2CacheWithSharedBean extends BaseTestCase { // load the cache FeatureDescription fetchOne = Ebean.find(FeatureDescription.class, f1.getId()); Assert.assertNotNull(fetchOne); - assertEquals(1, beanCache.getStatistics(false).getSize()); + assertEquals(1, beanCache.statistics(false).getSize()); FeatureDescription fetchTwo = Ebean.find(FeatureDescription.class, f1.getId()); FeatureDescription fetchThree = Ebean.find(FeatureDescription.class, f1.getId()); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index b8ce6d1d5..0c4dc2317 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -217,7 +217,7 @@ public class TestQueryCache extends BaseTestCase { ResetBasicData.reset(); - ServerCache customerCache = DB.getServerCacheManager().getQueryCache(Customer.class); + ServerCache customerCache = DB.getServerCacheManager().queryCache(Customer.class); customerCache.clear(); List list = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where() diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java index 28694eac3..6e442fa4f 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -20,13 +20,13 @@ import static org.junit.Assert.assertTrue; public class TestQueryCacheCountry extends BaseTestCase { private ServerCacheManager cacheManager = Ebean.getServerCacheManager(); - private ServerCache queryCache = cacheManager.getQueryCache(Country.class); - private ServerCache beanCache = cacheManager.getBeanCache(Country.class); + private ServerCache queryCache = cacheManager.queryCache(Country.class); + private ServerCache beanCache = cacheManager.beanCache(Country.class); private void clearCache() { queryCache.clear(); beanCache.clear(); - queryCache.getStatistics(true); + queryCache.statistics(true); } @@ -44,7 +44,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList0).isEmpty(); - ServerCacheStatistics queryStats = queryCache.getStatistics(false); + ServerCacheStatistics queryStats = queryCache.statistics(false); assertEquals(1, queryStats.getMissCount()); assertEquals(1, queryStats.getSize()); @@ -56,7 +56,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList1).isEmpty(); - ServerCacheStatistics queryStats1 = queryCache.getStatistics(false); + ServerCacheStatistics queryStats1 = queryCache.statistics(false); assertEquals(1, queryStats1.getMissCount()); assertEquals(1, queryStats1.getSize()); assertEquals(1, queryStats1.getHitCount()); @@ -83,7 +83,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList1.get(0).getName()).isEqualTo("Australia"); - ServerCacheStatistics queryStats1 = queryCache.getStatistics(false); + ServerCacheStatistics queryStats1 = queryCache.statistics(false); assertEquals(2, queryStats1.getMissCount()); assertEquals(2, queryStats1.getSize()); assertEquals(0, queryStats1.getHitCount()); // no hits yet @@ -97,7 +97,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList2.get(0).getName()).isEqualTo("New Zealand"); - ServerCacheStatistics queryStats2 = queryCache.getStatistics(false); + ServerCacheStatistics queryStats2 = queryCache.statistics(false); assertEquals(2, queryStats2.getMissCount()); assertEquals(2, queryStats2.getSize()); assertEquals(1, queryStats2.getHitCount()); // got a hit @@ -110,7 +110,7 @@ public class TestQueryCacheCountry extends BaseTestCase { assertThat(countryList3.get(0).getName()).isEqualTo("Australia"); - ServerCacheStatistics queryStats3 = queryCache.getStatistics(false); + ServerCacheStatistics queryStats3 = queryCache.statistics(false); assertEquals(2, queryStats3.getMissCount()); assertEquals(2, queryStats3.getSize()); assertEquals(2, queryStats3.getHitCount()); // got another hit @@ -124,14 +124,14 @@ public class TestQueryCacheCountry extends BaseTestCase { awaitL2Cache(); clearCache(); - assertEquals(0, queryCache.getStatistics(false).getSize()); + assertEquals(0, queryCache.statistics(false).getSize()); List countryList0 = Ebean.find(Country.class) .setUseQueryCache(true) .order().asc("name") .findList(); - assertEquals(1, queryCache.getStatistics(false).getSize()); + assertEquals(1, queryCache.statistics(false).getSize()); assertTrue(!countryList0.isEmpty()); List countryList1 = Ebean.find(Country.class) @@ -139,7 +139,7 @@ public class TestQueryCacheCountry extends BaseTestCase { .order().asc("name") .findList(); - ServerCacheStatistics statistics = queryCache.getStatistics(false); + ServerCacheStatistics statistics = queryCache.statistics(false); assertEquals(1, statistics.getSize()); assertEquals(1, statistics.getHitCount()); Assert.assertSame(countryList1, countryList0); @@ -149,7 +149,7 @@ public class TestQueryCacheCountry extends BaseTestCase { Ebean.save(nz); awaitL2Cache(); - statistics = queryCache.getStatistics(false); + statistics = queryCache.statistics(false); assertEquals(0, statistics.getSize()); List countryList2 = Ebean.find(Country.class) diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 3a5ca02ea..0b5517eb7 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -44,8 +44,8 @@ public class TestQueryCacheInsert extends BaseTestCase { Ebean.save(doda); - ServerCache queryCache = Ebean.getServerCacheManager().getQueryCache(EBasicVer.class); - queryCache.getStatistics(true); + ServerCache queryCache = Ebean.getServerCacheManager().queryCache(EBasicVer.class); + queryCache.statistics(true); Optional found0 = Ebean.find(EBasicVer.class) .where().eq("description", "OddButUniqueSillyExample") @@ -65,7 +65,7 @@ public class TestQueryCacheInsert extends BaseTestCase { } private void assertHitMiss(int hits, int miss, ServerCache queryCache) { - ServerCacheStatistics stats = queryCache.getStatistics(true); + ServerCacheStatistics stats = queryCache.statistics(true); assertEquals(hits, stats.getHitCount()); assertEquals(miss, stats.getMissCount()); } diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java index 4403aa885..46c910f83 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java @@ -25,7 +25,7 @@ public class TestQueryCacheTableDependency extends BaseTestCase { ResetBasicData.reset(); - ServerCache customerCache = Ebean.getServerCacheManager().getQueryCache(Customer.class); + ServerCache customerCache = Ebean.getServerCacheManager().queryCache(Customer.class); customerCache.clear(); List
addrs = Ebean.find(Address.class) @@ -138,8 +138,8 @@ public class TestQueryCacheTableDependency extends BaseTestCase { child.setName("bobby"); child.setBillingAddress(root); DB.save(child); - DB.getServerCacheManager().getQueryCache(Address.class).clear(); - DB.getServerCacheManager().getQueryCache(Customer.class).clear(); + DB.getServerCacheManager().queryCache(Address.class).clear(); + DB.getServerCacheManager().queryCache(Customer.class).clear(); // Test preparation finished, start the test Thread.sleep(10); @@ -169,8 +169,8 @@ public class TestQueryCacheTableDependency extends BaseTestCase { child.setName("testChild"); child.setRoot(root); DB.save(child); - DB.getServerCacheManager().getQueryCache(ECacheChild.class).clear(); - DB.getServerCacheManager().getQueryCache(ECacheRoot.class).clear(); + DB.getServerCacheManager().queryCache(ECacheChild.class).clear(); + DB.getServerCacheManager().queryCache(ECacheRoot.class).clear(); // Test preparation finished, start the test Thread.sleep(10); // we need this thread.sleep here, because on a fast machine, DB.save(child) and computing the diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java index d057edffd..a5d950009 100644 --- a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java +++ b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java @@ -21,10 +21,10 @@ public class PersonCacheTests { private final List ids = Arrays.asList("E001", "E002", "E003"); - private ServerCache beanCacheInfo = DB.getDefault().cacheManager().getBeanCache(PersonCacheInfo.class); - private ServerCache beanCacheEmail = DB.getDefault().cacheManager().getBeanCache(PersonCacheEmail.class); + private ServerCache beanCacheInfo = DB.getDefault().cacheManager().beanCache(PersonCacheInfo.class); + private ServerCache beanCacheEmail = DB.getDefault().cacheManager().beanCache(PersonCacheEmail.class); - private ServerCacheRegion region = DB.getDefault().cacheManager().getRegion("email"); + private ServerCacheRegion region = DB.getDefault().cacheManager().region("email"); private void insert(int id, String email) { @@ -56,7 +56,7 @@ public class PersonCacheTests { .setUseCache(true) .findList(); - beanCacheInfo.getStatistics(true); + beanCacheInfo.statistics(true); List emailList = DB.find(PersonCacheEmail.class) @@ -73,7 +73,7 @@ public class PersonCacheTests { List sql = LoggedSqlCollector.current(); assertThat(sql).hasSize(3); - assertThat(beanCacheInfo.getStatistics(true).getHitCount()).isEqualTo(3); + assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); // force cache misses on PersonCacheEmail beanCacheEmail.clear(); @@ -94,7 +94,7 @@ public class PersonCacheTests { sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); - assertThat(beanCacheInfo.getStatistics(true).getHitCount()).isEqualTo(3); + assertThat(beanCacheInfo.statistics(true).getHitCount()).isEqualTo(3); turnOffRegion_expect_noCacheUse(); @@ -103,7 +103,7 @@ public class PersonCacheTests { private void turnOffRegion_expect_noCacheUse() { assertTrue(region.isEnabled()); - beanCacheEmail.getStatistics(true); + beanCacheEmail.statistics(true); log.info("Disabled region ..."); region.setEnabled(false); @@ -116,7 +116,7 @@ public class PersonCacheTests { } // assert that we didn't hit the cache - ServerCacheStatistics statistics = beanCacheEmail.getStatistics(true); + ServerCacheStatistics statistics = beanCacheEmail.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(0); assertThat(statistics.getMissCount()).isEqualTo(0); @@ -131,7 +131,7 @@ public class PersonCacheTests { } // assert that we DID hit the cache - statistics = beanCacheEmail.getStatistics(true); + statistics = beanCacheEmail.statistics(true); assertThat(statistics.getHitCount()).isEqualTo(3); assertThat(statistics.getMissCount()).isEqualTo(0); } diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java index af6c1299d..3c88e598e 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java @@ -56,7 +56,7 @@ public class TestInheritCacheRefLoad { Class streetClassLazyLoaded = customerReloaded.getAddress().getStreet().getClass(); //Show Cache Hits - System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().cacheManager().getQueryCache(streetClassLazyLoaded).getStatistics(false).getHitCount()); + System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().cacheManager().queryCache(streetClassLazyLoaded).statistics(false).getHitCount()); return streetClassLazyLoaded; } diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index 7411b1842..bad02c0c4 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -21,8 +21,8 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestCacheViaComplexNaturalKey.class); - private ServerCache beanCache = cacheManager().getBeanCache(OCachedNatKeyBean.class); - private ServerCache natKeyCache = cacheManager().getNaturalKeyCache(OCachedNatKeyBean.class); + private ServerCache beanCache = cacheManager().beanCache(OCachedNatKeyBean.class); + private ServerCache natKeyCache = cacheManager().naturalKeyCache(OCachedNatKeyBean.class); private static boolean loadOnce; @@ -52,17 +52,17 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase { } private void clearStatistics() { - beanCache.getStatistics(true); - natKeyCache.getStatistics(true); + beanCache.statistics(true); + natKeyCache.statistics(true); } private void assertNaturalKeyHitMiss(int expectedHit, int expectedMiss) { - ServerCacheStatistics stats = natKeyCache.getStatistics(true); + ServerCacheStatistics stats = natKeyCache.statistics(true); assertHitMiss(expectedHit, expectedMiss, stats); } private void assertBeanCacheHitMiss(int expectedHit, int expectedMiss) { - ServerCacheStatistics stats = beanCache.getStatistics(true); + ServerCacheStatistics stats = beanCache.statistics(true); assertHitMiss(expectedHit, expectedMiss, stats); } diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index a94b77725..34175b77c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { - private ServerCache beanCache = cacheManager().getBeanCache(OCachedNatKeyBean3.class); - private ServerCache natKeyCache = cacheManager().getNaturalKeyCache(OCachedNatKeyBean3.class); + private ServerCache beanCache = cacheManager().beanCache(OCachedNatKeyBean3.class); + private ServerCache natKeyCache = cacheManager().naturalKeyCache(OCachedNatKeyBean3.class); private static boolean loadOnce; @@ -55,17 +55,17 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase { } private void clearStatistics() { - beanCache.getStatistics(true); - natKeyCache.getStatistics(true); + beanCache.statistics(true); + natKeyCache.statistics(true); } private void assertNaturalKeyHitMiss(int expectedHit, int expectedMiss) { - ServerCacheStatistics stats = natKeyCache.getStatistics(true); + ServerCacheStatistics stats = natKeyCache.statistics(true); assertHitMiss(expectedHit, expectedMiss, stats); } private void assertBeanCacheHitMiss(int expectedHit, int expectedMiss) { - ServerCacheStatistics stats = beanCache.getStatistics(true); + ServerCacheStatistics stats = beanCache.statistics(true); assertHitMiss(expectedHit, expectedMiss, stats); } diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index 321c50dc1..d96d49b17 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestCacheWithSoftDelete extends BaseTestCase { - private final ServerCache beanCache = DB.getServerCacheManager().getBeanCache(ESoftWithCache.class); + private final ServerCache beanCache = DB.getServerCacheManager().beanCache(ESoftWithCache.class); @Test public void idIn_expect_hitCache() { @@ -41,6 +41,6 @@ public class TestCacheWithSoftDelete extends BaseTestCase { } private ServerCacheStatistics stats() { - return beanCache.getStatistics(true); + return beanCache.statistics(true); } } diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 616d0b441..52fb10c60 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -80,15 +80,15 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { ServerCacheManager serverCacheManager = server.cacheManager(); // get cache, clear the cache and statistics - ServerCache beanCache = serverCacheManager.getBeanCache(EInvoice.class); + ServerCache beanCache = serverCacheManager.beanCache(EInvoice.class); beanCache.clear(); - beanCache.getStatistics(true); + beanCache.statistics(true); // fetch and load the cache EInvoice invoice4 = Ebean.find(EInvoice.class, invoice.getId()); assertNotNull(invoice4); - ServerCacheStatistics statistics = beanCache.getStatistics(false); + ServerCacheStatistics statistics = beanCache.statistics(false); assertEquals(1, statistics.getSize()); assertEquals(0, statistics.getHitCount()); @@ -97,7 +97,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { EInvoice invoice5 = Ebean.find(EInvoice.class, invoice.getId()); assertNotNull(invoice5); - statistics = beanCache.getStatistics(false); + statistics = beanCache.statistics(false); assertEquals(1, statistics.getSize()); assertEquals(1, statistics.getHitCount()); diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java index 2f202d83c..91ccb2b78 100644 --- a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -83,8 +83,8 @@ public class TestReadAudit extends BaseTestCase { public void test_findById_usingL2Cache() { resetCounters(); - ServerCache beanCache = server.cacheManager().getBeanCache(EBasicChangeLog.class); - beanCache.getStatistics(true); + ServerCache beanCache = server.cacheManager().beanCache(EBasicChangeLog.class); + beanCache.statistics(true); EBasicChangeLog found = server.find(EBasicChangeLog.class, id1); assertThat(found).isNotNull(); @@ -94,13 +94,13 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.beans.get(0).getBeanType()).isEqualTo(EBasicChangeLog.class.getName()); assertThat(readAuditLogger.beans.get(0).getId()).isEqualTo(id1); - ServerCacheStatistics statistics = beanCache.getStatistics(false); + ServerCacheStatistics statistics = beanCache.statistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(0); EBasicChangeLog found2 = server.find(EBasicChangeLog.class, id1); assertThat(found2).isNotNull(); - statistics = beanCache.getStatistics(false); + statistics = beanCache.statistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(1); @@ -111,8 +111,8 @@ public class TestReadAudit extends BaseTestCase { public void test_findById_usingL2Cache_sharedBean() { resetCounters(); - ServerCache beanCache = server.cacheManager().getBeanCache(Country.class); - beanCache.getStatistics(true); + ServerCache beanCache = server.cacheManager().beanCache(Country.class); + beanCache.statistics(true); Country found = server.find(Country.class, "AR"); assertThat(found).isNotNull(); @@ -122,13 +122,13 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.beans.get(0).getBeanType()).isEqualTo(Country.class.getName()); assertThat(readAuditLogger.beans.get(0).getId()).isEqualTo("AR"); - ServerCacheStatistics statistics = beanCache.getStatistics(false); + ServerCacheStatistics statistics = beanCache.statistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(0); Country found2 = server.find(Country.class, "AR"); assertThat(found2).isNotNull(); - statistics = beanCache.getStatistics(false); + statistics = beanCache.statistics(false); assertThat(statistics.getSize()).isEqualTo(1); assertThat(statistics.getHitCount()).isEqualTo(1); diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java index 93ca61c87..5b76d754f 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -238,7 +238,7 @@ public abstract class BaseTestCase { } protected ServerCacheStatistics getBeanCacheStats(Class cls, boolean reset) { - return server().cacheManager().getBeanCache(cls).getStatistics(reset); + return server().cacheManager().beanCache(cls).statistics(reset); } protected Platform platform() { diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index b1f134ca3..b895170f6 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -46,7 +46,7 @@ public class ClusterTest { Person fooA = DB.find(Person.class, foo.getId()); Person fooB = other.find(Person.class, foo.getId()); - DuelCache dualCacheA = (DuelCache) DB.getServerCacheManager().getBeanCache(Person.class); + DuelCache dualCacheA = (DuelCache) DB.getServerCacheManager().beanCache(Person.class); assertCounts(dualCacheA, 0, 1, 0, 1); fooA = DB.find(Person.class, foo.getId()); assertCounts(dualCacheA, 1, 1, 0, 1); @@ -54,7 +54,7 @@ public class ClusterTest { fooA = DB.find(Person.class, foo.getId()); assertCounts(dualCacheA, 2, 1, 0, 1); fooB = other.find(Person.class, foo.getId()); - DuelCache dualCacheB = (DuelCache) other.cacheManager().getBeanCache(Person.class); + DuelCache dualCacheB = (DuelCache) other.cacheManager().beanCache(Person.class); assertCounts(dualCacheB, 2, 1, 1, 0); } @@ -72,7 +72,7 @@ public class ClusterTest { other.cacheManager().clearAll(); other.metaInfo().resetAllMetrics(); - DuelCache dualCache = (DuelCache) other.cacheManager().getBeanCache(Person.class); + DuelCache dualCache = (DuelCache) other.cacheManager().beanCache(Person.class); Person foo0 = other.find(Person.class, 1); assertCounts(dualCache, 0, 1, 0, 1);