[#noissue] Remove unnecessary generic type

pinpoint-apm · May 17, 2022 · 566d77c · 566d77c
1 parent 131da94
commit 566d77c
Show file tree

Hide file tree

Showing 38 changed files with 653 additions and 506 deletions.
diff --git a/...ava/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/JoinEncodingStrategy.java b/...ava/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/JoinEncodingStrategy.java
@@ -26,7 +26,7 @@
 /**
  * @author Taejin Koo
  */
-public interface JoinEncodingStrategy<T extends JoinFieldBo<? extends Number>> extends EncodingStrategy<T> {
+public interface JoinEncodingStrategy<T extends JoinFieldBo> extends EncodingStrategy<T> {
 
     byte[] getCodes();
 

diff --git a/...om/navercorp/pinpoint/common/server/bo/codec/stat/strategy/JoinFieldStrategyAnalyzer.java b/...om/navercorp/pinpoint/common/server/bo/codec/stat/strategy/JoinFieldStrategyAnalyzer.java
@@ -24,13 +24,13 @@
 /**
  * @author Taejin Koo
  */
-public interface JoinFieldStrategyAnalyzer<T extends JoinFieldBo<? extends Number>> {
+public interface JoinFieldStrategyAnalyzer<T extends JoinFieldBo> {
 
     EncodingStrategy<T> getBestStrategy();
 
     List<T> getValues();
 
-    interface JoinFieldStrategyAnalyzerBuilder<T extends JoinFieldBo<? extends Number>> {
+    interface JoinFieldStrategyAnalyzerBuilder<T extends JoinFieldBo> {
 
         JoinFieldStrategyAnalyzerBuilder<T> addValue(T value);
 

diff --git a/...navercorp/pinpoint/common/server/bo/codec/stat/strategy/JoinIntFieldEncodingStrategy.java b/...navercorp/pinpoint/common/server/bo/codec/stat/strategy/JoinIntFieldEncodingStrategy.java
@@ -18,7 +18,6 @@
 
 import com.navercorp.pinpoint.common.buffer.Buffer;
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategy;
-import com.navercorp.pinpoint.common.server.bo.stat.join.AbstractJoinFieldBo;
 import com.navercorp.pinpoint.common.server.bo.stat.join.JoinIntFieldBo;
 
 import java.util.ArrayList;
@@ -65,19 +64,19 @@ public byte[] getCodes() {
 
     @Override
     public void encodeValues(Buffer buffer, List<JoinIntFieldBo> values) {
-        final List<Integer> avgValues = mapping(values, AbstractJoinFieldBo::getAvg);
+        final List<Integer> avgValues = mapping(values, JoinIntFieldBo::getAvg);
         avgValueStrategy.encodeValues(buffer, avgValues);
 
-        final List<Integer> minValues = mapping(values, AbstractJoinFieldBo::getMin);
+        final List<Integer> minValues = mapping(values, JoinIntFieldBo::getMin);
         minValueStrategy.encodeValues(buffer, minValues);
 
-        final List<String> minAgentIds = mapping(values, AbstractJoinFieldBo::getMinAgentId);
+        final List<String> minAgentIds = mapping(values, JoinIntFieldBo::getMinAgentId);
         minAgentIdStrategy.encodeValues(buffer, minAgentIds);
 
-        final List<Integer> maxValues = mapping(values, AbstractJoinFieldBo::getMax);
+        final List<Integer> maxValues = mapping(values, JoinIntFieldBo::getMax);
         maxValueStrategy.encodeValues(buffer, maxValues);
 
-        final List<String> maxAgentIds = mapping(values, AbstractJoinFieldBo::getMaxAgentId);
+        final List<String> maxAgentIds = mapping(values, JoinIntFieldBo::getMaxAgentId);
         maxAgentIdStrategy.encodeValues(buffer, maxAgentIds);
     }
 

diff --git a/...avercorp/pinpoint/common/server/bo/codec/stat/strategy/JoinLongFieldEncodingStrategy.java b/...avercorp/pinpoint/common/server/bo/codec/stat/strategy/JoinLongFieldEncodingStrategy.java
@@ -18,7 +18,6 @@
 
 import com.navercorp.pinpoint.common.buffer.Buffer;
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategy;
-import com.navercorp.pinpoint.common.server.bo.stat.join.AbstractJoinFieldBo;
 import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo;
 
 import java.util.ArrayList;
@@ -66,19 +65,19 @@ public byte[] getCodes() {
 
     @Override
     public void encodeValues(Buffer buffer, List<JoinLongFieldBo> values) {
-        final List<Long> avgValues = mapping(values, AbstractJoinFieldBo::getAvg);
+        final List<Long> avgValues = mapping(values, JoinLongFieldBo::getAvg);
         avgValueStrategy.encodeValues(buffer, avgValues);
 
-        final List<Long> minValues = mapping(values, AbstractJoinFieldBo::getMin);
+        final List<Long> minValues = mapping(values, JoinLongFieldBo::getMin);
         minValueStrategy.encodeValues(buffer, minValues);
 
-        final List<String> minAgentIds = mapping(values, AbstractJoinFieldBo::getMinAgentId);
+        final List<String> minAgentIds = mapping(values, JoinLongFieldBo::getMinAgentId);
         minAgentIdStrategy.encodeValues(buffer, minAgentIds);
 
-        final List<Long> maxValues = mapping(values, AbstractJoinFieldBo::getMax);
+        final List<Long> maxValues = mapping(values, JoinLongFieldBo::getMax);
         maxValueStrategy.encodeValues(buffer, maxValues);
 
-        final List<String> maxAgentIds = mapping(values, AbstractJoinFieldBo::getMaxAgentId);
+        final List<String> maxAgentIds = mapping(values, JoinLongFieldBo::getMaxAgentId);
         maxAgentIdStrategy.encodeValues(buffer, maxAgentIds);
     }
 

diff --git a/.../src/main/java/com/navercorp/pinpoint/common/server/bo/stat/join/AbstractJoinFieldBo.java b/.../src/main/java/com/navercorp/pinpoint/common/server/bo/stat/join/AbstractJoinFieldBo.java
diff --git a/...er/src/main/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDoubleFieldBo.java b/...er/src/main/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDoubleFieldBo.java
@@ -22,22 +22,49 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 
 /**
  * @author Taejin Koo
  */
-public class JoinDoubleFieldBo extends AbstractJoinFieldBo<Double> {
+public class JoinDoubleFieldBo implements JoinFieldBo {
+
+    private final double avg;
+    private final double min;
+    private final String minAgentId;
+    private final double max;
+    private final String maxAgentId;
+
 
     private static final double UNCOLLECTED_VALUE = -1;
     static final JoinDoubleFieldBo UNCOLLECTED_FIELD_BO = new JoinDoubleFieldBo(UNCOLLECTED_VALUE, UNCOLLECTED_VALUE, JoinStatBo.UNKNOWN_AGENT, UNCOLLECTED_VALUE, JoinStatBo.UNKNOWN_AGENT);
 
-    public JoinDoubleFieldBo(Double avgValue, Double minValue, String minAgentId, Double maxValue, String maxAgentId) {
-        super(avgValue, minValue, minAgentId, maxValue, maxAgentId);
+    public JoinDoubleFieldBo(double avg, double min, String minAgentId, double max, String maxAgentId) {
+        this.avg = avg;
+        this.min = min;
+        this.minAgentId = Objects.requireNonNull(minAgentId, "minAgentId");
+        this.max = max;
+        this.maxAgentId = Objects.requireNonNull(maxAgentId, "maxAgentId");
     }
 
-    @Override
-    protected JoinFieldBo<Double> getUncollectedValue() {
-        return UNCOLLECTED_FIELD_BO;
+    public double getAvg() {
+        return avg;
+    }
+
+    public double getMin() {
+        return min;
+    }
+
+    public String getMinAgentId() {
+        return minAgentId;
+    }
+
+    public double getMax() {
+        return max;
+    }
+
+    public String getMaxAgentId() {
+        return maxAgentId;
     }
 
     public JoinLongFieldBo toLongFieldBo() {
@@ -54,14 +81,14 @@ protected static JoinDoubleFieldBo merge(List<JoinDoubleFieldBo> joinDoubleField
         }
 
         double avg = joinDoubleFieldBoList.stream()
-                .mapToDouble(JoinFieldBo::getAvg)
+                .mapToDouble(JoinDoubleFieldBo::getAvg)
                 .average()
                 .orElseThrow(NoSuchElementException::new);
         JoinDoubleFieldBo max = joinDoubleFieldBoList.stream()
-                .max(Comparator.comparing(JoinFieldBo::getMax))
+                .max(Comparator.comparing(JoinDoubleFieldBo::getMax))
                 .orElseThrow(NoSuchElementException::new);
         JoinDoubleFieldBo min = joinDoubleFieldBoList.stream()
-                .min(Comparator.comparing(JoinFieldBo::getMin))
+                .min(Comparator.comparing(JoinDoubleFieldBo::getMin))
                 .orElseThrow(NoSuchElementException::new);
 
         String maxAgentId = max.getMaxAgentId();
@@ -73,5 +100,44 @@ protected static JoinDoubleFieldBo merge(List<JoinDoubleFieldBo> joinDoubleField
         return new JoinDoubleFieldBo(avg, minValue, minAgentId, maxValue, maxAgentId);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        JoinDoubleFieldBo that = (JoinDoubleFieldBo) o;
+
+        if (Double.compare(that.avg, avg) != 0) return false;
+        if (Double.compare(that.min, min) != 0) return false;
+        if (Double.compare(that.max, max) != 0) return false;
+        if (!minAgentId.equals(that.minAgentId)) return false;
+        return maxAgentId.equals(that.maxAgentId);
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        temp = Double.doubleToLongBits(avg);
+        result = (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(min);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        result = 31 * result + minAgentId.hashCode();
+        temp = Double.doubleToLongBits(max);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        result = 31 * result + maxAgentId.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "JoinDoubleFieldBo{" +
+                "avg=" + avg +
+                ", min=" + min +
+                ", minAgentId='" + minAgentId + '\'' +
+                ", max=" + max +
+                ", maxAgentId='" + maxAgentId + '\'' +
+                '}';
+    }
 }
 
diff --git a/...s-server/src/main/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinFieldBo.java b/...s-server/src/main/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinFieldBo.java
@@ -19,16 +19,6 @@
 /**
  * @author Taejin Koo
  */
-public interface JoinFieldBo<V extends Number> {
-
-    V getAvg();
-
-    V getMin();
-
-    String getMinAgentId();
-
-    V getMax();
-
-    String getMaxAgentId();
+public interface JoinFieldBo {
 
 }