#42: refactoring after review

Author: devromik

metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/PrefixLabelValuesMetricKey.java

@@ -3,7 +3,8 @@
 import com.ringcentral.platform.metrics.labels.LabelValues;
 import com.ringcentral.platform.metrics.names.MetricName;
 
-import static com.ringcentral.platform.metrics.utils.ObjectUtils.hashCodeFor;
+import java.util.Objects;
+
 import static com.ringcentral.platform.metrics.utils.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
@@ -33,7 +34,7 @@ public PrefixLabelValuesMetricKey(MetricName name, LabelValues labelValues) {
             "labelValues is null or empty");
 
         this.labelValues = labelValues;
-        this.hashCode = hashCodeFor(name, labelValues);
+        this.hashCode = Objects.hash(name, labelValues);
     }
 
     @Override

metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/histogram/Histogram.java

@@ -7,17 +7,13 @@
 import com.ringcentral.platform.metrics.scale.ScaleBuilder;
 
 import java.math.BigDecimal;
-import java.util.EnumMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import static com.ringcentral.platform.metrics.labels.LabelValues.NO_LABEL_VALUES;
 import static com.ringcentral.platform.metrics.measurables.MeasurableType.*;
 import static com.ringcentral.platform.metrics.scale.ExpScaleBuilder.expScale;
 import static com.ringcentral.platform.metrics.scale.LinearScaleBuilder.linearScale;
-import static com.ringcentral.platform.metrics.utils.ObjectUtils.hashCodeFor;
 import static com.ringcentral.platform.metrics.utils.Preconditions.checkArgument;
 import static com.ringcentral.platform.metrics.utils.TimeUnitUtils.convertTimeUnit;
 import static java.lang.Math.*;
@@ -155,7 +151,7 @@ public Percentile(double quantile) {
             String afterPoint = this.quantileAsString.substring(this.quantileAsString.indexOf(".") + 1);
             this.quantileDecimalPartAsString = afterPoint.length() > 1 ? afterPoint : afterPoint + "0";
             this.percentile = min(max(BigDecimal.valueOf(quantile).multiply(BIG_DECIMAL_100).doubleValue(), 0.0), 100.0);
-            this.hashCode = hashCodeFor("Histogram.Percentile", quantile);
+            this.hashCode = Objects.hash("Histogram.Percentile", quantile);
         }
 
         public static Percentile of(double quantile) {
@@ -335,7 +331,7 @@ public Bucket(double upperBoundInUnits, TimeUnit upperBoundUnit) {
                 BigDecimal.valueOf(upperBoundInUnits).multiply(
                     BigDecimal.valueOf(resolvedUpperBoundUnit.toNanos(1L)).multiply(BigDecimal.valueOf(0.000000001))).doubleValue()));
 
-            this.hashCode = hashCodeFor("Histogram.Bucket", upperBoundInUnits, resolvedUpperBoundUnit);
+            this.hashCode = Objects.hash("Histogram.Bucket", upperBoundInUnits, resolvedUpperBoundUnit);
         }
 
         static String upperBoundAsString(double b) {
@@ -512,7 +508,7 @@ public Buckets(Set<Bucket> buckets) {
                 "buckets is null or empty");
 
             this.buckets = buckets;
-            this.hashCode = hashCodeFor("Histogram.Buckets", buckets);
+            this.hashCode = Objects.hash("Histogram.Buckets", buckets);
         }
 
         public static Buckets linear(long from, long step, long stepCount) {

metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/labels/LabelValue.java

@@ -1,6 +1,5 @@
 package com.ringcentral.platform.metrics.labels;
 
-import static com.ringcentral.platform.metrics.utils.ObjectUtils.*;
 import static java.util.Objects.*;
 
 public class LabelValue {
@@ -12,7 +11,7 @@ public class LabelValue {
     public LabelValue(Label label, String value) {
         this.label = requireNonNull(label);
         this.value = requireNonNull(value);
-        this.hashCode = hashCodeFor(label, value);
+        this.hashCode = hash(label, value);
     }
 
     public Label label() {

metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/reporters/zabbix/ZAttribute.java

@@ -1,6 +1,5 @@
 package com.ringcentral.platform.metrics.reporters.zabbix;
 
-import static com.ringcentral.platform.metrics.utils.ObjectUtils.*;
 import static java.util.Objects.*;
 
 public class ZAttribute {
@@ -12,7 +11,7 @@ public class ZAttribute {
     public ZAttribute(String name, String value) {
         this.name = requireNonNull(name);
         this.value = requireNonNull(value);
-        this.hashCode = hashCodeFor(name, value);
+        this.hashCode = hash(name, value);
     }
 
     public String name() {

metrics-facade-base/src/main/java/com/ringcentral/platform/metrics/reporters/zabbix/ZEntity.java

@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import static com.ringcentral.platform.metrics.utils.ObjectUtils.*;
 import static java.util.Collections.*;
 import static java.util.Objects.*;
 
@@ -15,7 +14,7 @@ public class ZEntity {
     public ZEntity(String groupName, List<ZAttribute> attrs) {
         this.groupName = requireNonNull(groupName);
         this.attrs = attrs != null ? attrs : emptyList();
-        this.hashCode = hashCodeFor(groupName, this.attrs);
+        this.hashCode = hash(groupName, this.attrs);
     }
 
     public String groupName() {