[#noissue] change package name for pinot-batch

pinpoint-apm · Sep 19, 2023 · 2b95dd2 · 2b95dd2
1 parent 0264dd4
commit 2b95dd2
Show file tree

Hide file tree

Showing 34 changed files with 83 additions and 75 deletions.
diff --git a/...m/DefaultPinotAlarmWriterInterceptor.java → ...m/DefaultPinotAlarmWriterInterceptor.java b/...m/DefaultPinotAlarmWriterInterceptor.java → ...m/DefaultPinotAlarmWriterInterceptor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.batch.alarm;
+package com.navercorp.pinpoint.pinot.alarm;
 
-import com.navercorp.pinpoint.batch.alarm.checker.PinotAlarmCheckers;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotAlarmCheckers;
 
 import java.util.List;
 

diff --git a/...ch/alarm/PinotAlarmWriterInterceptor.java → ...ot/alarm/PinotAlarmWriterInterceptor.java b/...ch/alarm/PinotAlarmWriterInterceptor.java → ...ot/alarm/PinotAlarmWriterInterceptor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.batch.alarm;
+package com.navercorp.pinpoint.pinot.alarm;
 
-import com.navercorp.pinpoint.batch.alarm.checker.PinotAlarmCheckers;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotAlarmCheckers;
 
 import java.util.List;
 

diff --git a/...atch/alarm/checker/PinotAlarmChecker.java → ...inot/alarm/checker/PinotAlarmChecker.java b/...atch/alarm/checker/PinotAlarmChecker.java → ...inot/alarm/checker/PinotAlarmChecker.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.batch.alarm.checker;
+package com.navercorp.pinpoint.pinot.alarm.checker;
 
-import com.navercorp.pinpoint.batch.alarm.collector.PinotDataCollector;
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmCondition;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.batch.alarm.checker.PinotAlarmCheckerInterface;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmCondition;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...tch/alarm/checker/PinotAlarmCheckers.java → ...not/alarm/checker/PinotAlarmCheckers.java b/...tch/alarm/checker/PinotAlarmCheckers.java → ...not/alarm/checker/PinotAlarmCheckers.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.batch.alarm.checker;
+package com.navercorp.pinpoint.pinot.alarm.checker;
 
 import java.util.List;
 

diff --git a/...checker/PinotDoubleValueAlarmChecker.java → ...checker/PinotDoubleValueAlarmChecker.java b/...checker/PinotDoubleValueAlarmChecker.java → ...checker/PinotDoubleValueAlarmChecker.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.batch.alarm.checker;
+package com.navercorp.pinpoint.pinot.alarm.checker;
 
-import com.navercorp.pinpoint.batch.alarm.collector.PinotDataCollector;
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmCondition;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmCondition;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 
 import java.math.BigDecimal;
 import java.util.List;

diff --git a/...m/checker/PinotLongValueAlarmChecker.java → ...m/checker/PinotLongValueAlarmChecker.java b/...m/checker/PinotLongValueAlarmChecker.java → ...m/checker/PinotLongValueAlarmChecker.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.batch.alarm.checker;
+package com.navercorp.pinpoint.pinot.alarm.checker;
 
-import com.navercorp.pinpoint.batch.alarm.collector.PinotDataCollector;
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmCondition;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmCondition;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 
 import java.math.BigDecimal;
 import java.util.List;

diff --git a/...h/alarm/collector/PinotDataCollector.java → ...t/alarm/collector/PinotDataCollector.java b/...h/alarm/collector/PinotDataCollector.java → ...t/alarm/collector/PinotDataCollector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.batch.alarm.collector;
+package com.navercorp.pinpoint.pinot.alarm.collector;
 
 import com.navercorp.pinpoint.common.server.util.time.Range;
 

diff --git a/...batch/alarm/condition/AlarmCondition.java → ...pinot/alarm/condition/AlarmCondition.java b/...batch/alarm/condition/AlarmCondition.java → ...pinot/alarm/condition/AlarmCondition.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.batch.alarm.condition;
+package com.navercorp.pinpoint.pinot.alarm.condition;
 
 import java.math.BigDecimal;
 import java.util.function.BiFunction;

diff --git a/...arm/condition/AlarmConditionCategory.java → ...arm/condition/AlarmConditionCategory.java b/...arm/condition/AlarmConditionCategory.java → ...arm/condition/AlarmConditionCategory.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.batch.alarm.condition;
+package com.navercorp.pinpoint.pinot.alarm.condition;
 
 public enum AlarmConditionCategory {
     BIGGER_THAN(">"),

diff --git a/...larm/condition/AlarmConditionFactory.java → ...larm/condition/AlarmConditionFactory.java b/...larm/condition/AlarmConditionFactory.java → ...larm/condition/AlarmConditionFactory.java
@@ -1,6 +1,6 @@
-package com.navercorp.pinpoint.batch.alarm.condition;
+package com.navercorp.pinpoint.pinot.alarm.condition;
 
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;

diff --git a/...npoint/batch/alarm/dao/PinotAlarmDao.java → ...npoint/pinot/alarm/dao/PinotAlarmDao.java b/...npoint/batch/alarm/dao/PinotAlarmDao.java → ...npoint/pinot/alarm/dao/PinotAlarmDao.java
@@ -1,8 +1,8 @@
-package com.navercorp.pinpoint.batch.alarm.dao;
+package com.navercorp.pinpoint.pinot.alarm.dao;
 
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmHistory;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmHistory;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmKey;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 
 import java.util.List;
 

diff --git a/...ch/alarm/dao/mysql/PinotAlarmDaoImpl.java → ...ot/alarm/dao/mysql/PinotAlarmDaoImpl.java b/...ch/alarm/dao/mysql/PinotAlarmDaoImpl.java → ...ot/alarm/dao/mysql/PinotAlarmDaoImpl.java
@@ -1,9 +1,9 @@
-package com.navercorp.pinpoint.batch.alarm.dao.mysql;
+package com.navercorp.pinpoint.pinot.alarm.dao.mysql;
 
-import com.navercorp.pinpoint.batch.alarm.dao.PinotAlarmDao;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmHistory;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.dao.PinotAlarmDao;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmHistory;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmKey;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;

diff --git a/...atch/alarm/service/PinotAlarmService.java → ...inot/alarm/service/PinotAlarmService.java b/...atch/alarm/service/PinotAlarmService.java → ...inot/alarm/service/PinotAlarmService.java
@@ -1,9 +1,9 @@
-package com.navercorp.pinpoint.batch.alarm.service;
+package com.navercorp.pinpoint.pinot.alarm.service;
 
-import com.navercorp.pinpoint.batch.alarm.dao.PinotAlarmDao;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmHistory;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.dao.PinotAlarmDao;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmHistory;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmKey;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
 

diff --git a/...int/batch/alarm/vo/PinotAlarmHistory.java → ...int/pinot/alarm/vo/PinotAlarmHistory.java b/...int/batch/alarm/vo/PinotAlarmHistory.java → ...int/pinot/alarm/vo/PinotAlarmHistory.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.batch.alarm.vo;
+package com.navercorp.pinpoint.pinot.alarm.vo;
 
 import java.sql.Timestamp;
 import java.util.Objects;

diff --git a/...inpoint/batch/alarm/vo/PinotAlarmKey.java → ...inpoint/pinot/alarm/vo/PinotAlarmKey.java b/...inpoint/batch/alarm/vo/PinotAlarmKey.java → ...inpoint/pinot/alarm/vo/PinotAlarmKey.java
@@ -1,4 +1,4 @@
-package com.navercorp.pinpoint.batch.alarm.vo;
+package com.navercorp.pinpoint.pinot.alarm.vo;
 
 import java.util.Objects;
 

diff --git a/...npoint/batch/alarm/vo/PinotAlarmRule.java → ...npoint/pinot/alarm/vo/PinotAlarmRule.java b/...npoint/batch/alarm/vo/PinotAlarmRule.java → ...npoint/pinot/alarm/vo/PinotAlarmRule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.batch.alarm.vo;
+package com.navercorp.pinpoint.pinot.alarm.vo;
 
 import java.math.BigDecimal;
 

diff --git a/pinot/pinot-batch/src/main/resources/applicationContext-pinot-batch-dao-config.xml b/pinot/pinot-batch/src/main/resources/applicationContext-pinot-batch-dao-config.xml
@@ -10,7 +10,7 @@
     <bean id="uriStatPinotSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
         <property name="dataSource" ref="dataSource"/>
         <property name="configLocation" value="classpath:/pinot-alarm-mybatis-config.xml"/>
-        <property name="typeAliasesPackage" value="com.navercorp.pinpoint.batch.alarm.vo" />
+        <property name="typeAliasesPackage" value="com.navercorp.pinpoint.pinot.alarm.vo" />
         <property name="mapperLocations" value="classpath:mapper/alarm/*Mapper.xml"/>
         <!-- set "true" in order to catch the errors of declaration of statement more quickly -->
         <property name="failFast" value="true"/>

diff --git a/pinot/pinot-batch/src/main/resources/mapper/alarm/PinotAlarmMapper.xml b/pinot/pinot-batch/src/main/resources/mapper/alarm/PinotAlarmMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.navercorp.pinpoint.batch.alarm.dao.PinotAlarmDao">
+<mapper namespace="com.navercorp.pinpoint.pinot.alarm.dao.PinotAlarmDao">
 
     <select id="selectAlarmKeys" resultType="PinotAlarmKey">
         SELECT DISTINCT service_name, application_name, target, category_name

diff --git a/pinot/pinot-batch/src/main/resources/pinot-alarm-mybatis-config.xml b/pinot/pinot-batch/src/main/resources/pinot-alarm-mybatis-config.xml
@@ -22,7 +22,7 @@
     </settings>
 
     <typeAliases>
-        <typeAlias type="com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey" alias="PinotAlarmKey"/>
+        <typeAlias type="com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmKey" alias="PinotAlarmKey"/>
     </typeAliases>
 
 </configuration>
diff --git a/...uristat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/UriStatAlarmProcessor.java b/...uristat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/UriStatAlarmProcessor.java
@@ -1,16 +1,16 @@
 package com.navercorp.pinpoint.batch.alarm;
 
-import com.navercorp.pinpoint.batch.alarm.checker.PinotAlarmChecker;
-import com.navercorp.pinpoint.batch.alarm.checker.PinotAlarmCheckers;
-import com.navercorp.pinpoint.batch.alarm.checker.UriStatAlarmChecker;
 import com.navercorp.pinpoint.batch.alarm.checker.UriStatAlarmCheckerRegistry;
-import com.navercorp.pinpoint.batch.alarm.collector.PinotDataCollector;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotAlarmChecker;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotAlarmCheckers;
+import com.navercorp.pinpoint.batch.alarm.checker.UriStatAlarmChecker;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
 import com.navercorp.pinpoint.batch.alarm.collector.UriStatDataCollectorFactory;
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmCondition;
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmConditionFactory;
-import com.navercorp.pinpoint.batch.alarm.service.PinotAlarmService;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmCondition;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmConditionFactory;
+import com.navercorp.pinpoint.pinot.alarm.service.PinotAlarmService;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmKey;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 import com.navercorp.pinpoint.common.util.CollectionUtils;
 import org.springframework.batch.item.ItemProcessor;
 

diff --git a/...at/uristat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/UriStatAlarmReader.java b/...at/uristat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/UriStatAlarmReader.java
@@ -1,8 +1,8 @@
 package com.navercorp.pinpoint.batch.alarm;
 
-import com.navercorp.pinpoint.batch.alarm.dao.PinotAlarmDao;
+import com.navercorp.pinpoint.pinot.alarm.dao.PinotAlarmDao;
 import com.navercorp.pinpoint.batch.alarm.dao.UriStatDao;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmKey;
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 import com.navercorp.pinpoint.common.server.util.time.Range;
 import com.navercorp.pinpoint.pinot.tenant.TenantProvider;

diff --git a/...at/uristat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/UriStatAlarmWriter.java b/...at/uristat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/UriStatAlarmWriter.java
@@ -1,10 +1,12 @@
 package com.navercorp.pinpoint.batch.alarm;
 
-import com.navercorp.pinpoint.batch.alarm.checker.PinotAlarmChecker;
-import com.navercorp.pinpoint.batch.alarm.checker.PinotAlarmCheckers;
-import com.navercorp.pinpoint.batch.alarm.service.PinotAlarmService;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmHistory;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.DefaultPinotAlarmWriterInterceptor;
+import com.navercorp.pinpoint.pinot.alarm.PinotAlarmWriterInterceptor;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotAlarmChecker;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotAlarmCheckers;
+import com.navercorp.pinpoint.pinot.alarm.service.PinotAlarmService;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmHistory;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 import com.navercorp.pinpoint.common.util.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...t-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/checker/UriStatAlarmChecker.java b/...t-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/checker/UriStatAlarmChecker.java
@@ -16,9 +16,9 @@
 
 package com.navercorp.pinpoint.batch.alarm.checker;
 
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmCondition;
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmConditionFactory;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmCondition;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmConditionFactory;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 
 import java.util.EnumSet;
 import java.util.Set;

diff --git a/.../src/main/java/com/navercorp/pinpoint/batch/alarm/checker/UriStatAlarmCheckerFactory.java b/.../src/main/java/com/navercorp/pinpoint/batch/alarm/checker/UriStatAlarmCheckerFactory.java
@@ -1,8 +1,9 @@
 package com.navercorp.pinpoint.batch.alarm.checker;
 
-import com.navercorp.pinpoint.batch.alarm.collector.PinotDataCollector;
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmCondition;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmCondition;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotAlarmChecker;
 
 import java.util.List;
 

diff --git a/...src/main/java/com/navercorp/pinpoint/batch/alarm/checker/UriStatAlarmCheckerRegistry.java b/...src/main/java/com/navercorp/pinpoint/batch/alarm/checker/UriStatAlarmCheckerRegistry.java
@@ -1,9 +1,12 @@
 package com.navercorp.pinpoint.batch.alarm.checker;
 
 
-import com.navercorp.pinpoint.batch.alarm.collector.*;
-import com.navercorp.pinpoint.batch.alarm.condition.AlarmCondition;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.condition.AlarmCondition;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotAlarmChecker;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotDoubleValueAlarmChecker;
+import com.navercorp.pinpoint.pinot.alarm.checker.PinotLongValueAlarmChecker;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/collector/ApdexDataCollector.java b/...-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/collector/ApdexDataCollector.java
@@ -3,6 +3,7 @@
 import com.navercorp.pinpoint.batch.alarm.dao.UriStatDao;
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 import com.navercorp.pinpoint.common.server.util.time.Range;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

diff --git a/.../src/main/java/com/navercorp/pinpoint/batch/alarm/collector/AvgResponseDataCollector.java b/.../src/main/java/com/navercorp/pinpoint/batch/alarm/collector/AvgResponseDataCollector.java
@@ -3,6 +3,7 @@
 import com.navercorp.pinpoint.batch.alarm.dao.UriStatDao;
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 import com.navercorp.pinpoint.common.server.util.time.Range;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

diff --git a/...src/main/java/com/navercorp/pinpoint/batch/alarm/collector/FailureCountDataCollector.java b/...src/main/java/com/navercorp/pinpoint/batch/alarm/collector/FailureCountDataCollector.java
@@ -3,6 +3,7 @@
 import com.navercorp.pinpoint.batch.alarm.dao.UriStatDao;
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 import com.navercorp.pinpoint.common.server.util.time.Range;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

diff --git a/.../src/main/java/com/navercorp/pinpoint/batch/alarm/collector/MaxResponseDataCollector.java b/.../src/main/java/com/navercorp/pinpoint/batch/alarm/collector/MaxResponseDataCollector.java
@@ -3,6 +3,7 @@
 import com.navercorp.pinpoint.batch.alarm.dao.UriStatDao;
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 import com.navercorp.pinpoint.common.server.util.time.Range;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

diff --git a/...h/src/main/java/com/navercorp/pinpoint/batch/alarm/collector/TotalCountDataCollector.java b/...h/src/main/java/com/navercorp/pinpoint/batch/alarm/collector/TotalCountDataCollector.java
@@ -3,6 +3,7 @@
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 import com.navercorp.pinpoint.batch.alarm.dao.UriStatDao;
 import com.navercorp.pinpoint.common.server.util.time.Range;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

diff --git a/...c/main/java/com/navercorp/pinpoint/batch/alarm/collector/UriStatDataCollectorFactory.java b/...c/main/java/com/navercorp/pinpoint/batch/alarm/collector/UriStatDataCollectorFactory.java
@@ -18,6 +18,7 @@
 
 import com.navercorp.pinpoint.batch.alarm.checker.UriStatAlarmChecker;
 import com.navercorp.pinpoint.batch.alarm.dao.UriStatDao;
+import com.navercorp.pinpoint.pinot.alarm.collector.PinotDataCollector;
 import com.navercorp.pinpoint.pinot.tenant.TenantProvider;
 import org.springframework.stereotype.Component;
 

diff --git a/.../src/main/java/com/navercorp/pinpoint/batch/alarm/config/UriStatBatchRegistryHandler.java b/.../src/main/java/com/navercorp/pinpoint/batch/alarm/config/UriStatBatchRegistryHandler.java
@@ -1,8 +1,8 @@
 package com.navercorp.pinpoint.batch.alarm.config;
 
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmHistory;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey;
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmRule;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmHistory;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmKey;
+import com.navercorp.pinpoint.pinot.alarm.vo.PinotAlarmRule;
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 import org.apache.ibatis.type.TypeAliasRegistry;
 import org.apache.ibatis.type.TypeHandlerRegistry;

diff --git a/uristat/uristat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/dao/UriStatDao.java b/uristat/uristat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/dao/UriStatDao.java
@@ -1,10 +1,7 @@
 package com.navercorp.pinpoint.batch.alarm.dao;
 
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey;
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 
-import java.util.List;
-
 
 public interface UriStatDao {
     double selectTotalCount(UriStatQueryParams params);

diff --git a/...tat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/dao/pinot/PinotUriStatDao.java b/...tat-batch/src/main/java/com/navercorp/pinpoint/batch/alarm/dao/pinot/PinotUriStatDao.java
@@ -1,13 +1,11 @@
 package com.navercorp.pinpoint.batch.alarm.dao.pinot;
 
-import com.navercorp.pinpoint.batch.alarm.vo.PinotAlarmKey;
 import com.navercorp.pinpoint.batch.alarm.vo.UriStatQueryParams;
 import com.navercorp.pinpoint.batch.alarm.dao.UriStatDao;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.Objects;
 
 @Repository