[#8004] remove SystemMetricBasicGroupManager class, fix to failed test

pinpoint-apm · Nov 3, 2021 · e7d62a5 · e7d62a5
1 parent f0fe3d2
commit e7d62a5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 345 deletions.
diff --git a/...ic/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java b/...ic/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java
@@ -19,9 +19,9 @@
 import com.navercorp.pinpoint.metric.common.model.SystemMetric;
 import com.navercorp.pinpoint.metric.web.model.MetricDataSearchKey;
 import com.navercorp.pinpoint.metric.web.model.SystemMetricData;
-import com.navercorp.pinpoint.metric.web.service.SystemMetricBasicGroupManager;
 import com.navercorp.pinpoint.metric.web.service.SystemMetricDataService;
 import com.navercorp.pinpoint.metric.web.service.SystemMetricHostInfoService;
+import com.navercorp.pinpoint.metric.web.service.YMLSystemMetricBasicGroupManager;
 import com.navercorp.pinpoint.metric.web.util.QueryParameter;
 import com.navercorp.pinpoint.metric.web.util.TimePrecision;
 import com.navercorp.pinpoint.metric.web.util.Range;
@@ -47,13 +47,13 @@
 public class SystemMetricController {
     private final SystemMetricDataService systemMetricDataService;
     private final SystemMetricHostInfoService systemMetricHostInfoService;
-    private final SystemMetricBasicGroupManager systemMetricBasicGroupManager;
+    private final YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager;
 
     private final TimeWindowSampler DEFAULT_TIME_WINDOW_SAMPLER = new DefaultTimeWindowSampler(10000L);
 
     private final TagParser tagParser = new TagParser();
 
-    public SystemMetricController(SystemMetricDataService systemMetricDataService, SystemMetricHostInfoService systemMetricHostInfoService, SystemMetricBasicGroupManager systemMetricBasicGroupManager) {
+    public SystemMetricController(SystemMetricDataService systemMetricDataService, SystemMetricHostInfoService systemMetricHostInfoService, YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager) {
         this.systemMetricDataService = Objects.requireNonNull(systemMetricDataService, "systemMetricService");
         this.systemMetricHostInfoService = Objects.requireNonNull(systemMetricHostInfoService, "systemMetricHostInfoService");
         this.systemMetricBasicGroupManager = Objects.requireNonNull(systemMetricBasicGroupManager, "systemMetricBasicGroupManager");

diff --git a/...rc/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricBasicGroupManager.java b/...rc/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricBasicGroupManager.java
diff --git a/.../main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java b/.../main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java
@@ -38,9 +38,9 @@
 public class SystemMetricHostInfoServiceImpl implements SystemMetricHostInfoService {
 
     private final SystemMetricHostInfoDao systemMetricHostInfoDao;
-    private final SystemMetricBasicGroupManager systemMetricBasicGroupManager;
+    private final YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager;
 
-    public SystemMetricHostInfoServiceImpl(SystemMetricHostInfoDao systemMetricHostInfoDao, SystemMetricBasicGroupManager systemMetricBasicGroupManager) {
+    public SystemMetricHostInfoServiceImpl(SystemMetricHostInfoDao systemMetricHostInfoDao, YMLSystemMetricBasicGroupManager systemMetricBasicGroupManager) {
         this.systemMetricHostInfoDao = systemMetricHostInfoDao;
         this.systemMetricBasicGroupManager = Objects.requireNonNull(systemMetricBasicGroupManager, "systemMetricBasicGroupManager");
     }