Remove duplicated DTO types from org.ebean.monitor.api

Author: rob-bygrave

server/src/main/java/org/ebean/monitor/api/App.java

@@ -1,9 +1,9 @@
 package org.ebean.monitor.domain.finder;
 
 import io.ebean.Finder;
-import org.ebean.monitor.api.App;
 import org.ebean.monitor.domain.DApp;
 import org.ebean.monitor.domain.query.QDApp;
+import org.ebean.monitor.v1.model.App;
 
 import java.util.List;
 

server/src/main/java/org/ebean/monitor/api/AppMetric.java

@@ -1,7 +1,6 @@
 package org.ebean.monitor.domain.finder;
 
 import io.ebean.Finder;
-import org.ebean.monitor.api.AppMetric;
 import org.ebean.monitor.domain.DApp;
 import org.ebean.monitor.domain.DAppMetric;
 import org.ebean.monitor.domain.query.QDAppMetric;
@@ -20,14 +19,13 @@ public DAppMetricFinder() {
     super(DAppMetric.class);
   }
 
-  public List<AppMetric> byApp(DApp app) {
+  public List<DAppMetric> byApp(DApp app) {
     final QDAppMetric m = QDAppMetric.alias();
     return new QDAppMetric()
       .select(m.id, m.name, m.loc, m.sql)
       .app.eq(app)
       .name.desc()
       .setMaxRows(MAX_ROWS)
-      .asDto(AppMetric.class)
       .findList();
   }
 

server/src/main/java/org/ebean/monitor/api/Env.java

@@ -1,9 +1,9 @@
 package org.ebean.monitor.domain.finder;
 
 import io.ebean.Finder;
-import org.ebean.monitor.api.Env;
 import org.ebean.monitor.domain.DEnv;
 import org.ebean.monitor.domain.query.QDEnv;
+import org.ebean.monitor.v1.model.Env;
 
 import java.util.List;
 

server/src/main/java/org/ebean/monitor/domain/finder/DAppFinder.java

@@ -1,16 +1,8 @@
 [
-  {"name": "org.ebean.monitor.api.App", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
-  {"name": "org.ebean.monitor.api.AppDatabase", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
-  {"name": "org.ebean.monitor.api.AppMetric", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
-  {"name": "org.ebean.monitor.api.DataPoint", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
-  {"name": "org.ebean.monitor.api.Env", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
-  {"name": "org.ebean.monitor.api.ListResponse", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
   {"name": "org.ebean.monitor.api.MetricData", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
   {"name": "org.ebean.monitor.api.MetricDbData", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
   {"name": "org.ebean.monitor.api.MetricRequest", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
-  {"name": "org.ebean.monitor.api.PendingResponse", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
-  {"name": "org.ebean.monitor.api.QueryPlan", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
   {"name": "org.ebean.monitor.api.QueryPlanRequest", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
-  {"name": "org.ebean.monitor.api.QueryPlanSummary", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true}
+  {"name": "org.ebean.monitor.v1.model.App", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true},
+  {"name": "org.ebean.monitor.v1.model.Env", "allDeclaredConstructors": true, "allPublicMethods": true, "allDeclaredFields": true}
 ]
-

server/src/main/java/org/ebean/monitor/domain/finder/DAppMetricFinder.java

@@ -3,14 +3,13 @@
 import io.avaje.http.client.HttpClient;
 import io.avaje.inject.test.InjectTest;
 import jakarta.inject.Inject;
-import org.ebean.monitor.api.App;
-import org.ebean.monitor.api.AppMetric;
-import org.ebean.monitor.api.Env;
 import org.ebean.monitor.domain.DApp;
 import org.ebean.monitor.domain.DAppMetric;
 import org.ebean.monitor.domain.DEnv;
 import org.ebean.monitor.domain.DQueryPlan;
 import org.ebean.monitor.domain.query.QDQueryPlan;
+import org.ebean.monitor.v1.model.App;
+import org.ebean.monitor.v1.model.Env;
 import org.junit.jupiter.api.Test;
 
 import java.net.http.HttpResponse;
@@ -41,16 +40,16 @@ void ingest() throws InterruptedException {
       // allow queue consumer to process
       Thread.sleep(500);
 
-      var envNames = DEnv.find.findAll().stream().map(Env::getName).toList();
+      var envNames = DEnv.find.findAll().stream().map(Env::name).toList();
       assertThat(envNames).contains("dev1");
 
       var apps = DApp.find.findAll();
-      assertThat(apps).extracting(App::getName).contains("int1");
+      assertThat(apps).extracting(App::name).contains("int1");
       final App app1 = apps.getFirst();
 
-      var appMetrics = DAppMetric.find.byApp(DApp.find.ref(app1.getId()));
+      var appMetrics = DAppMetric.find.byApp(DApp.find.ref(app1.id()));
       assertThat(appMetrics)
-        .extracting(AppMetric::getName)
+        .extracting(DAppMetric::getName)
         .contains("OrderDao.findOrdersForPublishing");
 
       ingestQueryPlan();