From 43ee420b165035a56ee12cfe37cf980a3da5a6ce Mon Sep 17 00:00:00 2001 From: emeroad Date: Mon, 17 Apr 2017 15:12:31 +0900 Subject: [PATCH] [#noissue] Apply CollectionUtils.isEmpty() & isNotEmpty() --- .../bootstrap/resolver/ConditionProvider.java | 3 ++- .../pinpoint/collector/dao/AutoFlusher.java | 3 ++- .../SpanStreamUDPPacketHandlerFactory.java | 5 ++-- .../stat/AgentStatHbaseOperationFactory.java | 3 ++- .../pinpoint/common/util/CollectionUtils.java | 10 ++++---- .../plugin/dubbo/DubboProviderDetector.java | 3 ++- .../pinpoint/plugin/jboss/JbossDetector.java | 3 ++- .../pinpoint/plugin/jetty/JettyDetector.java | 3 ++- .../ExecuteRequestInterceptor.java | 4 ++- .../spring/boot/SpringBootDetector.java | 3 ++- .../spring/beans/SpringBeansTarget.java | 11 ++++---- .../beans/interceptor/TargetBeanFilter.java | 25 +++++++++++++------ .../plugin/tomcat/TomcatDetector.java | 3 ++- .../pinpoint/plugin/vertx/VertxDetector.java | 3 ++- .../sender/PartitionedByteBufferLocator.java | 3 ++- .../pinpoint/web/calltree/span/SpanAlign.java | 3 ++- .../web/dao/hbase/HbaseAgentEventDao.java | 4 +-- .../web/dao/hbase/HbaseAgentInfoDao.java | 2 +- .../pinpoint/web/service/SpanServiceImpl.java | 2 +- .../service/TransactionInfoServiceImpl.java | 5 ++-- .../calltree/span/CallTreeIteratorTest.java | 7 +++--- 21 files changed, 66 insertions(+), 42 deletions(-) diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/resolver/ConditionProvider.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/resolver/ConditionProvider.java index affbfdf5d..08921c9ec 100644 --- a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/resolver/ConditionProvider.java +++ b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/resolver/ConditionProvider.java @@ -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 candidates) { - if (candidates == null || candidates.isEmpty()) { + if (CollectionUtils.isEmpty(candidates)) { return false; } for (String candidate : candidates) { diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/dao/AutoFlusher.java b/collector/src/main/java/com/navercorp/pinpoint/collector/dao/AutoFlusher.java index 50daa8c3b..9d5a28fbc 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/dao/AutoFlusher.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/dao/AutoFlusher.java @@ -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; } diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPPacketHandlerFactory.java b/collector/src/main/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPPacketHandlerFactory.java index aa83ac1bb..9da15d8d9 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPPacketHandlerFactory.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPPacketHandlerFactory.java @@ -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 impleme } List> tbaseList = deserializer.deserializeList(componentData); - if (tbaseList == null || tbaseList.isEmpty()) { + if (CollectionUtils.isEmpty(tbaseList)) { continue; } @@ -146,7 +147,7 @@ public class SpanStreamUDPPacketHandlerFactory impleme } private List getSpanEventList(List> tbaseList) { - if (tbaseList == null || tbaseList.isEmpty()) { + if (CollectionUtils.isEmpty(tbaseList)) { return new ArrayList<>(0); } diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactory.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactory.java index aa38e01ed..6b598ace0 100644 --- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactory.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactory.java @@ -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 List createPuts(String agentId, AgentStatType agentStatType, List agentStatDataPoints, HbaseSerializer, Put> agentStatSerializer) { - if (agentStatDataPoints == null || agentStatDataPoints.isEmpty()) { + if (CollectionUtils.isEmpty(agentStatDataPoints)) { return Collections.emptyList(); } Map> timeslots = slotAgentStatDataPoints(agentStatDataPoints); diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/CollectionUtils.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/CollectionUtils.java index dd0f9b9c9..1e59f878d 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/util/CollectionUtils.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/util/CollectionUtils.java @@ -27,22 +27,22 @@ public final class CollectionUtils { private CollectionUtils() { } - public static int nullSafeSize(Collection collection) { + public static int nullSafeSize(final Collection collection) { return nullSafeSize(collection, 0); } - public static int nullSafeSize(Collection collection, int nullValue) { + public static int nullSafeSize(final Collection collection, final int nullValue) { if (collection == null) { return nullValue; } return collection.size(); } - public static boolean isEmpty(Collection collection) { + public static boolean isEmpty(final Collection collection) { return collection == null || collection.isEmpty(); } - public static boolean isNotEmpty(Collection collection) { - return !isEmpty(collection); + public static boolean isNotEmpty(final Collection collection) { + return collection != null && !collection.isEmpty(); } } diff --git a/plugins/dubbo/src/main/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderDetector.java b/plugins/dubbo/src/main/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderDetector.java index e0cff5675..9930d6a04 100644 --- a/plugins/dubbo/src/main/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderDetector.java +++ b/plugins/dubbo/src/main/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderDetector.java @@ -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 bootstrapMains; public DubboProviderDetector(List bootstrapMains) { - if (bootstrapMains == null || bootstrapMains.isEmpty()) { + if (CollectionUtils.isEmpty(bootstrapMains)) { this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN); } else { this.bootstrapMains = bootstrapMains; diff --git a/plugins/jboss/src/main/java/com/navercorp/pinpoint/plugin/jboss/JbossDetector.java b/plugins/jboss/src/main/java/com/navercorp/pinpoint/plugin/jboss/JbossDetector.java index 6134d47a2..eebb9b1c4 100644 --- a/plugins/jboss/src/main/java/com/navercorp/pinpoint/plugin/jboss/JbossDetector.java +++ b/plugins/jboss/src/main/java/com/navercorp/pinpoint/plugin/jboss/JbossDetector.java @@ -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 bootstrapMains; public JbossDetector(List bootstrapMains) { - if (bootstrapMains == null || bootstrapMains.isEmpty()) { + if (CollectionUtils.isEmpty(bootstrapMains)) { this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN); } else { this.bootstrapMains = bootstrapMains; diff --git a/plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/JettyDetector.java b/plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/JettyDetector.java index f20a2e79e..550904c29 100644 --- a/plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/JettyDetector.java +++ b/plugins/jetty/src/main/java/com/navercorp/pinpoint/plugin/jetty/JettyDetector.java @@ -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 bootstrapMains; public JettyDetector(List bootstrapMains) { - if (bootstrapMains == null || bootstrapMains.isEmpty()) { + if (CollectionUtils.isEmpty(bootstrapMains)) { this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN); } else { this.bootstrapMains = bootstrapMains; diff --git a/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java b/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java index 248706ade..58829ccdf 100644 --- a/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java +++ b/plugins/ning-asynchttpclient/src/main/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java @@ -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 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 iterator = parts.iterator(); while (iterator.hasNext()) { diff --git a/plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java b/plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java index 47a3eff8b..0ec896197 100644 --- a/plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java +++ b/plugins/spring-boot/src/main/java/com/navercorp/pinpoint/plugin/spring/boot/SpringBootDetector.java @@ -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 bootstrapMains; public SpringBootDetector(List bootstrapMains) { - if (bootstrapMains == null || bootstrapMains.isEmpty()) { + if (CollectionUtils.isEmpty(bootstrapMains)) { this.bootstrapMains = Arrays.asList(DEFAULT_SPRING_BOOT_BOOSTRAP_MAINS); } else { this.bootstrapMains = bootstrapMains; diff --git a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTarget.java b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTarget.java index 2e0b481c5..0a095a1ae 100644 --- a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTarget.java +++ b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTarget.java @@ -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 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 compilePattern(List patternStrings, final String separator) { - if (patternStrings == null || patternStrings.isEmpty()) { + if (CollectionUtils.isEmpty(patternStrings)) { return null; } diff --git a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilter.java b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilter.java index 4952bbc91..7b1d10a9f 100644 --- a/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilter.java +++ b/plugins/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilter.java @@ -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 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 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 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 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 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 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 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 annotations = target.getAnnotations(); + if (CollectionUtils.isNotEmpty(annotations)) { if (!isAnnotationTarget(target, clazz)) { continue; } diff --git a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatDetector.java b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatDetector.java index d12a52a36..4e5b88041 100644 --- a/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatDetector.java +++ b/plugins/tomcat/src/main/java/com/navercorp/pinpoint/plugin/tomcat/TomcatDetector.java @@ -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 bootstrapMains; public TomcatDetector(List bootstrapMains) { - if (bootstrapMains == null || bootstrapMains.isEmpty()) { + if (CollectionUtils.isEmpty(bootstrapMains)) { this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN); } else { this.bootstrapMains = bootstrapMains; diff --git a/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxDetector.java b/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxDetector.java index 864cbe643..240e52fcc 100644 --- a/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxDetector.java +++ b/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxDetector.java @@ -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 bootstrapMains; public VertxDetector(List bootstrapMains) { - if (bootstrapMains == null || bootstrapMains.isEmpty()) { + if (CollectionUtils.isEmpty(bootstrapMains)) { this.bootstrapMains = Arrays.asList(DEFAULT_BOOTSTRAP_MAIN); } else { this.bootstrapMains = bootstrapMains; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/PartitionedByteBufferLocator.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/PartitionedByteBufferLocator.java index c25c4bd8f..2e097dd0c 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/PartitionedByteBufferLocator.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/PartitionedByteBufferLocator.java @@ -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."); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanAlign.java b/web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanAlign.java index 4d99b8905..e6533d444 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanAlign.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanAlign.java @@ -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 spanEvents = this.spanBo.getSpanEventBoList(); - if (spanEvents == null || spanEvents.isEmpty()) { + if (CollectionUtils.isEmpty(spanEvents)) { this.hasChild = false; } else { this.hasChild = true; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentEventDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentEventDao.java index d00c0fd1e..bf853e782 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentEventDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentEventDao.java @@ -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 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); diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java index 89bc46e7b..00e9fe199 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentInfoDao.java @@ -65,7 +65,7 @@ public class HbaseAgentInfoDao implements AgentInfoDao { @Override public List getInitialAgentInfos(List agentIds) { - if (agentIds == null || agentIds.isEmpty()) { + if (CollectionUtils.isEmpty(agentIds)) { return Collections.emptyList(); } List scans = new ArrayList<>(agentIds.size()); diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java index eadee8639..6bb1afa77 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java @@ -355,7 +355,7 @@ public class SpanServiceImpl implements SpanService { private StringMetaDataBo selectStringMetaData(String agentId, int cacheId, long agentStartTime) { final List 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"); diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/TransactionInfoServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/TransactionInfoServiceImpl.java index 7bbe42ae2..ff205dec2 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/TransactionInfoServiceImpl.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/TransactionInfoServiceImpl.java @@ -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 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 spanAlignList) { - if (spanAlignList == null || spanAlignList.isEmpty()) { + if (CollectionUtils.isEmpty(spanAlignList)) { return 0; } SpanAlign spanAlign = spanAlignList.get(0); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java index 15fd78a9f..f9a888169 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java @@ -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()); }