home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-09 04:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

[#noissue] Apply CollectionUtils.isEmpty() & isNotEmpty()

Browse Source
This commit is contained in:
emeroad
2017-04-17 15:27:54 +09:00
committed by Woonduk Kang
parent 18408c4f53
commit 43ee420b16
21 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/resolver/ConditionProvider.java
+2 -1
View File
@@ -19,6 +19,7 @@ package com.navercorp.pinpoint.bootstrap.resolver;
import com.navercorp.pinpoint.bootstrap.resolver.condition.ClassResourceCondition;
import com.navercorp.pinpoint.bootstrap.resolver.condition.MainClassCondition;
import com.navercorp.pinpoint.bootstrap.resolver.condition.PropertyCondition;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import com.navercorp.pinpoint.common.util.StringUtils;
import java.util.List;
@@ -85,7 +86,7 @@ public class ConditionProvider {
* @see MainClassCondition#check(String)
*/
public boolean checkMainClass(List<String> candidates) {
if (candidates == null || candidates.isEmpty()) {
if (CollectionUtils.isEmpty(candidates)) {
return false;
}
for (String candidate : candidates) {
collector/src/main/java/com/navercorp/pinpoint/collector/dao/AutoFlusher.java
+2 -1
View File
@@ -22,6 +22,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +72,7 @@ public class AutoFlusher {
}
public void initialize() {
if (cachedStatisticsDaoList == null || cachedStatisticsDaoList.isEmpty()) {
if (CollectionUtils.isEmpty(cachedStatisticsDaoList)) {
return;
}
collector/src/main/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPPacketHandlerFactory.java
+3 -2
View File
@@ -22,6 +22,7 @@ import com.navercorp.pinpoint.thrift.dto.TSpanChunk;
import com.navercorp.pinpoint.thrift.dto.TSpanEvent;
import com.navercorp.pinpoint.thrift.io.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.thrift.TBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -100,7 +101,7 @@ public class SpanStreamUDPPacketHandlerFactory<T extends DatagramPacket> impleme
}
List<TBase<?, ?>> tbaseList = deserializer.deserializeList(componentData);
if (tbaseList == null || tbaseList.isEmpty()) {
if (CollectionUtils.isEmpty(tbaseList)) {
continue;
}
@@ -146,7 +147,7 @@ public class SpanStreamUDPPacketHandlerFactory<T extends DatagramPacket> impleme
}
private List<TSpanEvent> getSpanEventList(List<TBase<?, ?>> tbaseList) {
if (tbaseList == null || tbaseList.isEmpty()) {
if (CollectionUtils.isEmpty(tbaseList)) {
return new ArrayList<>(0);
}
commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactory.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.navercorp.pinpoint.common.server.bo.serializer.HbaseSerializer;
import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint;
import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType;
import com.sematext.hbase.wd.AbstractRowKeyDistributor;
import org.apache.commons.collections.CollectionUtils;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +62,7 @@ public class AgentStatHbaseOperationFactory {
}
public <T extends AgentStatDataPoint> List<Put> createPuts(String agentId, AgentStatType agentStatType, List<T> agentStatDataPoints, HbaseSerializer<List<T>, Put> agentStatSerializer) {
if (agentStatDataPoints == null || agentStatDataPoints.isEmpty()) {
if (CollectionUtils.isEmpty(agentStatDataPoints)) {
return Collections.emptyList();
}
Map<Long, List<T>> timeslots = slotAgentStatDataPoints(agentStatDataPoints);
commons/src/main/java/com/navercorp/pinpoint/common/util/CollectionUtils.java
+5 -5
View File
@@ -27,22 +27,22 @@ public final class CollectionUtils {
private CollectionUtils() {
}
public static <T> int nullSafeSize(Collection<T> collection) {
public static <T> int nullSafeSize(final Collection<T> collection) {
return nullSafeSize(collection, 0);
}
public static <T> int nullSafeSize(Collection<T> collection, int nullValue) {
public static <T> int nullSafeSize(final Collection<T> collection, final int nullValue) {
if (collection == null) {
return nullValue;
}
return collection.size();
}
public static <T> boolean isEmpty(Collection<T> collection) {
public static <T> boolean isEmpty(final Collection<T> collection) {
return collection == null || collection.isEmpty();
}
public static <T> boolean isNotEmpty(Collection<T> collection) {
return !isEmpty(collection);
public static <T> boolean isNotEmpty(final Collection<T> collection) {
return collection != null && !collection.isEmpty();
}
}
plugins/dubbo/src/main/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderDetector.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.navercorp.pinpoint.plugin.dubbo;
import com.navercorp.pinpoint.bootstrap.plugin.ApplicationTypeDetector;
import com.navercorp.pinpoint.bootstrap.resolver.ConditionProvider;
import com.navercorp.pinpoint.common.trace.ServiceType;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import java.util.Arrays;
import java.util.List;
@@ -33,7 +34,7 @@ public final class DubboProviderDetector implements ApplicationTypeDetector {
private List<String> bootstrapMains;
public DubboProviderDetector(List<String> bootstrapMains) {
if (bootstrapMains == null || bootstrapMains.isEmpty()) {
if (CollectionUtils.isEmpty(bootstrapMains)) {
this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN);
} else {
this.bootstrapMains = bootstrapMains;
plugins/jboss/src/main/java/com/navercorp/pinpoint/plugin/jboss/JbossDetector.java
+2 -1
View File
@@ -19,6 +19,7 @@ package com.navercorp.pinpoint.plugin.jboss;
import com.navercorp.pinpoint.bootstrap.plugin.ApplicationTypeDetector;
import com.navercorp.pinpoint.bootstrap.resolver.ConditionProvider;
import com.navercorp.pinpoint.common.trace.ServiceType;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import java.util.Arrays;
import java.util.List;
@@ -33,7 +34,7 @@ public class JbossDetector implements ApplicationTypeDetector {
private final List<String> bootstrapMains;
public JbossDetector(List<String> bootstrapMains) {
if (bootstrapMains == null || bootstrapMains.isEmpty()) {
if (CollectionUtils.isEmpty(bootstrapMains)) {
this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN);
} else {
this.bootstrapMains = bootstrapMains;
plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/JettyDetector.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.navercorp.pinpoint.plugin.jetty;
import com.navercorp.pinpoint.bootstrap.plugin.ApplicationTypeDetector;
import com.navercorp.pinpoint.bootstrap.resolver.ConditionProvider;
import com.navercorp.pinpoint.common.trace.ServiceType;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import java.util.Arrays;
import java.util.List;
@@ -28,7 +29,7 @@ public class JettyDetector implements ApplicationTypeDetector {
private final List<String> bootstrapMains;
public JettyDetector(List<String> bootstrapMains) {
if (bootstrapMains == null || bootstrapMains.isEmpty()) {
if (CollectionUtils.isEmpty(bootstrapMains)) {
this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN);
} else {
this.bootstrapMains = bootstrapMains;
plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java
+3 -1
View File
@@ -38,6 +38,7 @@ import com.navercorp.pinpoint.bootstrap.util.InterceptorUtils;
import com.navercorp.pinpoint.bootstrap.util.SimpleSampler;
import com.navercorp.pinpoint.bootstrap.util.SimpleSamplerFactory;
import com.navercorp.pinpoint.common.trace.AnnotationKey;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import com.navercorp.pinpoint.common.util.StringUtils;
import com.navercorp.pinpoint.plugin.ning.asynchttpclient.NingAsyncHttpClientPlugin;
import com.navercorp.pinpoint.plugin.ning.asynchttpclient.NingAsyncHttpClientPluginConfig;
@@ -295,7 +296,8 @@ public class ExecuteRequestInterceptor implements AroundInterceptor {
*/
protected void recordMultipartData(final com.ning.http.client.Request httpRequest, final SpanEventRecorder recorder) {
List<Part> parts = httpRequest.getParts();
if (parts != null && parts.isEmpty()) {
// bug fix : parts != null && ****!parts.isEmpty()
if (CollectionUtils.isNotEmpty(parts)) {
StringBuilder sb = new StringBuilder(config.getEntityDumpSize() * 2);
Iterator<Part> iterator = parts.iterator();
while (iterator.hasNext()) {
plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java
+2 -1
View File
@@ -19,6 +19,7 @@ package com.navercorp.pinpoint.plugin.spring.boot;
import com.navercorp.pinpoint.bootstrap.plugin.ApplicationTypeDetector;
import com.navercorp.pinpoint.bootstrap.resolver.ConditionProvider;
import com.navercorp.pinpoint.common.trace.ServiceType;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import java.util.Arrays;
import java.util.List;
@@ -37,7 +38,7 @@ public class SpringBootDetector implements ApplicationTypeDetector {
private final List<String> bootstrapMains;
public SpringBootDetector(List<String> bootstrapMains) {
if (bootstrapMains == null || bootstrapMains.isEmpty()) {
if (CollectionUtils.isEmpty(bootstrapMains)) {
this.bootstrapMains = Arrays.asList(DEFAULT_SPRING_BOOT_BOOSTRAP_MAINS);
} else {
this.bootstrapMains = bootstrapMains;
plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTarget.java
+6 -5
View File
@@ -17,6 +17,7 @@ package com.navercorp.pinpoint.plugin.spring.beans;
import com.navercorp.pinpoint.bootstrap.util.AntPathMatcher;
import com.navercorp.pinpoint.bootstrap.util.PathMatcher;
import com.navercorp.pinpoint.bootstrap.util.RegexPathMatcher;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Collections;
@@ -37,19 +38,19 @@ public class SpringBeansTarget {
private List<String> annotations;
public boolean isValid() {
if (basePackages != null && !basePackages.isEmpty()) {
if (CollectionUtils.isNotEmpty(basePackages)) {
return true;
}
if (namePatterns != null && !namePatterns.isEmpty()) {
if (CollectionUtils.isNotEmpty(namePatterns)) {
return true;
}
if (classPatterns != null && !classPatterns.isEmpty()) {
if (CollectionUtils.isNotEmpty(classPatterns)) {
return true;
}
if (annotations != null && !annotations.isEmpty()) {
if (CollectionUtils.isNotEmpty(annotations)) {
return true;
}
@@ -115,7 +116,7 @@ public class SpringBeansTarget {
}
List<PathMatcher> compilePattern(List<String> patternStrings, final String separator) {
if (patternStrings == null || patternStrings.isEmpty()) {
if (CollectionUtils.isEmpty(patternStrings)) {
return null;
}
plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilter.java
+17 -8
View File
@@ -23,6 +23,7 @@ import java.util.List;
import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
import com.navercorp.pinpoint.bootstrap.util.PathMatcher;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import com.navercorp.pinpoint.plugin.spring.beans.SpringBeansConfig;
import com.navercorp.pinpoint.plugin.spring.beans.SpringBeansTarget;
import com.navercorp.pinpoint.plugin.spring.beans.SpringBeansTargetScope;
@@ -72,7 +73,8 @@ public class TargetBeanFilter {
boolean condition = false;
// check base packages.
if (target.getBasePackages() != null && !target.getBasePackages().isEmpty()) {
final List<String> basePackages = target.getBasePackages();
if (CollectionUtils.isNotEmpty(basePackages)) {
if (!isBasePackage(target, className)) {
continue;
}
@@ -80,7 +82,8 @@ public class TargetBeanFilter {
}
// check bean name pattern.
if (target.getNamePatterns() != null && !target.getNamePatterns().isEmpty()) {
final List<PathMatcher> namePatterns = target.getNamePatterns();
if (CollectionUtils.isNotEmpty(namePatterns)) {
if (!isBeanNameTarget(target, beanName)) {
continue;
}
@@ -88,7 +91,8 @@ public class TargetBeanFilter {
}
// check class name pattern.
if (target.getClassPatterns() != null && !target.getClassPatterns().isEmpty()) {
final List<PathMatcher> classPatterns = target.getClassPatterns();
if (CollectionUtils.isNotEmpty(classPatterns)) {
if (!isClassNameTarget(target, className)) {
continue;
}
@@ -96,7 +100,8 @@ public class TargetBeanFilter {
}
// check class annotation.
if (target.getAnnotations() != null && !target.getAnnotations().isEmpty()) {
final List<String> annotations = target.getAnnotations();
if (CollectionUtils.isNotEmpty(annotations)) {
if (!(beanDefinition instanceof AnnotatedBeanDefinition) || !isAnnotationTarget(target, (AnnotatedBeanDefinition) beanDefinition)) {
continue;
}
@@ -134,7 +139,8 @@ public class TargetBeanFilter {
boolean condition = false;
// check base packages.
if (target.getBasePackages() != null && !target.getBasePackages().isEmpty()) {
final List<String> basePackages = target.getBasePackages();
if (CollectionUtils.isNotEmpty(basePackages)) {
if (!isBasePackage(target, className)) {
continue;
}
@@ -142,7 +148,8 @@ public class TargetBeanFilter {
}
// check bean name pattern.
if (target.getNamePatterns() != null && !target.getNamePatterns().isEmpty()) {
final List<PathMatcher> namePatterns = target.getNamePatterns();
if (CollectionUtils.isNotEmpty(namePatterns)) {
if (!isBeanNameTarget(target, beanName)) {
continue;
}
@@ -150,7 +157,8 @@ public class TargetBeanFilter {
}
// check class name pattern.
if (target.getClassPatterns() != null && !target.getClassPatterns().isEmpty()) {
final List<PathMatcher> classPatterns = target.getClassPatterns();
if (CollectionUtils.isNotEmpty(classPatterns)) {
if (!isClassNameTarget(target, className)) {
continue;
}
@@ -158,7 +166,8 @@ public class TargetBeanFilter {
}
// check class annotation.
if (target.getAnnotations() != null && !target.getAnnotations().isEmpty()) {
final List<String> annotations = target.getAnnotations();
if (CollectionUtils.isNotEmpty(annotations)) {
if (!isAnnotationTarget(target, clazz)) {
continue;
}
plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatDetector.java
+2 -1
View File
@@ -17,6 +17,7 @@ package com.navercorp.pinpoint.plugin.tomcat;
import com.navercorp.pinpoint.bootstrap.plugin.ApplicationTypeDetector;
import com.navercorp.pinpoint.bootstrap.resolver.ConditionProvider;
import com.navercorp.pinpoint.common.trace.ServiceType;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import java.util.Arrays;
import java.util.List;
@@ -37,7 +38,7 @@ public class TomcatDetector implements ApplicationTypeDetector {
private final List<String> bootstrapMains;
public TomcatDetector(List<String> bootstrapMains) {
if (bootstrapMains == null || bootstrapMains.isEmpty()) {
if (CollectionUtils.isEmpty(bootstrapMains)) {
this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN);
} else {
this.bootstrapMains = bootstrapMains;
plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxDetector.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.navercorp.pinpoint.plugin.vertx;
import com.navercorp.pinpoint.bootstrap.plugin.ApplicationTypeDetector;
import com.navercorp.pinpoint.bootstrap.resolver.ConditionProvider;
import com.navercorp.pinpoint.common.trace.ServiceType;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import java.util.Arrays;
import java.util.List;
@@ -33,7 +34,7 @@ public class VertxDetector implements ApplicationTypeDetector {
private final List<String> bootstrapMains;
public VertxDetector(List<String> bootstrapMains) {
if (bootstrapMains == null || bootstrapMains.isEmpty()) {
if (CollectionUtils.isEmpty(bootstrapMains)) {
this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN);
} else {
this.bootstrapMains = bootstrapMains;
profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/PartitionedByteBufferLocator.java
+2 -1
View File
@@ -16,6 +16,7 @@
package com.navercorp.pinpoint.profiler.sender;
import com.navercorp.pinpoint.common.util.CollectionUtils;
import com.navercorp.pinpoint.rpc.util.ListUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +41,7 @@ public class PartitionedByteBufferLocator {
if (buffer == null) {
throw new NullPointerException("buffer may not be null.");
}
if (partitionIndexList == null || partitionIndexList.isEmpty()) {
if (CollectionUtils.isEmpty(partitionIndexList)) {
throw new NullPointerException("buffer may not be null or zero.");
}
web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanAlign.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.navercorp.pinpoint.common.server.bo.AnnotationBo;
import com.navercorp.pinpoint.common.server.bo.SpanBo;
import com.navercorp.pinpoint.common.server.bo.SpanEventBo;
import com.navercorp.pinpoint.common.util.TransactionIdUtils;
import org.apache.commons.collections.CollectionUtils;
/**
* @author emeroad
@@ -46,7 +47,7 @@ public class SpanAlign {
this.spanEventBo = null;
this.span = true;
List<SpanEventBo> spanEvents = this.spanBo.getSpanEventBoList();
if (spanEvents == null || spanEvents.isEmpty()) {
if (CollectionUtils.isEmpty(spanEvents)) {
this.hasChild = false;
} else {
this.hasChild = true;
web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentEventDao.java
+1 -3
View File
@@ -22,8 +22,6 @@ import java.util.Set;
import com.navercorp.pinpoint.web.mapper.AgentEventResultsExtractor;
import org.apache.commons.collections.CollectionUtils;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.filter.BinaryComparator;
import org.apache.hadoop.hbase.filter.CompareFilter;
@@ -114,7 +112,7 @@ public class HbaseAgentEventDao implements AgentEventDao {
byte[] qualifier = Bytes.toBytes(eventType.getCode());
List<AgentEventBo> events = this.hbaseOperations2.get(HBaseTables.AGENT_EVENT, rowKey,
HBaseTables.AGENT_EVENT_CF_EVENTS, qualifier, this.agentEventMapper);
if (events == null || events.isEmpty()) {
if (CollectionUtils.isEmpty(events)) {
return null;
}
return events.get(0);
web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class HbaseAgentInfoDao implements AgentInfoDao {
@Override
public List<AgentInfo> getInitialAgentInfos(List<String> agentIds) {
if (agentIds == null || agentIds.isEmpty()) {
if (CollectionUtils.isEmpty(agentIds)) {
return Collections.emptyList();
}
List<Scan> scans = new ArrayList<>(agentIds.size());
web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java
+1 -1
View File
@@ -355,7 +355,7 @@ public class SpanServiceImpl implements SpanService {
private StringMetaDataBo selectStringMetaData(String agentId, int cacheId, long agentStartTime) {
final List<StringMetaDataBo> metaDataList = stringMetaDataDao.getStringMetaData(agentId, agentStartTime, cacheId);
if (metaDataList == null || metaDataList.isEmpty()) {
if (CollectionUtils.isEmpty(metaDataList)) {
logger.warn("StringMetaData not Found agent:{}, cacheId{}, agentStartTime:{}", agentId, cacheId, agentStartTime);
StringMetaDataBo stringMetaDataBo = new StringMetaDataBo(agentId, agentStartTime, cacheId);
stringMetaDataBo.setStringValue("STRING-META-DATA-NOT-FOUND");
web/src/main/java/com/navercorp/pinpoint/web/service/TransactionInfoServiceImpl.java
+3 -2
View File
@@ -41,6 +41,7 @@ import com.navercorp.pinpoint.web.vo.callstacks.Record;
import com.navercorp.pinpoint.web.vo.callstacks.RecordFactory;
import com.navercorp.pinpoint.web.vo.callstacks.RecordSet;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -229,7 +230,7 @@ public class TransactionInfoServiceImpl implements TransactionInfoService {
// }
private long getStartTime(List<SpanAlign> spanAlignList) {
if (spanAlignList == null || spanAlignList.isEmpty()) {
if (CollectionUtils.isEmpty(spanAlignList)) {
return 0;
}
SpanAlign spanAlign = spanAlignList.get(0);
@@ -237,7 +238,7 @@ public class TransactionInfoServiceImpl implements TransactionInfoService {
}
private long getEndTime(List<SpanAlign> spanAlignList) {
if (spanAlignList == null || spanAlignList.isEmpty()) {
if (CollectionUtils.isEmpty(spanAlignList)) {
return 0;
}
SpanAlign spanAlign = spanAlignList.get(0);
web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java
+4 -3
View File
@@ -17,6 +17,7 @@ package com.navercorp.pinpoint.web.calltree.span;
import static org.junit.Assert.assertEquals;
import org.apache.commons.collections.CollectionUtils;
import org.junit.Test;
import org.slf4j.Logger;
@@ -472,15 +473,15 @@ public class CallTreeIteratorTest {
while (iterator.hasNext()) {
CallTreeNode node = iterator.next();
SpanAlign align = node.getValue();
if (check && depths != null && !depths.isEmpty()) {
if (check && CollectionUtils.isNotEmpty(depths)) {
final int depth = depths.poll();
assertEquals("depth " + index, depth, align.getDepth());
}
if (check && gaps != null && !gaps.isEmpty()) {
if (check && CollectionUtils.isNotEmpty(gaps)) {
final int gap = gaps.poll();
assertEquals("gap " + index, gap, align.getGap());
}
if (check && execs != null && !execs.isEmpty()) {
if (check && CollectionUtils.isNotEmpty(execs)) {
final int exec = execs.poll();
assertEquals("exec " + index, exec, align.getExecutionMilliseconds());
}