From 12855458608ba8c5419be90d0d363a1ca51e5f13 Mon Sep 17 00:00:00 2001 From: "minwoo.jung" Date: Wed, 6 Oct 2021 10:58:43 +0900 Subject: [PATCH] [#8004] code cleanup --- .../SystemMetricHostInfoServiceImpl.java | 8 ++--- .../YMLSystemMetricBasicGroupManager.java | 30 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java index 5022ba792e13..3e38b778f7c3 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImpl.java @@ -78,19 +78,19 @@ public List 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 allMatchingTag(MetricTagCollection metricTagCollection, Field elementOfBasicGroup) { + private List allMatchingTag(MetricTagCollection metricTagCollection) { return metricTagCollection.getMetricTagList(); } - private List exactMatchingTag(MetricTagCollection metricTagCollection, Field elementOfBasicGroup) { + private List exactMatchingTag(MetricTagCollection metricTagCollection, Field field) { List metricTagList = metricTagCollection.getMetricTagList(); - List tagList = elementOfBasicGroup.getTags(); + List tagList = field.getTags(); List exactMetricTagList = new ArrayList<>(); for (MetricTag metricTag : metricTagList) { diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/YMLSystemMetricBasicGroupManager.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/YMLSystemMetricBasicGroupManager.java index 983625b4ba8e..fc46aea861c7 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/YMLSystemMetricBasicGroupManager.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/YMLSystemMetricBasicGroupManager.java @@ -85,17 +85,17 @@ public List apply(String metricId, List 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(); } @@ -103,26 +103,26 @@ public String findMetricName(String 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); }