From c95c8affdb4e1ee9f896a164c8aa00356a11cd90 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Wed, 6 Nov 2013 05:56:19 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20null=20=EC=B2=B4=ED=81=AC=20=EA=B0=95=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@2804 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../web/service/AgentInfoServiceImpl.java | 11 +++-- .../web/service/AgentStatServiceImpl.java | 5 ++- .../service/ApplicationMapServiceImpl.java | 22 ++++++++-- .../FilteredApplicationMapServiceImpl.java | 40 +++++++++++++++---- .../web/service/ScatterChartServiceImpl.java | 20 ++++++++-- .../pinpoint/web/service/SpanServiceImpl.java | 9 +++-- .../service/TransactionInfoServiceImpl.java | 12 +++++- 7 files changed, 96 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/nhn/pinpoint/web/service/AgentInfoServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/AgentInfoServiceImpl.java index 01266fe9e..63358700f 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/AgentInfoServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/AgentInfoServiceImpl.java @@ -25,7 +25,7 @@ import com.nhn.pinpoint.web.dao.ApplicationIndexDao; @Service public class AgentInfoServiceImpl implements AgentInfoService { - private Logger logger = LoggerFactory.getLogger(this.getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private ApplicationIndexDao applicationIndexDao; @@ -39,9 +39,14 @@ public class AgentInfoServiceImpl implements AgentInfoService { */ @Override public SortedMap> getApplicationAgentList(String applicationName, long from, long to) { - String[] agentIdList = applicationIndexDao.selectAgentIds(applicationName); + if (applicationName == null) { + throw new NullPointerException("applicationName must not be null"); + } + String[] agentIdList = applicationIndexDao.selectAgentIds(applicationName); - logger.debug("agentIdList={}", Arrays.toString(agentIdList)); + if (logger.isDebugEnabled()) { + logger.debug("agentIdList={}", Arrays.toString(agentIdList)); + } if (agentIdList == null || agentIdList.length == 0) { logger.debug("agentIdList is empty. applicationName={}, from={}", applicationName, from); diff --git a/src/main/java/com/nhn/pinpoint/web/service/AgentStatServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/AgentStatServiceImpl.java index 02e31910e..415c5b325 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/AgentStatServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/AgentStatServiceImpl.java @@ -18,7 +18,10 @@ public class AgentStatServiceImpl implements AgentStatService { private AgentStatDao agentStatDao; public List selectAgentStatList(String agentId, long start, long end) { - return agentStatDao.scanAgentStatList(agentId, start, end); + if (agentId == null) { + throw new NullPointerException("agentId must not be null"); + } + return agentStatDao.scanAgentStatList(agentId, start, end); } } diff --git a/src/main/java/com/nhn/pinpoint/web/service/ApplicationMapServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/ApplicationMapServiceImpl.java index a367394b1..7b9b4e2bd 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/ApplicationMapServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/ApplicationMapServiceImpl.java @@ -31,7 +31,7 @@ import com.nhn.pinpoint.web.vo.LinkStatistics; @Service public class ApplicationMapServiceImpl implements ApplicationMapService { - private Logger logger = LoggerFactory.getLogger(this.getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private ApplicationIndexDao applicationIndexDao; @@ -49,7 +49,11 @@ public class ApplicationMapServiceImpl implements ApplicationMapService { private HostApplicationMapDao hostApplicationMapDao; private Set selectAgents(String applicationId) { - String[] agentIds = applicationIndexDao.selectAgentIds(applicationId); + if (applicationId == null) { + throw new NullPointerException("applicationId must not be null"); + } + + String[] agentIds = applicationIndexDao.selectAgentIds(applicationId); Set agentSet = new HashSet(); for (String agentId : agentIds) { // TODO 조회 시간대에 따라서 agent info row timestamp를 변경하여 조회해야하는지는 모르겠음. @@ -208,7 +212,10 @@ public class ApplicationMapServiceImpl implements ApplicationMapService { */ @Override public ApplicationMap selectApplicationMap(String applicationName, short serviceType, long from, long to) { - logger.debug("SelectApplicationMap"); + if (applicationName == null) { + throw new NullPointerException("applicationName must not be null"); + } + logger.debug("SelectApplicationMap"); StopWatch watch = new StopWatch("applicationMapWatch"); watch.start(); @@ -234,7 +241,14 @@ public class ApplicationMapServiceImpl implements ApplicationMapService { @Override public LinkStatistics linkStatistics(long from, long to, String srcApplicationName, short srcServiceType, String destApplicationName, short destServiceType) { - List>> list; + if (srcApplicationName == null) { + throw new NullPointerException("srcApplicationName must not be null"); + } + if (destApplicationName == null) { + throw new NullPointerException("destApplicationName must not be null"); + } + + List>> list; if (ServiceType.findServiceType(srcServiceType) == ServiceType.CLIENT) { logger.debug("Find 'client -> any' link statistics"); diff --git a/src/main/java/com/nhn/pinpoint/web/service/FilteredApplicationMapServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/FilteredApplicationMapServiceImpl.java index 32b6ba7e8..b0a337d3c 100755 --- a/src/main/java/com/nhn/pinpoint/web/service/FilteredApplicationMapServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/FilteredApplicationMapServiceImpl.java @@ -59,11 +59,11 @@ public class FilteredApplicationMapServiceImpl implements FilteredApplicationMap @Override public LimitedScanResult> selectTraceIdsFromApplicationTraceIndex(String applicationName, long from, long to, int limit) { - if (applicationName == null) { - throw new NullPointerException("applicationName"); - } + if (applicationName == null) { + throw new NullPointerException("applicationName must not be null"); + } - if (logger.isTraceEnabled()) { + if (logger.isTraceEnabled()) { logger.trace("scan(selectTraceIdsFromApplicationTraceIndex) {}, {}, {}", applicationName, from, to); } @@ -72,7 +72,17 @@ public class FilteredApplicationMapServiceImpl implements FilteredApplicationMap @Override public LinkStatistics linkStatistics(long from, long to, List traceIdSet, String srcApplicationName, short srcServiceType, String destApplicationName, short destServiceType, Filter filter) { - StopWatch watch = new StopWatch(); + if (srcApplicationName == null) { + throw new NullPointerException("srcApplicationName must not be null"); + } + if (destApplicationName == null) { + throw new NullPointerException("destApplicationName must not be null"); + } + if (filter == null) { + throw new NullPointerException("filter must not be null"); + } + + StopWatch watch = new StopWatch(); watch.start(); List> transactionList = this.traceDao.selectAllSpans(traceIdSet); @@ -119,7 +129,10 @@ public class FilteredApplicationMapServiceImpl implements FilteredApplicationMap @Override public ApplicationMap selectApplicationMap(TransactionId transactionId) { - List transactionIdList = new ArrayList(); + if (transactionId == null) { + throw new NullPointerException("transactionId must not be null"); + } + List transactionIdList = new ArrayList(); transactionIdList.add(transactionId); // FIXME from,to -1 땜방임. return selectApplicationMap(transactionIdList, -1L, -1L, Filter.NONE); @@ -130,7 +143,14 @@ public class FilteredApplicationMapServiceImpl implements FilteredApplicationMap */ @Override public ApplicationMap selectApplicationMap(List transactionIdList, long from, long to, Filter filter) { - StopWatch watch = new StopWatch(); + if (transactionIdList == null) { + throw new NullPointerException("transactionIdList must not be null"); + } + if (filter == null) { + throw new NullPointerException("filter must not be null"); + } + + StopWatch watch = new StopWatch(); watch.start(); // 개별 객체를 각각 보고 재귀 내용을 삭제함. @@ -270,7 +290,11 @@ public class FilteredApplicationMapServiceImpl implements FilteredApplicationMap } private Collection recursiveCallFilter(List transactionIdList) { - List crashKey = new ArrayList(); + if (transactionIdList == null) { + throw new NullPointerException("transactionIdList must not be null"); + } + + List crashKey = new ArrayList(); Map filterMap = new LinkedHashMap(transactionIdList.size()); for (TransactionId transactionId : transactionIdList) { Object old = filterMap.put(transactionId, V); diff --git a/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java index f6a5b91a7..c868b42e3 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java @@ -32,12 +32,22 @@ public class ScatterChartServiceImpl implements ScatterChartService { @Override public List selectScatterData(String applicationName, long from, long to, int limit) { - return applicationTraceIndexDao.scanTraceScatter2(applicationName, from, to, limit); + if (applicationName == null) { + throw new NullPointerException("applicationName must not be null"); + } + return applicationTraceIndexDao.scanTraceScatter2(applicationName, from, to, limit); } @Override public List selectScatterData(Collection traceIds, String applicationName, Filter filter) { - List> traceList = traceDao.selectAllSpans(traceIds); + if (traceIds == null) { + throw new NullPointerException("traceIds must not be null"); + } + if (applicationName == null) { + throw new NullPointerException("applicationName must not be null"); + } + + List> traceList = traceDao.selectAllSpans(traceIds); List list = new ArrayList(); @@ -62,7 +72,11 @@ public class ScatterChartServiceImpl implements ScatterChartService { */ @Override public List selectTransactionMetadata(TransactionMetadataQuery query) { - List> selectedSpans = traceDao.selectSpans(query.getTraceIds()); + if (query == null) { + throw new NullPointerException("query must not be null"); + } + + List> selectedSpans = traceDao.selectSpans(query.getTraceIds()); List result = new ArrayList(query.size()); diff --git a/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java index 3033677d0..398984c60 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java @@ -47,8 +47,11 @@ public class SpanServiceImpl implements SpanService { @Override public SpanResult selectSpan(TransactionId transactionId, long selectedSpanHint) { + if (transactionId == null) { + throw new NullPointerException("transactionId must not be null"); + } - List spans = traceDao.selectSpanAndAnnotation(transactionId); + List spans = traceDao.selectSpanAndAnnotation(transactionId); if (spans == null || spans.isEmpty()) { return new SpanResult(SpanAligner2.FAIL_MATCH, Collections.emptyList()); } @@ -67,7 +70,7 @@ public class SpanServiceImpl implements SpanService { private void transitionAnnotation(List spans, AnnotationReplacementCallback annotationReplacementCallback) { - for (SpanAlign spanAlign : spans) { + for (SpanAlign spanAlign : spans) { List annotationBoList; if (spanAlign.isSpan()) { annotationBoList = spanAlign.getSpanBo().getAnnotationBoList(); @@ -377,7 +380,7 @@ public class SpanServiceImpl implements SpanService { } - private static class AgentKey { + private static final class AgentKey { private final String agentId; private final long agentStartTime; diff --git a/src/main/java/com/nhn/pinpoint/web/service/TransactionInfoServiceImpl.java b/src/main/java/com/nhn/pinpoint/web/service/TransactionInfoServiceImpl.java index 77dcce834..5cd234d81 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/TransactionInfoServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/TransactionInfoServiceImpl.java @@ -39,7 +39,14 @@ public class TransactionInfoServiceImpl implements TransactionInfoService { @Override public BusinessTransactions selectBusinessTransactions(List traceIds, String applicationName, long from, long to, Filter filter) { - List> traceList; + if (traceIds == null) { + throw new NullPointerException("traceIds must not be null"); + } + if (filter == null) { + throw new NullPointerException("filter must not be null"); + } + + List> traceList; if (filter == Filter.NONE) { traceList = this.traceDao.selectSpans(traceIds); @@ -66,6 +73,9 @@ public class TransactionInfoServiceImpl implements TransactionInfoService { @Override public RecordSet createRecordSet(List spanAlignList, long focusTimestamp) { + if (spanAlignList == null) { + throw new NullPointerException("spanAlignList must not be null"); + } RecordSet recordSet = new RecordSet();