[pinpoint-apm#8004] code cleanup

emeroad · Oct 6, 2021 · 1285545 · 1285545
1 parent 89326a8
commit 1285545
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/.../main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java b/.../main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java
@@ -78,19 +78,19 @@ public List<MetricTag> getTag(MetricDataSearchKey metricDataSearchKey, Field fie
             case EXACT :
                 return exactMatchingTag(metricTagCollection, field);
             case ALL :
-                return allMatchingTag(metricTagCollection, field);
+                return allMatchingTag(metricTagCollection);
             default :
                 throw new UnsupportedOperationException("unsupported matchingRule:" + matchingRule);
         }
     }
 
-    private List<MetricTag> allMatchingTag(MetricTagCollection metricTagCollection, Field elementOfBasicGroup) {
+    private List<MetricTag> allMatchingTag(MetricTagCollection metricTagCollection) {
         return metricTagCollection.getMetricTagList();
     }
 
-    private List<MetricTag> exactMatchingTag(MetricTagCollection metricTagCollection, Field elementOfBasicGroup) {
+    private List<MetricTag> exactMatchingTag(MetricTagCollection metricTagCollection, Field field) {
         List<MetricTag> metricTagList = metricTagCollection.getMetricTagList();
-        List<Tag> tagList = elementOfBasicGroup.getTags();
+        List<Tag> tagList = field.getTags();
         List<MetricTag> exactMetricTagList = new ArrayList<>();
 
         for (MetricTag metricTag : metricTagList) {

diff --git a/...main/java/com/navercorp/pinpoint/metric/web/service/YMLSystemMetricBasicGroupManager.java b/...main/java/com/navercorp/pinpoint/metric/web/service/YMLSystemMetricBasicGroupManager.java
@@ -85,44 +85,44 @@ public List<String> apply(String metricId, List<String> definitionIdList) {
     }
 
     public Metric findElementOfBasicGroup(String metricDefinitionId) {
-        Metric metrics = this.definitionIdMap.get(metricDefinitionId);
-        if (metrics != null) {
-            return metrics;
+        Metric metric = this.definitionIdMap.get(metricDefinitionId);
+        if (metric != null) {
+            return metric;
         }
         throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId);
     }
 
     public String findMetricName(String metricDefinitionId) {
-        Metric metrics = this.definitionIdMap.get(metricDefinitionId);
-        if (metrics != null) {
-            return metrics.getName();
+        Metric metric = this.definitionIdMap.get(metricDefinitionId);
+        if (metric != null) {
+            return metric.getName();
         }
 
 
         throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId);
     }
 
     public String findMetricTitle(String metricDefinitionId) {
-        Metric metrics = this.definitionIdMap.get(metricDefinitionId);
-        if (metrics != null) {
-            return metrics.getTitle();
+        Metric metric = this.definitionIdMap.get(metricDefinitionId);
+        if (metric != null) {
+            return metric.getTitle();
         }
 
         throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId);
     }
 
     public GroupingRule findGroupingRule(String metricDefinitionId) {
-        Metric metrics = this.definitionIdMap.get(metricDefinitionId);
-        if (metrics != null) {
-            return metrics.getGrouping();
+        Metric metric = this.definitionIdMap.get(metricDefinitionId);
+        if (metric != null) {
+            return metric.getGrouping();
         }
         throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId);
     }
 
     public String findUnit(String metricDefinitionId) {
-        Metric metrics = this.definitionIdMap.get(metricDefinitionId);
-        if (metrics != null) {
-            return metrics.getUnit();
+        Metric metric = this.definitionIdMap.get(metricDefinitionId);
+        if (metric != null) {
+            return metric.getUnit();
         }
         throw new UnsupportedOperationException("unsupported metric :" + metricDefinitionId);
     }