[pinpoint-apm#2815] Apply StringUtils.isEmpty() & isNotEmpty()

emeroad · Apr 14, 2017 · 284ee9c · 284ee9c
1 parent 68fccae
commit 284ee9c
Show file tree

Hide file tree

Showing 37 changed files with 85 additions and 55 deletions.
diff --git a/...strap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ExcludeMethodFilter.java b/...strap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ExcludeMethodFilter.java
@@ -1,6 +1,6 @@
 package com.navercorp.pinpoint.bootstrap.config;
 
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -19,7 +19,7 @@ public ExcludeMethodFilter(String excludeFormat, String separator) {
             this.excludeMethods = Collections.emptySet();
             return;
         }
-        final List<String> splitList = StringUtils.splitAndTrim(excludeFormat, separator);
+        final List<String> splitList = StringUtils.tokenizeToStringList(excludeFormat, separator);
         this.excludeMethods = new HashSet<String>();
         for (String method : splitList) {
             this.excludeMethods.add(method.toUpperCase());

diff --git a/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ExcludePathFilter.java b/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ExcludePathFilter.java
@@ -19,7 +19,7 @@
 import com.navercorp.pinpoint.bootstrap.util.AntPathMatcher;
 import com.navercorp.pinpoint.bootstrap.util.EqualsPathMatcher;
 import com.navercorp.pinpoint.bootstrap.util.PathMatcher;
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52,7 +52,7 @@ public ExcludePathFilter(String excludePathFormatString, String pathSeparator, S
             this.excludePathMatchers = Collections.emptyList();
             return;
         }
-        final List<String> excludePathFormats = StringUtils.splitAndTrim(excludePathFormatString, formatSeparator);
+        final List<String> excludePathFormats = StringUtils.tokenizeToStringList(excludePathFormatString, formatSeparator);
         final List<PathMatcher> excludePathMatchers = new ArrayList<PathMatcher>(excludePathFormats.size());
         for (String excludePathFormat : excludePathFormats) {
             final PathMatcher pathMatcher = createPathMatcher(excludePathFormat, pathSeparator);

diff --git a/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilter.java b/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilter.java
@@ -16,6 +16,8 @@
 
 package com.navercorp.pinpoint.bootstrap.config;
 
+import com.navercorp.pinpoint.common.util.StringUtils;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -28,7 +30,7 @@ public class ProfilableClassFilter implements Filter<String> {
     private final Set<String> profileIncludeSub = new HashSet<String>();
 
     public ProfilableClassFilter(String profilableClass) {
-        if (profilableClass == null || profilableClass.isEmpty()) {
+        if (StringUtils.isEmpty(profilableClass)) {
             return;
         }
         String[] className = profilableClass.split(",");

diff --git a/.../src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/bindvalue/BindValueUtils.java b/.../src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/bindvalue/BindValueUtils.java
@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.plugin.jdbc.bindvalue;
 
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 import java.util.Map;
 

diff --git a/.../main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/bindvalue/ClassNameConverter.java b/.../main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/bindvalue/ClassNameConverter.java
@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.plugin.jdbc.bindvalue;
 
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 /**
  * @author emeroad

diff --git a/...src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/bindvalue/ObjectConverter.java b/...src/main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/bindvalue/ObjectConverter.java
@@ -22,8 +22,8 @@
 import java.sql.Time;
 import java.sql.Timestamp;
 
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.util.ArrayUtils;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 /**
  * @author emeroad

diff --git a/...main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/bindvalue/SimpleTypeConverter.java b/...main/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/bindvalue/SimpleTypeConverter.java
@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.plugin.jdbc.bindvalue;
 
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 /**
  * @author emeroad

diff --git a/.../src/main/java/com/navercorp/pinpoint/bootstrap/resolver/condition/PropertyCondition.java b/.../src/main/java/com/navercorp/pinpoint/bootstrap/resolver/condition/PropertyCondition.java
@@ -19,6 +19,7 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.common.util.SimpleProperty;
+import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.common.util.SystemProperty;
 
 /**
@@ -48,7 +49,7 @@ public PropertyCondition(SimpleProperty property) {
      */
     @Override
     public boolean check(String requiredKey) {
-        if (requiredKey == null || requiredKey.isEmpty()) {
+        if (StringUtils.isEmpty(requiredKey)) {
             return false;
         }
         if (this.property.getProperty(requiredKey) != null) {

diff --git a/...main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperClusterService.java b/...main/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperClusterService.java
@@ -24,7 +24,7 @@
 import com.navercorp.pinpoint.collector.config.CollectorConfiguration;
 import com.navercorp.pinpoint.collector.util.CollectorUtils;
 import com.navercorp.pinpoint.rpc.server.handler.ServerStateChangeEventHandler;
-import com.navercorp.pinpoint.rpc.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher.Event.EventType;
@@ -78,7 +78,7 @@ public ZookeeperClusterService(CollectorConfiguration config, ClusterPointRouter
             CollectorClusterConnector clusterConnector = clusterConnectionFactory.createConnector();
 
             CollectorClusterAcceptor clusterAcceptor = null;
-            if (!StringUtils.isEmpty(config.getClusterListenIp()) && config.getClusterListenPort() > 0) {
+            if (StringUtils.isNotEmpty(config.getClusterListenIp()) && config.getClusterListenPort() > 0) {
                 InetSocketAddress bindAddress = new InetSocketAddress(config.getClusterListenIp(), config.getClusterListenPort());
                 clusterAcceptor = clusterConnectionFactory.createAcceptor(bindAddress, clusterRepository);
             }

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/DefaultSqlParser.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/DefaultSqlParser.java
@@ -466,7 +466,10 @@ public String combineOutputParams(String sql, List<String> outputParams) {
     }
 
     public String combineBindValues(String sql, List<String> bindValues) {
-        if(sql == null || sql.isEmpty() || bindValues == null || bindValues.isEmpty()) {
+        if (StringUtils.isEmpty(sql)) {
+            return sql;
+        }
+        if (CollectionUtils.isEmpty(bindValues)) {
             return sql;
         }
 

diff --git a/...c/main/java/com/navercorp/pinpoint/plugin/activemq/client/ActiveMQClientPluginConfig.java b/...c/main/java/com/navercorp/pinpoint/plugin/activemq/client/ActiveMQClientPluginConfig.java
@@ -20,7 +20,8 @@
 import com.navercorp.pinpoint.bootstrap.config.Filter;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
 import com.navercorp.pinpoint.bootstrap.config.SkipFilter;
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
+import com.navercorp.pinpoint.common.util.StringUtils;
+
 
 /**
  * @author HyunGil Jeong

diff --git a/...rcorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java b/...rcorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.navercorp.pinpoint.common.util.StringUtils;
 import org.apache.commons.httpclient.HttpConnection;
 import org.apache.commons.httpclient.HttpConstants;
 import org.apache.commons.httpclient.HttpMethod;
@@ -49,7 +50,6 @@
 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.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
 import com.navercorp.pinpoint.plugin.httpclient3.HttpClient3CallContext;
 import com.navercorp.pinpoint.plugin.httpclient3.HttpClient3CallContextFactory;

diff --git a/...lugin/httpclient4/interceptor/DefaultClientExchangeHandlerImplStartMethodInterceptor.java b/...lugin/httpclient4/interceptor/DefaultClientExchangeHandlerImplStartMethodInterceptor.java
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 
+import com.navercorp.pinpoint.common.util.StringUtils;
 import org.apache.http.HeaderElement;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
@@ -48,7 +49,6 @@
 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.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
 import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4Constants;
 import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4PluginConfig;

diff --git a/.../pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java b/.../pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java
@@ -20,6 +20,7 @@
 
 import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScope;
 import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation;
+import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.plugin.httpclient4.HttpCallContext;
 import com.navercorp.pinpoint.plugin.httpclient4.HttpCallContextFactory;
 import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4PluginConfig;
@@ -52,7 +53,6 @@
 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.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
 import com.navercorp.pinpoint.plugin.httpclient4.HttpClient4Constants;
 

diff --git a/...a/com/navercorp/pinpoint/plugin/jboss/interceptor/MethodInvocationHandlerInterceptor.java b/...a/com/navercorp/pinpoint/plugin/jboss/interceptor/MethodInvocationHandlerInterceptor.java
@@ -29,7 +29,6 @@
 import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.plugin.jboss.JbossConstants;
 import com.navercorp.pinpoint.plugin.jboss.MethodInvocationHandlerMethodDescriptor;
 import com.navercorp.pinpoint.plugin.jboss.util.JbossUtility;
@@ -147,7 +146,7 @@ private void recordRootSpan(final SpanRecorder recorder, final String rpcName, f
 
         recorder.recordRpcName(rpcName);
 
-        final String serverHostName = StringUtils.defaultString(System.getProperty("jboss.host.name"), "");
+        final String serverHostName = System.getProperty("jboss.host.name", "");
         recorder.recordEndPoint(serverHostName);
 
         recorder.recordRemoteAddress(remoteAddress);

diff --git a/...a/com/navercorp/pinpoint/plugin/jboss/interceptor/StandardHostValveInvokeInterceptor.java b/...a/com/navercorp/pinpoint/plugin/jboss/interceptor/StandardHostValveInvokeInterceptor.java
@@ -36,9 +36,9 @@
 import com.navercorp.pinpoint.bootstrap.sampler.SamplingFlagUtils;
 import com.navercorp.pinpoint.bootstrap.util.NetworkUtils;
 import com.navercorp.pinpoint.bootstrap.util.NumberUtils;
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
 import com.navercorp.pinpoint.common.trace.ServiceType;
+import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.plugin.jboss.AsyncAccessor;
 import com.navercorp.pinpoint.plugin.jboss.JbossConfig;
 import com.navercorp.pinpoint.plugin.jboss.JbossConstants;
@@ -448,7 +448,7 @@ public void after(final Object target, final Object[] args, final Object result,
                 final HttpServletRequest request = (HttpServletRequest) args[0];
                 if (!excludeProfileMethodFilter.filter(request.getMethod())) {
                     final String parameters = getRequestParameter(request, 64, 512);
-                    if ((parameters != null) && (parameters.length() > 0)) {
+                    if (StringUtils.isNotEmpty(parameters)) {
                         recorder.recordAttribute(AnnotationKey.HTTP_PARAM, parameters);
                     }
                 }

diff --git a/...java/com/navercorp/pinpoint/plugin/jetty/interceptor/AbstractServerHandleInterceptor.java b/...java/com/navercorp/pinpoint/plugin/jetty/interceptor/AbstractServerHandleInterceptor.java
@@ -22,9 +22,9 @@
 import com.navercorp.pinpoint.bootstrap.sampler.SamplingFlagUtils;
 import com.navercorp.pinpoint.bootstrap.util.NetworkUtils;
 import com.navercorp.pinpoint.bootstrap.util.NumberUtils;
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
 import com.navercorp.pinpoint.common.trace.ServiceType;
+import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.plugin.jetty.JettyConstants;
 import com.navercorp.pinpoint.plugin.jetty.JettySyncMethodDescriptor;
 import org.eclipse.jetty.server.Request;
@@ -154,7 +154,7 @@ public void after(Object target, Object[] args, Object result, Throwable throwab
             SpanEventRecorder recorder = trace.currentSpanEventRecorder();
             final Request request = getRequest(args);
             final String parameters = getRequestParameter(request, 64, 512);
-            if (parameters != null && parameters.length() > 0) {
+            if (StringUtils.isNotEmpty(parameters)) {
                 recorder.recordAttribute(AnnotationKey.HTTP_PARAM, parameters);
             }
 

diff --git a/...navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java b/...navercorp/pinpoint/plugin/ning/asynchttpclient/interceptor/ExecuteRequestInterceptor.java
@@ -37,8 +37,8 @@
 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.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
+import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.plugin.ning.asynchttpclient.NingAsyncHttpClientPlugin;
 import com.navercorp.pinpoint.plugin.ning.asynchttpclient.NingAsyncHttpClientPluginConfig;
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;

diff --git a/.../navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineSendRequestMethodInterceptor.java b/.../navercorp/pinpoint/plugin/okhttp/interceptor/HttpEngineSendRequestMethodInterceptor.java
@@ -16,7 +16,11 @@
 package com.navercorp.pinpoint.plugin.okhttp.interceptor;
 
 import com.navercorp.pinpoint.bootstrap.config.DumpType;
-import com.navercorp.pinpoint.bootstrap.context.*;
+import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor;
+import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder;
+import com.navercorp.pinpoint.bootstrap.context.Trace;
+import com.navercorp.pinpoint.bootstrap.context.TraceContext;
+import com.navercorp.pinpoint.bootstrap.context.TraceId;
 import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
 import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Scope;
 import com.navercorp.pinpoint.bootstrap.interceptor.scope.AttachmentFactory;
@@ -27,9 +31,13 @@
 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.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
-import com.navercorp.pinpoint.plugin.okhttp.*;
+import com.navercorp.pinpoint.common.util.StringUtils;
+import com.navercorp.pinpoint.plugin.okhttp.ConnectionGetter;
+import com.navercorp.pinpoint.plugin.okhttp.OkHttpConstants;
+import com.navercorp.pinpoint.plugin.okhttp.OkHttpPluginConfig;
+import com.navercorp.pinpoint.plugin.okhttp.UserRequestGetter;
+import com.navercorp.pinpoint.plugin.okhttp.UserResponseGetter;
 import com.squareup.okhttp.Request;
 
 import java.net.URL;
@@ -192,7 +200,7 @@ private void recordRequest(Trace trace, Request request, Throwable throwable) {
     }
 
     private void recordCookie(Request request, Trace trace) {
-        for(String cookie : request.headers("Cookie")) {
+        for (String cookie : request.headers("Cookie")) {
             if(cookieSampler.isSampling()) {
                 final SpanEventRecorder recorder = trace.currentSpanEventRecorder();
                 recorder.recordAttribute(AnnotationKey.HTTP_COOKIE, StringUtils.abbreviate(cookie, 1024));

diff --git a/plugins/resin/src/main/java/com/navercorp/pinpoint/plugin/resin/ResinDetector.java b/plugins/resin/src/main/java/com/navercorp/pinpoint/plugin/resin/ResinDetector.java
@@ -3,6 +3,7 @@
 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.StringUtils;
 
 /**
  * 
@@ -28,7 +29,7 @@ public ServiceType getApplicationType() {
 
     @Override
     public boolean detect(ConditionProvider provider) {
-        if (bootstrapMains != null && !bootstrapMains.isEmpty()) {
+        if (StringUtils.isNotEmpty(bootstrapMains)) {
             return provider.checkMainClass(bootstrapMains) && provider.checkForClass(REQUIRED_CLASS);
         }
         return provider.checkForClass(REQUIRED_CLASS);

diff --git a/...in/java/com/navercorp/pinpoint/plugin/resin/interceptor/ServletInvocationInterceptor.java b/...in/java/com/navercorp/pinpoint/plugin/resin/interceptor/ServletInvocationInterceptor.java
@@ -26,9 +26,9 @@
 import com.navercorp.pinpoint.bootstrap.util.NumberUtils;
 import com.navercorp.pinpoint.bootstrap.util.SimpleSampler;
 import com.navercorp.pinpoint.bootstrap.util.SimpleSamplerFactory;
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.common.trace.AnnotationKey;
 import com.navercorp.pinpoint.common.trace.ServiceType;
+import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.plugin.resin.AsyncAccessor;
 import com.navercorp.pinpoint.plugin.resin.HttpServletRequestGetter;
 import com.navercorp.pinpoint.plugin.resin.ResinConfig;
@@ -137,7 +137,7 @@ public void after(Object target, Object[] args, Object result, Throwable throwab
                 final HttpServletRequest request = (HttpServletRequest) args[0];
                 if (!excludeProfileMethodFilter.filter(request.getMethod())) {
                     final String parameters = getRequestParameter(request, 64, 512);
-                    if (parameters != null && parameters.length() > 0) {
+                    if (StringUtils.isNotEmpty(parameters)) {
                         recorder.recordAttribute(AnnotationKey.HTTP_PARAM, parameters);
                     }
                 }

diff --git a/...rcorp/pinpoint/plugin/thrift/interceptor/client/TServiceClientReceiveBaseInterceptor.java b/...rcorp/pinpoint/plugin/thrift/interceptor/client/TServiceClientReceiveBaseInterceptor.java
@@ -16,13 +16,13 @@
 
 package com.navercorp.pinpoint.plugin.thrift.interceptor.client;
 
+import com.navercorp.pinpoint.common.util.StringUtils;
 import org.apache.thrift.TBase;
 
 import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor;
 import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder;
 import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.interceptor.SpanEventSimpleAroundInterceptorForPlugin;
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.plugin.thrift.ThriftConstants;
 
 /**

diff --git a/...avercorp/pinpoint/plugin/thrift/interceptor/client/TServiceClientSendBaseInterceptor.java b/...avercorp/pinpoint/plugin/thrift/interceptor/client/TServiceClientSendBaseInterceptor.java
@@ -22,6 +22,7 @@
 
 import com.navercorp.pinpoint.bootstrap.interceptor.annotation.Scope;
 import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScope;
+import com.navercorp.pinpoint.common.util.StringUtils;
 import org.apache.thrift.TBase;
 import org.apache.thrift.TServiceClient;
 import org.apache.thrift.protocol.TProtocol;
@@ -38,7 +39,6 @@
 import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation;
 import com.navercorp.pinpoint.bootstrap.logging.PLogger;
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
-import com.navercorp.pinpoint.bootstrap.util.StringUtils;
 import com.navercorp.pinpoint.plugin.thrift.ThriftConstants;
 import com.navercorp.pinpoint.plugin.thrift.ThriftRequestProperty;
 import com.navercorp.pinpoint.plugin.thrift.ThriftUtils;