github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2346 - Rename Database.getMetaInfoManager() to metaInfo() with deprecation

Browse Source
This commit is contained in:
Rob Bygrave
2021-09-02 22:58:09 +12:00
parent 4557bdfa6f
commit 7fba9adc43
13 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/test/java/io/ebean/BaseTestCase.java
+2 -2
View File
@@ -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<MetaTimedMetric> visitTimedMetrics() {
ebean-core/src/test/java/io/ebean/DtoQuery2Test.java
+2 -2
View File
@@ -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<MetaQueryMetric> 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);
ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java
+2 -2
View File
@@ -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);
}
ebean-core/src/test/java/io/ebean/DtoQueryTest.java
+2 -2
View File
@@ -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<MetaQueryMetric> 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);
ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+1 -1
View File
@@ -358,7 +358,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
}
@Override
public MetaInfoManager getMetaInfoManager() {
public MetaInfoManager metaInfo() {
return null;
}
ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+10 -10
View File
@@ -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<MetaQueryPlan> plans = server().getMetaInfoManager().queryPlanInit(init0);
final List<MetaQueryPlan> 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<MetaQueryPlan> appliedToPlans = server().getMetaInfoManager().queryPlanInit(init);
final List<MetaQueryPlan> 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<MetaQueryMetric> 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<MetaQueryPlan> plans0 = server().getMetaInfoManager().queryPlanCollectNow(request);
List<MetaQueryPlan> 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);