diff --git a/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseApiMetaDataDao.java b/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseApiMetaDataDao.java index e1741285b..d16bdff4c 100644 --- a/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseApiMetaDataDao.java +++ b/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseApiMetaDataDao.java @@ -1,18 +1,18 @@ package com.nhn.hippo.web.dao.hbase; +import java.util.List; + +import org.apache.hadoop.hbase.client.Get; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.hadoop.hbase.RowMapper; +import org.springframework.stereotype.Repository; + import com.nhn.hippo.web.dao.ApiMetaDataDao; -import com.nhn.hippo.web.mapper.ApiMetaDataMapper; import com.profiler.common.bo.ApiMetaDataBo; import com.profiler.common.hbase.HBaseTables; import com.profiler.common.hbase.HbaseOperations2; import com.profiler.common.util.RowKeyUtils; -import org.apache.hadoop.hbase.client.Get; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import java.util.List; /** * @@ -20,13 +20,12 @@ import java.util.List; @Repository public class HbaseApiMetaDataDao implements ApiMetaDataDao { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired private HbaseOperations2 hbaseOperations2; @Autowired - private ApiMetaDataMapper mapper; + @Qualifier("apiMetaDataMapper") + private RowMapper> apiMetaDataMapper; @Override public List getApiMetaData(String agentId, short identifier, int apiId, long time) { @@ -34,6 +33,6 @@ public class HbaseApiMetaDataDao implements ApiMetaDataDao { Get get = new Get(sqlId); get.addFamily(HBaseTables.API_METADATA_CF_API); - return hbaseOperations2.get(HBaseTables.API_METADATA, get, mapper); + return hbaseOperations2.get(HBaseTables.API_METADATA, get, apiMetaDataMapper); } } diff --git a/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseSqlMetaDataDao.java b/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseSqlMetaDataDao.java index 9b0f6a0f2..6595cc10a 100644 --- a/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseSqlMetaDataDao.java +++ b/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseSqlMetaDataDao.java @@ -1,18 +1,18 @@ package com.nhn.hippo.web.dao.hbase; +import java.util.List; + +import org.apache.hadoop.hbase.client.Get; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.hadoop.hbase.RowMapper; +import org.springframework.stereotype.Repository; + import com.nhn.hippo.web.dao.SqlMetaDataDao; -import com.nhn.hippo.web.mapper.SqlMetaDataMapper; import com.profiler.common.bo.SqlMetaDataBo; import com.profiler.common.hbase.HBaseTables; import com.profiler.common.hbase.HbaseOperations2; import com.profiler.common.util.RowKeyUtils; -import org.apache.hadoop.hbase.client.Get; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Repository; - -import java.util.List; /** * @@ -20,13 +20,12 @@ import java.util.List; @Repository public class HbaseSqlMetaDataDao implements SqlMetaDataDao { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired private HbaseOperations2 hbaseOperations2; @Autowired - private SqlMetaDataMapper mapper; + @Qualifier("sqlMetaDataMapper") + private RowMapper> sqlMetaDataMapper; @Override public List getSqlMetaData(String agentId, short identifier, int hashCode, long time) { @@ -34,6 +33,6 @@ public class HbaseSqlMetaDataDao implements SqlMetaDataDao { Get get = new Get(sqlId); get.addFamily(HBaseTables.SQL_METADATA_CF_SQL); - return hbaseOperations2.get(HBaseTables.SQL_METADATA, get, mapper); + return hbaseOperations2.get(HBaseTables.SQL_METADATA, get, sqlMetaDataMapper); } } diff --git a/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseTerminalStatisticsDao.java b/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseTerminalStatisticsDao.java index 1b457110d..81a69539c 100644 --- a/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseTerminalStatisticsDao.java +++ b/src/main/java/com/nhn/hippo/web/dao/hbase/HbaseTerminalStatisticsDao.java @@ -35,13 +35,13 @@ public class HbaseTerminalStatisticsDao implements TerminalStatisticsDao { private HbaseOperations2 hbaseOperations2; @Autowired - @Qualifier("terminalRequestCountMapper") - private RowMapper> terminalRequestCountMapper; + @Qualifier("terminalStatisticsMapper") + private RowMapper> terminalStatisticsMapper; @Override public List> selectTerminal(String applicationName, long from, long to) { Scan scan = createScan(applicationName, from, to); - return hbaseOperations2.find(HBaseTables.TERMINAL_STATISTICS, scan, terminalRequestCountMapper); + return hbaseOperations2.find(HBaseTables.TERMINAL_STATISTICS, scan, terminalStatisticsMapper); } private Scan createScan(String applicationName, long from, long to) { diff --git a/src/main/java/com/nhn/hippo/web/mapper/ApplicationNameMapper.java b/src/main/java/com/nhn/hippo/web/mapper/ApplicationNameMapper.java index 37e9a9896..d450e5281 100644 --- a/src/main/java/com/nhn/hippo/web/mapper/ApplicationNameMapper.java +++ b/src/main/java/com/nhn/hippo/web/mapper/ApplicationNameMapper.java @@ -1,6 +1,5 @@ package com.nhn.hippo.web.mapper; -import com.profiler.common.util.BytesUtils; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; import org.springframework.data.hadoop.hbase.RowMapper; diff --git a/src/main/java/com/nhn/hippo/web/service/AgentIdNotFoundException.java b/src/main/java/com/nhn/hippo/web/service/AgentIdNotFoundException.java index 3bc5df385..60e779d23 100644 --- a/src/main/java/com/nhn/hippo/web/service/AgentIdNotFoundException.java +++ b/src/main/java/com/nhn/hippo/web/service/AgentIdNotFoundException.java @@ -4,7 +4,8 @@ package com.nhn.hippo.web.service; * */ public class AgentIdNotFoundException extends RuntimeException { - private String agentId; + private static final long serialVersionUID = -2017517623014042821L; + private String agentId; private long startTime; public AgentIdNotFoundException(String agentId, long startTime) { diff --git a/src/main/java/com/nhn/hippo/web/vo/RequestMetadataQuery.java b/src/main/java/com/nhn/hippo/web/vo/RequestMetadataQuery.java index fdb7f68b0..e5814c509 100644 --- a/src/main/java/com/nhn/hippo/web/vo/RequestMetadataQuery.java +++ b/src/main/java/com/nhn/hippo/web/vo/RequestMetadataQuery.java @@ -1,7 +1,6 @@ package com.nhn.hippo.web.vo; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/src/main/resources/root-context.xml b/src/main/resources/root-context.xml index 7dee1e37b..aac5a2941 100644 --- a/src/main/resources/root-context.xml +++ b/src/main/resources/root-context.xml @@ -21,9 +21,4 @@ - - - - -