From 70b0cde5c0e1cfe615009cbdddc3ed29a17f1a57 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Wed, 6 Nov 2013 10:02:03 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20null=EC=B2=B4=ED=81=AC=20=EB=A1=9C=EC=A7=81=20=EA=B0=95?= =?UTF-8?q?=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@2816 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../controller/BusinessTransactionController.java | 2 +- .../web/service/ScatterChartServiceImpl.java | 9 +++++---- .../com/nhn/pinpoint/web/service/SpanResult.java | 14 +++++++------- .../nhn/pinpoint/web/service/SpanServiceImpl.java | 2 +- .../web/service/TransactionInfoServiceImpl.java | 13 ++++++++----- .../nhn/pinpoint/web/vo/BusinessTransactions.java | 1 + src/main/resources/applicationContext.xml | 2 +- .../nhn/pinpoint/web/service/SpanServiceTest.java | 2 +- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/nhn/pinpoint/web/controller/BusinessTransactionController.java b/src/main/java/com/nhn/pinpoint/web/controller/BusinessTransactionController.java index 298ab4cfa..0339adb05 100644 --- a/src/main/java/com/nhn/pinpoint/web/controller/BusinessTransactionController.java +++ b/src/main/java/com/nhn/pinpoint/web/controller/BusinessTransactionController.java @@ -125,7 +125,7 @@ public class BusinessTransactionController { try { // select spans final SpanResult spanResult = this.spanService.selectSpan(traceId, focusTimestamp); - List spanAligns = spanResult.getSpanAlign(); + List spanAligns = spanResult.getSpanAlignList(); if (spanAligns.isEmpty()) { mv.addObject("errorCode", 9); 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 1153e9019..ecc96491c 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/ScatterChartServiceImpl.java @@ -54,7 +54,7 @@ public class ScatterChartServiceImpl implements ScatterChartService { final List> traceList = traceDao.selectAllSpans(transactionIdList); - List list = new ArrayList(); + final List result = new ArrayList(); for (List trace : traceList) { if (!filter.include(trace)) { @@ -63,13 +63,14 @@ public class ScatterChartServiceImpl implements ScatterChartService { for (SpanBo span : trace) { if (applicationName.equals(span.getApplicationId())) { - TransactionId transactionId = new TransactionId(span.getTraceAgentId(), span.getTraceAgentStartTime(), span.getTraceTransactionSequence()); - list.add(new Dot(transactionId, span.getCollectorAcceptTime(), span.getElapsed(), span.getErrCode(), span.getAgentId())); + final TransactionId transactionId = new TransactionId(span.getTraceAgentId(), span.getTraceAgentStartTime(), span.getTraceTransactionSequence()); + final Dot dot = new Dot(transactionId, span.getCollectorAcceptTime(), span.getElapsed(), span.getErrCode(), span.getAgentId()); + result.add(dot); } } } - return list; + return result; } /** diff --git a/src/main/java/com/nhn/pinpoint/web/service/SpanResult.java b/src/main/java/com/nhn/pinpoint/web/service/SpanResult.java index 255e27892..6c03d7e8f 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/SpanResult.java +++ b/src/main/java/com/nhn/pinpoint/web/service/SpanResult.java @@ -10,14 +10,14 @@ import java.util.List; */ public class SpanResult { private int completeType; - private List spanAlign; + private List spanAlignList; - public SpanResult(int completeType, List spanAlign) { - if (spanAlign == null) { - throw new NullPointerException("spanAlign must not be null"); + public SpanResult(int completeType, List spanAlignList) { + if (spanAlignList == null) { + throw new NullPointerException("spanAlignList must not be null"); } this.completeType = completeType; - this.spanAlign = spanAlign; + this.spanAlignList = spanAlignList; } @@ -26,8 +26,8 @@ public class SpanResult { return completeType; } - public List getSpanAlign() { - return spanAlign; + public List getSpanAlignList() { + return spanAlignList; } public String getCompleteTypeString() { 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 93e749a02..66bd3debd 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/SpanServiceImpl.java @@ -57,7 +57,7 @@ public class SpanServiceImpl implements SpanService { } SpanResult result = order(spans, selectedSpanHint); - List order = result.getSpanAlign(); + List order = result.getSpanAlignList(); // transitionApiId(order); transitionDynamicApiId(order); transitionSqlId(order); 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 5cd234d81..e56d0078b 100644 --- a/src/main/java/com/nhn/pinpoint/web/service/TransactionInfoServiceImpl.java +++ b/src/main/java/com/nhn/pinpoint/web/service/TransactionInfoServiceImpl.java @@ -38,9 +38,12 @@ public class TransactionInfoServiceImpl implements TransactionInfoService { private TraceDao traceDao; @Override - public BusinessTransactions selectBusinessTransactions(List traceIds, String applicationName, long from, long to, Filter filter) { - if (traceIds == null) { - throw new NullPointerException("traceIds must not be null"); + public BusinessTransactions selectBusinessTransactions(List transactionIdList, String applicationName, long from, long to, Filter filter) { + if (transactionIdList == null) { + throw new NullPointerException("transactionIdList must not be null"); + } + if (applicationName == null) { + throw new NullPointerException("applicationName must not be null"); } if (filter == null) { throw new NullPointerException("filter must not be null"); @@ -49,9 +52,9 @@ public class TransactionInfoServiceImpl implements TransactionInfoService { List> traceList; if (filter == Filter.NONE) { - traceList = this.traceDao.selectSpans(traceIds); + traceList = this.traceDao.selectSpans(transactionIdList); } else { - traceList = this.traceDao.selectAllSpans(traceIds); + traceList = this.traceDao.selectAllSpans(transactionIdList); } BusinessTransactions businessTransactions = new BusinessTransactions(); diff --git a/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransactions.java b/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransactions.java index fd0ae6d46..89ae5eca9 100644 --- a/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransactions.java +++ b/src/main/java/com/nhn/pinpoint/web/vo/BusinessTransactions.java @@ -8,6 +8,7 @@ import java.util.Map.Entry; import com.nhn.pinpoint.common.bo.SpanBo; /** + * @author netspider * @author emeroad */ public class BusinessTransactions { diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml index 23270c32e..71a039da8 100644 --- a/src/main/resources/applicationContext.xml +++ b/src/main/resources/applicationContext.xml @@ -30,7 +30,7 @@ - + diff --git a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java index 43a18d22f..72df1fcdc 100644 --- a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java +++ b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java @@ -109,7 +109,7 @@ public class SpanServiceTest { TransactionId traceId = new TransactionId(id.getAgentId(), id.getAgentStartTime(), id.getTransactionSequence()); // selectedHint를 좀더 정확히 수정할것. SpanResult spanResult = spanService.selectSpan(traceId, System.currentTimeMillis()); - List sort = spanResult.getSpanAlign(); + List sort = spanResult.getSpanAlignList(); for (SpanAlign spanAlign : sort) { logger.info("depth:{} {}", spanAlign.getDepth(), spanAlign.getSpanBo()); }