[#8757] Remove duplicate AgentStatDao from collector

collector/src/main/java/com/navercorp/pinpoint/collector/dao/AgentStatDaoV2.java → collector/src/main/java/com/navercorp/pinpoint/collector/dao/AgentStatDao.java

@@ -18,13 +18,15 @@
 
 import com.navercorp.pinpoint.common.server.bo.stat.AgentStatBo;
 import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 /**
  * @author HyunGil Jeong
  */
-public interface AgentStatDaoV2<T extends AgentStatDataPoint> {
+@Repository
+public interface AgentStatDao<T extends AgentStatDataPoint> {
     void insert(String agentId, List<T> agentStatDataPoints);
 
     void dispatch(AgentStatBo agentStatBo);

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/stat/DefaultAgentStatDao.java

@@ -1,6 +1,6 @@
 package com.navercorp.pinpoint.collector.dao.hbase.stat;
 
-import com.navercorp.pinpoint.collector.dao.AgentStatDaoV2;
+import com.navercorp.pinpoint.collector.dao.AgentStatDao;
 import com.navercorp.pinpoint.collector.util.CollectorUtils;
 import com.navercorp.pinpoint.common.hbase.HbaseOperations2;
 import com.navercorp.pinpoint.common.hbase.HbaseTable;
@@ -18,7 +18,7 @@
 import java.util.Objects;
 import java.util.function.Function;
 
-public abstract class DefaultAgentStatDao<T extends AgentStatDataPoint> implements AgentStatDaoV2<T> {
+public class DefaultAgentStatDao<T extends AgentStatDataPoint> implements AgentStatDao<T> {
 
     private final AgentStatType agentStatType;
     private final HbaseTable tableName;

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/stat/HBaseDaoConfiguration.java

@@ -0,0 +1,109 @@
+package com.navercorp.pinpoint.collector.dao.hbase.stat;
+
+import com.navercorp.pinpoint.collector.dao.AgentStatDao;
+import com.navercorp.pinpoint.common.hbase.HbaseOperations2;
+import com.navercorp.pinpoint.common.hbase.HbaseTable;
+import com.navercorp.pinpoint.common.hbase.TableNameProvider;
+import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatHbaseOperationFactory;
+import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatSerializer;
+import com.navercorp.pinpoint.common.server.bo.stat.ActiveTraceBo;
+import com.navercorp.pinpoint.common.server.bo.stat.AgentStatBo;
+import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint;
+import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType;
+import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo;
+import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo;
+import com.navercorp.pinpoint.common.server.bo.stat.DeadlockThreadCountBo;
+import com.navercorp.pinpoint.common.server.bo.stat.DirectBufferBo;
+import com.navercorp.pinpoint.common.server.bo.stat.FileDescriptorBo;
+import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo;
+import com.navercorp.pinpoint.common.server.bo.stat.JvmGcDetailedBo;
+import com.navercorp.pinpoint.common.server.bo.stat.LoadedClassBo;
+import com.navercorp.pinpoint.common.server.bo.stat.ResponseTimeBo;
+import com.navercorp.pinpoint.common.server.bo.stat.TotalThreadCountBo;
+import com.navercorp.pinpoint.common.server.bo.stat.TransactionBo;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+
+@Configuration
+public class HBaseDaoConfiguration {
+
+    private final HbaseOperations2 hbaseTemplate;
+    private final HbaseTable hbaseTable = HbaseTable.AGENT_STAT_VER2;
+    private final TableNameProvider tableNameProvider;
+    private final AgentStatHbaseOperationFactory operations;
+
+    public HBaseDaoConfiguration(HbaseOperations2 hbaseTemplate, TableNameProvider tableNameProvider, AgentStatHbaseOperationFactory operations) {
+        this.hbaseTemplate = Objects.requireNonNull(hbaseTemplate, "hbaseTemplate");
+        this.tableNameProvider = Objects.requireNonNull(tableNameProvider, "tableNameProvider");
+        this.operations = Objects.requireNonNull(operations, "operations");
+    }
+
+    private <T extends AgentStatDataPoint> AgentStatDao<T> newAgentStatDao(AgentStatType agentStatType, Function<AgentStatBo, List<T>> dataPointFunction, AgentStatSerializer<T> serializer) {
+        return new DefaultAgentStatDao<>(agentStatType, hbaseTable, dataPointFunction,
+                hbaseTemplate, tableNameProvider, operations, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<ActiveTraceBo> getActiveTraceDao(AgentStatSerializer<ActiveTraceBo> serializer) {
+        return newAgentStatDao(AgentStatType.TRANSACTION, AgentStatBo::getActiveTraceBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<CpuLoadBo> getCpuLoadDao(AgentStatSerializer<CpuLoadBo> serializer) {
+        return newAgentStatDao(AgentStatType.CPU_LOAD, AgentStatBo::getCpuLoadBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<DataSourceListBo> getDataSourceListDao(AgentStatSerializer<DataSourceListBo> serializer) {
+        return new HbaseDataSourceListDao(hbaseTemplate, tableNameProvider, operations, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<DeadlockThreadCountBo> getDeadlockThreadCountDao(AgentStatSerializer<DeadlockThreadCountBo> serializer) {
+        return newAgentStatDao(AgentStatType.DEADLOCK, AgentStatBo::getDeadlockThreadCountBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<DirectBufferBo> getDirectBufferDao(AgentStatSerializer<DirectBufferBo> serializer) {
+        return newAgentStatDao(AgentStatType.DIRECT_BUFFER, AgentStatBo::getDirectBufferBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<FileDescriptorBo> getFileDescriptorDao(AgentStatSerializer<FileDescriptorBo> serializer) {
+        return newAgentStatDao(AgentStatType.FILE_DESCRIPTOR, AgentStatBo::getFileDescriptorBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<JvmGcBo> getJvmGcDao(AgentStatSerializer<JvmGcBo> serializer) {
+        return newAgentStatDao(AgentStatType.JVM_GC, AgentStatBo::getJvmGcBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<JvmGcDetailedBo> getJvmGcDetailedDao(AgentStatSerializer<JvmGcDetailedBo> serializer) {
+        return newAgentStatDao(AgentStatType.JVM_GC_DETAILED, AgentStatBo::getJvmGcDetailedBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<LoadedClassBo> getLoadedClassDao(AgentStatSerializer<LoadedClassBo> serializer) {
+        return newAgentStatDao(AgentStatType.LOADED_CLASS, AgentStatBo::getLoadedClassBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<ResponseTimeBo> getResponseTimeDao(AgentStatSerializer<ResponseTimeBo> serializer) {
+        return newAgentStatDao(AgentStatType.RESPONSE_TIME, AgentStatBo::getResponseTimeBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<TotalThreadCountBo> getTotalThreadCountDao(AgentStatSerializer<TotalThreadCountBo> serializer) {
+        return newAgentStatDao(AgentStatType.TOTAL_THREAD, AgentStatBo::getTotalThreadCountBos, serializer);
+    }
+
+    @Bean
+    public AgentStatDao<TransactionBo> getTransactionDao(AgentStatSerializer<TransactionBo> serializer) {
+        return newAgentStatDao(AgentStatType.TRANSACTION, AgentStatBo::getTransactionBos, serializer);
+    }
+}

collector/src/main/java/com/navercorp/pinpoint/collector/dao/hbase/stat/HbaseDataSourceListDao.java

@@ -36,7 +36,6 @@
 /**
  * @author Taejin Koo
  */
-@Repository
 public class HbaseDataSourceListDao extends DefaultAgentStatDao<DataSourceListBo> {
 
     public HbaseDataSourceListDao(HbaseOperations2 hbaseTemplate,