[#11050] Remove duplicate code in TimeHistogramFormat

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/controller/FilteredMapController.java

@@ -153,18 +153,12 @@
                     limit, range.prettyToString(), DateTimeFormatUtils.format(lastScanTime));
         }
 
-        final FilterMapWrap mapWrap = new FilterMapWrap(map, getTimeHistogramFormat(useLoadHistogramFormat));
+        TimeHistogramFormat format = TimeHistogramFormat.format(useLoadHistogramFormat);
+        final FilterMapWrap mapWrap = new FilterMapWrap(map, format);
         mapWrap.setLastFetchedTimestamp(lastScanTime);
         return mapWrap;
     }
 
-    private static TimeHistogramFormat getTimeHistogramFormat(boolean useLoadHistogramFormat) {
-        if (useLoadHistogramFormat) {
-            return TimeHistogramFormat.V2;
-        } else {
-            return TimeHistogramFormat.V1;
-        }
-    }
 
     @GetMapping(value = "/getFilteredServerMapDataMadeOfDotGroupV3", params = "serviceTypeCode")
     public FilterMapWrap getFilteredServerMapDataMadeOfDotGroupV3(

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/controller/MapController.java

@@ -193,10 +193,8 @@
         logger.info("Select applicationMap. option={}", mapServiceOption);
         final ApplicationMap map = this.mapService.selectApplicationMap(mapServiceOption);
 
-        if (useLoadHistogramFormat) {
-            return new MapWrap(map, TimeHistogramFormat.V2);
-        }
-        return new MapWrap(map, TimeHistogramFormat.V1);
+        TimeHistogramFormat format = TimeHistogramFormat.format(useLoadHistogramFormat);
+        return new MapWrap(map, format);
     }
 
     @GetMapping(value = "/getResponseTimeHistogramData", params = "serviceTypeName")
@@ -242,18 +240,10 @@
                 .build();
         final NodeHistogramSummary nodeHistogramSummary = responseTimeHistogramService.selectNodeHistogramData(option);
 
-        TimeHistogramFormat format = histogramFormat(useLoadHistogramFormat);
-
+        TimeHistogramFormat format = TimeHistogramFormat.format(useLoadHistogramFormat);
         return new NodeHistogramSummaryView(nodeHistogramSummary, nodeHistogramSummary.getServerGroupList(), format);
     }
 
-    private TimeHistogramFormat histogramFormat(boolean useLoadHistogramFormat) {
-        if (useLoadHistogramFormat) {
-            return TimeHistogramFormat.V2;
-        } else {
-            return TimeHistogramFormat.V1;
-        }
-    }
 
     @GetMapping(value = "/getResponseTimeHistogramDataV2")
     public NodeHistogramSummaryView getResponseTimeHistogramDataV2(
@@ -297,7 +287,7 @@
 
         final NodeHistogramSummary nodeHistogramSummary = responseTimeHistogramService.selectNodeHistogramData(option);
 
-        final TimeHistogramFormat format = getTimeHistogramFormat(useLoadHistogramFormat);
+        final TimeHistogramFormat format = TimeHistogramFormat.format(useLoadHistogramFormat);
         return new NodeHistogramSummaryView(nodeHistogramSummary, nodeHistogramSummary.getServerGroupList(), format);
     }
 
@@ -344,17 +334,10 @@
         final LinkHistogramSummary linkHistogramSummary =
                 responseTimeHistogramService.selectLinkHistogramData(fromApplication, toApplication, range);
 
-        TimeHistogramFormat format = getTimeHistogramFormat(useLoadHistogramFormat);
+        TimeHistogramFormat format = TimeHistogramFormat.format(useLoadHistogramFormat);
         return new LinkHistogramSummaryView(linkHistogramSummary, format);
     }
 
-    private TimeHistogramFormat getTimeHistogramFormat(boolean useLoadHistogramFormat) {
-        if (useLoadHistogramFormat) {
-            return TimeHistogramFormat.V2;
-        }
-        return TimeHistogramFormat.V1;
-    }
-
     @Nullable
     private Application createApplication(@Nullable String name, Short serviceTypeCode) {
         if (name == null) {

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/TimeHistogramFormat.java

@@ -18,5 +18,12 @@
 
 public enum TimeHistogramFormat {
     V1, // key is slot("1s", "3s", "5s", "Slow", "Error"), value is {timestamp : count}
-    V2 // key is timestamp, value is [1s, 3s, 5s, Slow, Error, Avg, Max, Sum, Tot] - LoadHistogram
+    V2; // key is timestamp, value is [1s, 3s, 5s, Slow, Error, Avg, Max, Sum, Tot] - LoadHistogram
+
+    public static TimeHistogramFormat format(boolean useLoadHistogramFormat) {
+        if (useLoadHistogramFormat) {
+            return V2;
+        }
+        return V1;
+    }
 }

web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java

@@ -130,9 +130,8 @@
 
         final TransactionInfoViewModel result = newTransactionInfo(spanId, transactionId, spanResult, map, recordSet);
 
-        if (useLoadHistogramFormat) {
-            result.setTimeHistogramFormat(TimeHistogramFormat.V2);
-        }
+        TimeHistogramFormat format = TimeHistogramFormat.format(useLoadHistogramFormat);
+        result.setTimeHistogramFormat(format);
         return result;
     }