[pinpoint-apm#2815] change StringUtils API

- isNotEmpty(String) -> hasLength(String)
emeroad · Jun 12, 2017 · 67c9ae8 · 67c9ae8
1 parent cb199f3
commit 67c9ae8
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 18 deletions.
diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/StringUtils.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/StringUtils.java
@@ -40,7 +40,7 @@ public static boolean isEmpty(final String string) {
         return string == null || string.isEmpty();
     }
 
-    public static boolean isNotEmpty(final String string) {
+    public static boolean hasLength(final String string) {
         return string != null && string.length() > 0;
     }
 

diff --git a/...rcorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java b/...rcorp/pinpoint/plugin/httpclient3/interceptor/HttpMethodBaseExecuteMethodInterceptor.java
@@ -405,7 +405,7 @@ private void recordCookie(HttpMethod httpMethod, Trace trace) {
         }
 
         final String value = cookie.getValue();
-        if (StringUtils.isNotEmpty(value)) {
+        if (StringUtils.hasLength(value)) {
             if (cookieSampler.isSampling()) {
                 final SpanEventRecorder recorder = trace.currentSpanEventRecorder();
                 recorder.recordAttribute(AnnotationKey.HTTP_COOKIE, StringUtils.abbreviate(value, MAX_READ_SIZE));

diff --git a/.../pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java b/.../pinpoint/plugin/httpclient4/interceptor/HttpRequestExecutorExecuteMethodInterceptor.java
@@ -297,7 +297,7 @@ protected void recordCookie(HttpMessage httpMessage, Trace trace) {
         org.apache.http.Header[] cookies = httpMessage.getHeaders("Cookie");
         for (org.apache.http.Header header : cookies) {
             final String value = header.getValue();
-            if (StringUtils.isNotEmpty(value)) {
+            if (StringUtils.hasLength(value)) {
                 if (cookieSampler.isSampling()) {
                     final SpanEventRecorder recorder = trace.currentSpanEventRecorder();
                     recorder.recordAttribute(AnnotationKey.HTTP_COOKIE, StringUtils.abbreviate(value, 1024));

diff --git a/...a/com/navercorp/pinpoint/plugin/jboss/interceptor/StandardHostValveInvokeInterceptor.java b/...a/com/navercorp/pinpoint/plugin/jboss/interceptor/StandardHostValveInvokeInterceptor.java
@@ -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 (StringUtils.isNotEmpty(parameters)) {
+                    if (StringUtils.hasLength(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
@@ -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 (StringUtils.isNotEmpty(parameters)) {
+            if (StringUtils.hasLength(parameters)) {
                 recorder.recordAttribute(AnnotationKey.HTTP_PARAM, parameters);
             }
 

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
@@ -29,7 +29,7 @@ public ServiceType getApplicationType() {
 
     @Override
     public boolean detect(ConditionProvider provider) {
-        if (StringUtils.isNotEmpty(bootstrapMains)) {
+        if (StringUtils.hasLength(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
@@ -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 (StringUtils.isNotEmpty(parameters)) {
+                    if (StringUtils.hasLength(parameters)) {
                         recorder.recordAttribute(AnnotationKey.HTTP_PARAM, parameters);
                     }
                 }

diff --git a/...ns/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansConfig.java b/...ns/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansConfig.java
@@ -63,23 +63,23 @@ private Map<Integer, SpringBeansTarget> addBackwardCompatibilityTarget(ProfilerC
         final Map<Integer, SpringBeansTarget> result = new HashMap<Integer, SpringBeansTarget>();
         final String namePatternRegexs = config.readString(SPRING_BEANS_NAME_PATTERN, null);
         // bean name.
-        if (StringUtils.isNotEmpty(namePatternRegexs)) {
+        if (StringUtils.hasLength(namePatternRegexs)) {
             final SpringBeansTarget target = new SpringBeansTarget();
             target.setNamePatterns(namePatternRegexs);
             result.put(-1, target);
         }
 
         // class name.
         final String classPatternRegexs = config.readString(SPRING_BEANS_CLASS_PATTERN, null);
-        if (StringUtils.isNotEmpty(classPatternRegexs)) {
+        if (StringUtils.hasLength(classPatternRegexs)) {
             final SpringBeansTarget target = new SpringBeansTarget();
             target.setClassPatterns(classPatternRegexs);
             result.put(-2, target);
         }
 
         // annotation.
         final String annotations = config.readString(SPRING_BEANS_ANNOTATION, null);
-        if (StringUtils.isNotEmpty(annotations)) {
+        if (StringUtils.hasLength(annotations)) {
             final SpringBeansTarget target = new SpringBeansTarget();
             target.setAnnotations(annotations);
             result.put(-3, target);

diff --git a/.../com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardHostValveInvokeInterceptor.java b/.../com/navercorp/pinpoint/plugin/tomcat/interceptor/StandardHostValveInvokeInterceptor.java
@@ -317,7 +317,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 (StringUtils.isNotEmpty(parameters)) {
+                    if (StringUtils.hasLength(parameters)) {
                         recorder.recordAttribute(AnnotationKey.HTTP_PARAM, parameters);
                     }
                 }

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/Span.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/Span.java
@@ -82,7 +82,7 @@ public void addAnnotation(Annotation annotation) {
 
     public void setExceptionInfo(int exceptionClassId, String exceptionMessage) {
         final TIntStringValue exceptionInfo = new TIntStringValue(exceptionClassId);
-        if (StringUtils.isNotEmpty(exceptionMessage)) {
+        if (StringUtils.hasLength(exceptionMessage)) {
             exceptionInfo.setStringValue(exceptionMessage);
         }
         super.setExceptionInfo(exceptionInfo);

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/SpanEvent.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/SpanEvent.java
@@ -63,7 +63,7 @@ public void setExceptionInfo(boolean markError, int exceptionClassId, String exc
 
     void setExceptionInfo(int exceptionClassId, String exceptionMessage) {
         final TIntStringValue exceptionInfo = new TIntStringValue(exceptionClassId);
-        if (StringUtils.isNotEmpty(exceptionMessage)) {
+        if (StringUtils.hasLength(exceptionMessage)) {
             exceptionInfo.setStringValue(exceptionMessage);
         }
         super.setExceptionInfo(exceptionInfo);

diff --git a/.../main/java/com/navercorp/pinpoint/profiler/context/recorder/WrappedSpanEventRecorder.java b/.../main/java/com/navercorp/pinpoint/profiler/context/recorder/WrappedSpanEventRecorder.java
@@ -19,7 +19,6 @@
 import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.profiler.context.Annotation;
 import com.navercorp.pinpoint.profiler.context.DefaultTrace;
-import com.navercorp.pinpoint.profiler.context.Span;
 import com.navercorp.pinpoint.profiler.context.SpanEvent;
 import com.navercorp.pinpoint.profiler.metadata.SqlMetaDataService;
 import com.navercorp.pinpoint.profiler.metadata.StringMetaDataService;
@@ -82,10 +81,10 @@ public void recordSqlParsingResult(ParsingResult parsingResult, String bindValue
 
         final TIntStringStringValue tSqlValue = new TIntStringStringValue(parsingResult.getId());
         final String output = parsingResult.getOutput();
-        if (StringUtils.isNotEmpty(output)) {
+        if (StringUtils.hasLength(output)) {
             tSqlValue.setStringValue1(output);
         }
-        if (StringUtils.isNotEmpty(bindValue)) {
+        if (StringUtils.hasLength(bindValue)) {
             tSqlValue.setStringValue2(bindValue);
         }
         recordSqlParam(tSqlValue);

diff --git a/rpc/src/main/java/com/navercorp/pinpoint/rpc/client/PinpointClientHandshaker.java b/rpc/src/main/java/com/navercorp/pinpoint/rpc/client/PinpointClientHandshaker.java
@@ -223,7 +223,7 @@ private ClusterOption getClusterOption(Map handshakeResponse) {
     private List<Role> getRoles(List roleNames) {
         List<Role> roles = new ArrayList<Role>();
         for (Object roleName : roleNames) {
-            if (roleName instanceof String && StringUtils.isNotEmpty((String) roleName)) {
+            if (roleName instanceof String && StringUtils.hasLength((String) roleName)) {
                 roles.add(Role.getValue((String) roleName));
             }
         }

diff --git a/rpc/src/main/java/com/navercorp/pinpoint/rpc/server/DefaultPinpointServer.java b/rpc/src/main/java/com/navercorp/pinpoint/rpc/server/DefaultPinpointServer.java
@@ -402,7 +402,7 @@ private ClusterOption getClusterOption(Map handshakeResponse) {
     private List<Role> getRoles(List roleNames) {
         List<Role> roles = new ArrayList<Role>();
         for (Object roleName : roleNames) {
-            if (roleName instanceof String && StringUtils.isNotEmpty((String) roleName)) {
+            if (roleName instanceof String && StringUtils.hasLength((String) roleName)) {
                 roles.add(Role.getValue((String) roleName));
             }
         }