From 7fba9adc433ff1e105de0e647c9f4d71b0ce81a2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 2 Sep 2021 22:58:09 +1200 Subject: [PATCH] #2346 - Rename Database.getMetaInfoManager() to metaInfo() with deprecation --- .../src/main/java/io/ebean/Database.java | 10 +++++++++- .../server/core/DefaultServer.java | 2 +- .../server/core/DumpMetrics.java | 2 +- .../server/core/DumpMetricsData.java | 2 +- .../server/core/DumpMetricsJson.java | 4 ++-- .../src/test/java/io/ebean/BaseTestCase.java | 4 ++-- .../src/test/java/io/ebean/DtoQuery2Test.java | 4 ++-- .../java/io/ebean/DtoQueryFromOrmTest.java | 4 ++-- .../src/test/java/io/ebean/DtoQueryTest.java | 4 ++-- .../ebeaninternal/api/TDSpiEbeanServer.java | 2 +- .../query/finder/TestCustomerFinder.java | 20 +++++++++---------- .../src/test/java/io/ebean/BaseTestCase.java | 4 ++-- .../java/org/integration/ClusterTest.java | 6 +++--- 13 files changed, 38 insertions(+), 30 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index eb68f06d9..1adacc8e1 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -187,7 +187,15 @@ public interface Database { * Return the MetaInfoManager which is used to get meta data from the Database * such as query execution statistics. */ - MetaInfoManager getMetaInfoManager(); + MetaInfoManager metaInfo(); + + /** + * Deprecated migrate to metaInfo(). + */ + @Deprecated + default MetaInfoManager getMetaInfoManager() { + return metaInfo(); + } /** * Return the platform used for this database instance. 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 b2d4268b2..2b588655b 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 @@ -325,7 +325,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public MetaInfoManager getMetaInfoManager() { + public MetaInfoManager metaInfo() { return metaInfoManager; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java index b1f66f7ef..73ad97f2c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java @@ -74,7 +74,7 @@ final class DumpMetrics { void dump() { out("-- Dumping metrics for " + server.name() + " -- "); - ServerMetrics serverMetrics = server.getMetaInfoManager().collectMetrics(); + ServerMetrics serverMetrics = server.metaInfo().collectMetrics(); for (MetaTimedMetric metric : serverMetrics.timedMetrics()) { log(metric); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java index 712521ce0..ef006949f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java @@ -24,7 +24,7 @@ final class DumpMetricsData { } List data() { - collect(database.getMetaInfoManager().collectMetrics()); + collect(database.metaInfo().collectMetrics()); return list; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java index 3358a709a..0b96dcbd9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java @@ -66,14 +66,14 @@ final class DumpMetricsJson implements ServerMetricsAsJson { @Override public String json() { writer = new StringWriter(); - collect(database.getMetaInfoManager().collectMetrics()); + collect(database.metaInfo().collectMetrics()); return writer.toString(); } @Override public void write(Appendable buffer) { writer = buffer; - collect(database.getMetaInfoManager().collectMetrics()); + collect(database.metaInfo().collectMetrics()); } private void collect(ServerMetrics serverMetrics) { diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index 988e73b59..f771d7ab1 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java @@ -82,11 +82,11 @@ public abstract class BaseTestCase { } protected void resetAllMetrics() { - server().getMetaInfoManager().resetAllMetrics(); + server().metaInfo().resetAllMetrics(); } protected ServerMetrics collectMetrics() { - return server().getMetaInfoManager().collectMetrics(); + return server().metaInfo().collectMetrics(); } protected List visitTimedMetrics() { diff --git a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java index 625cc9ae9..4d37aaf57 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java +++ b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java @@ -189,7 +189,7 @@ public class DtoQuery2Test extends BaseTestCase { // collect without reset BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true); - server().getMetaInfoManager().visitMetrics(basic); + server().metaInfo().visitMetrics(basic); List stats = basic.queryMetrics(); assertThat(stats).hasSize(1); @@ -205,7 +205,7 @@ public class DtoQuery2Test extends BaseTestCase { .setParameter("name", "rob") .findList(); - BasicMetricVisitor metric2 = server().getMetaInfoManager().visitBasic(); + BasicMetricVisitor metric2 = server().metaInfo().visitBasic(); stats = metric2.queryMetrics(); assertThat(stats).hasSize(2); diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java index 28b0bd490..db9e85aa9 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java +++ b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java @@ -21,12 +21,12 @@ public class DtoQueryFromOrmTest extends BaseTestCase { @BeforeClass public static void resetStats() { - DB.getDefault().getMetaInfoManager().resetAllMetrics(); + DB.getDefault().metaInfo().resetAllMetrics(); } @AfterClass public static void reportStats() { - ServerMetrics metrics = DB.getDefault().getMetaInfoManager().collectMetrics(); + ServerMetrics metrics = DB.getDefault().metaInfo().collectMetrics(); for (MetaQueryMetric metric : metrics.queryMetrics()) { System.out.println(metric); } diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java index 0331a8215..f9e5406e1 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java +++ b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java @@ -281,7 +281,7 @@ public class DtoQueryTest extends BaseTestCase { // collect without reset BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true); - server().getMetaInfoManager().visitMetrics(basic); + server().metaInfo().visitMetrics(basic); List stats = basic.queryMetrics(); assertThat(stats).hasSize(1); @@ -297,7 +297,7 @@ public class DtoQueryTest extends BaseTestCase { .setParameter("name", "rob") .findList(); - ServerMetrics metric2 = server().getMetaInfoManager().collectMetrics(); + ServerMetrics metric2 = server().metaInfo().collectMetrics(); stats = metric2.queryMetrics(); assertThat(stats).hasSize(2); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index 6131b5df1..8963bfa5b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -358,7 +358,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } @Override - public MetaInfoManager getMetaInfoManager() { + public MetaInfoManager metaInfo() { return null; } diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 68b5c627a..04b0e755d 100644 --- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -31,7 +31,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); StringBuilder buffer0 = new StringBuilder(); - DB.getDefault().getMetaInfoManager() + DB.getDefault().metaInfo() .collectMetricsAsJson() .withHeader(false) .write(buffer0); @@ -45,7 +45,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); StringBuilder buffer1 = new StringBuilder(); - DB.getDefault().getMetaInfoManager() + DB.getDefault().metaInfo() .collectMetricsAsJson() .withHeader(false) .write(buffer1); @@ -177,7 +177,7 @@ public class TestCustomerFinder extends BaseTestCase { QueryPlanInit init0 = new QueryPlanInit(); init0.setAll(true); init0.thresholdMicros(2); - final List plans = server().getMetaInfoManager().queryPlanInit(init0); + final List plans = server().metaInfo().queryPlanInit(init0); assertThat(plans.size()).isGreaterThan(1); // the server has some plans @@ -187,13 +187,13 @@ public class TestCustomerFinder extends BaseTestCase { QueryPlanInit init = new QueryPlanInit(); init.setAll(true); init.thresholdMicros(1); - final List appliedToPlans = server().getMetaInfoManager().queryPlanInit(init); + final List appliedToPlans = server().metaInfo().queryPlanInit(init); assertThat(appliedToPlans.size()).isGreaterThan(4); // run queries again runQueries(); - ServerMetrics metrics = DB.getDefault().getMetaInfoManager().collectMetrics(); + ServerMetrics metrics = DB.getDefault().metaInfo().collectMetrics(); List planStats = metrics.queryMetrics(); assertThat(planStats.size()).isGreaterThan(4); @@ -212,7 +212,7 @@ public class TestCustomerFinder extends BaseTestCase { request.maxCount(1_000); // don't collect any more plans if used 10 secs request.maxTimeMillis(10_000); - List plans0 = server().getMetaInfoManager().queryPlanCollectNow(request); + List plans0 = server().metaInfo().queryPlanCollectNow(request); assertThat(plans0).isNotEmpty(); for (MetaQueryPlan plan : plans) { @@ -232,7 +232,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); - String metricsJson = server().getMetaInfoManager() + String metricsJson = server().metaInfo() .collectMetricsAsJson() .withHash(true) .withExtraAttributes(true) @@ -256,7 +256,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); - String metricsJson = server().getMetaInfoManager() + String metricsJson = server().metaInfo() .collectMetricsAsJson() .withHash(false) .withExtraAttributes(false) @@ -279,7 +279,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); StringBuilder buffer = new StringBuilder(); - server().getMetaInfoManager() + server().metaInfo() .collectMetricsAsJson() .withHeader(false) .write(buffer); @@ -297,7 +297,7 @@ public class TestCustomerFinder extends BaseTestCase { runQueries(); StringBuilder buffer = new StringBuilder(); - server().getMetaInfoManager() + server().metaInfo() .collectMetricsAsJson() .withHeader(true) .write(buffer); 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 4c0410ff3..568664de2 100644 --- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java @@ -78,11 +78,11 @@ public abstract class BaseTestCase { } protected void resetAllMetrics() { - server().getMetaInfoManager().resetAllMetrics(); + server().metaInfo().resetAllMetrics(); } protected ServerMetrics collectMetrics() { - return server().getMetaInfoManager().collectMetrics(); + return server().metaInfo().collectMetrics(); } protected List visitTimedMetrics() { diff --git a/ebean-redis/src/test/java/org/integration/ClusterTest.java b/ebean-redis/src/test/java/org/integration/ClusterTest.java index 57e4568d7..9ae04139e 100644 --- a/ebean-redis/src/test/java/org/integration/ClusterTest.java +++ b/ebean-redis/src/test/java/org/integration/ClusterTest.java @@ -40,8 +40,8 @@ public class ClusterTest { foo.save(); DB.getServerCacheManager().clearAll(); - DB.getDefault().getMetaInfoManager().resetAllMetrics(); - other.getMetaInfoManager().resetAllMetrics(); + DB.getDefault().metaInfo().resetAllMetrics(); + other.metaInfo().resetAllMetrics(); Person fooA = DB.find(Person.class, foo.getId()); Person fooB = other.find(Person.class, foo.getId()); @@ -70,7 +70,7 @@ public class ClusterTest { } other.getServerCacheManager().clearAll(); - other.getMetaInfoManager().resetAllMetrics(); + other.metaInfo().resetAllMetrics(); DuelCache dualCache = (DuelCache) other.getServerCacheManager().getBeanCache(Person.class);