From 074c9eb940de8e26a6ca22592893e43f4ddc0a71 Mon Sep 17 00:00:00 2001 From: fgizaw Date: Tue, 28 Apr 2020 22:31:29 +0100 Subject: [PATCH] use appropriate fn for readability. (maybe) --- .../org/apache/kafka/common/metrics/stats/Histogram.java | 5 +---- .../org/apache/kafka/common/metrics/stats/SimpleRate.java | 2 +- .../kafka/common/utils/ImplicitLinkedHashCollection.java | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Histogram.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Histogram.java index af2b06407089c..b539d4eab0368 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/Histogram.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/Histogram.java @@ -156,10 +156,7 @@ public int toBin(double x) { if (binNumber < MIN_BIN_NUMBER) { return MIN_BIN_NUMBER; } - if (binNumber > maxBinNumber) { - return maxBinNumber; - } - return binNumber; + return Math.min(binNumber, maxBinNumber); } } diff --git a/clients/src/main/java/org/apache/kafka/common/metrics/stats/SimpleRate.java b/clients/src/main/java/org/apache/kafka/common/metrics/stats/SimpleRate.java index 69d44a8b2de22..931bd9c35e51f 100644 --- a/clients/src/main/java/org/apache/kafka/common/metrics/stats/SimpleRate.java +++ b/clients/src/main/java/org/apache/kafka/common/metrics/stats/SimpleRate.java @@ -34,6 +34,6 @@ public class SimpleRate extends Rate { public long windowSize(MetricConfig config, long now) { stat.purgeObsoleteSamples(config, now); long elapsed = now - stat.oldest(now).lastWindowMs; - return elapsed < config.timeWindowMs() ? config.timeWindowMs() : elapsed; + return Math.max(elapsed, config.timeWindowMs()); } } diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java index e8b9c66103b29..629fdc9dc6c43 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java @@ -371,10 +371,7 @@ private static int calculateCapacity(int expectedNumElements) { // Avoid using even-sized capacities, to get better key distribution. int newCapacity = (2 * expectedNumElements) + 1; // Don't use a capacity that is too small. - if (newCapacity < MIN_NONEMPTY_CAPACITY) { - return MIN_NONEMPTY_CAPACITY; - } - return newCapacity; + return Math.max(newCapacity, MIN_NONEMPTY_CAPACITY); } /**