From 15de44eef8a1c1fd1e5b2a47ecdd014fe983033f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Jun 2023 19:35:03 +1200
Subject: [PATCH] Remove deprecated MetaInfoManager.collectMetricsAsJson() -
 move to collectMetrics().asJson()

Removing these deprecated methods:
- collectMetricsAsJson() -> collectMetrics().asJson();
- collectMetricsAsData() -> collectMetrics().asData()

```java
  /**
   * Deprecated migrate to collectMetrics().asJson().
   */
  @Deprecated
  default ServerMetricsAsJson collectMetricsAsJson() {
    return collectMetrics().asJson();
  }

  /**
   * Deprecated migrate to collectMetrics().asData().
   */
  @Deprecated
  default List<MetricData> collectMetricsAsData() {
    return collectMetrics().asData();
  }
```
---
 .../main/java/io/ebean/meta/MetaInfoManager.java | 16 ----------------
 .../tests/query/finder/TestCustomerFinder.java   | 12 ++++++------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java b/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java
index 81e7944f0..1052d495c 100644
--- a/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java
+++ b/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java
@@ -16,22 +16,6 @@ public interface MetaInfoManager {
    */
   ServerMetrics collectMetrics();
 
-  /**
-   * Deprecated migrate to collectMetrics().asJson().
-   */
-  @Deprecated
-  default ServerMetricsAsJson collectMetricsAsJson() {
-    return collectMetrics().asJson();
-  }
-
-  /**
-   * Deprecated migrate to collectMetrics().asData().
-   */
-  @Deprecated
-  default List<MetricData> collectMetricsAsData() {
-    return collectMetrics().asData();
-  }
-
   /**
    * Visit the metrics resetting and collecting/reporting as desired.
    */
diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 9722adf17..5da4bac4e 100644
--- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -28,7 +28,7 @@ public class TestCustomerFinder extends BaseTestCase {
 
     StringBuilder buffer0 = new StringBuilder();
     DB.getDefault().metaInfo()
-      .collectMetricsAsJson()
+      .collectMetrics().asJson()
       .withHeader(false)
       .write(buffer0);
 
@@ -42,7 +42,7 @@ public class TestCustomerFinder extends BaseTestCase {
 
     StringBuilder buffer1 = new StringBuilder();
     DB.getDefault().metaInfo()
-      .collectMetricsAsJson()
+      .collectMetrics().asJson()
       .withHeader(false)
       .write(buffer1);
 
@@ -230,7 +230,7 @@ public class TestCustomerFinder extends BaseTestCase {
     runQueries();
 
     String metricsJson = server().metaInfo()
-      .collectMetricsAsJson()
+      .collectMetrics().asJson()
       .withHash(true)
       .withExtraAttributes(true)
       .withNewLine(true)
@@ -254,7 +254,7 @@ public class TestCustomerFinder extends BaseTestCase {
     runQueries();
 
     String metricsJson = server().metaInfo()
-      .collectMetricsAsJson()
+      .collectMetrics().asJson()
       .withHash(false)
       .withExtraAttributes(false)
       .withNewLine(false)
@@ -277,7 +277,7 @@ public class TestCustomerFinder extends BaseTestCase {
 
     StringBuilder buffer = new StringBuilder();
     server().metaInfo()
-      .collectMetricsAsJson()
+      .collectMetrics().asJson()
       .withHeader(false)
       .write(buffer);
 
@@ -295,7 +295,7 @@ public class TestCustomerFinder extends BaseTestCase {
 
     StringBuilder buffer = new StringBuilder();
     server().metaInfo()
-      .collectMetricsAsJson()
+      .collectMetrics().asJson()
       .withHeader(true)
       .write(buffer);