[#noissue] Cleanup

kojandy · Jun 5, 2023 · 91c9ba7 · 91c9ba7
1 parent cba8871
commit 91c9ba7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/...server/src/main/java/com/navercorp/pinpoint/common/server/trace/ApiDescriptionParser.java b/...server/src/main/java/com/navercorp/pinpoint/common/server/trace/ApiDescriptionParser.java
@@ -19,20 +19,18 @@
 import com.navercorp.pinpoint.common.server.bo.ApiMetaDataBo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 
 import java.util.Objects;
 import java.util.regex.Pattern;
 
+import static com.navercorp.pinpoint.common.server.util.ObjectUtils.EMPTY_STRING_ARRAY;
+
 /**
  * Similar to MethodDescriptor, but instead parses string-based values.
  * @author emeroad
  */
 public class ApiDescriptionParser {
-    private final Logger logger = LogManager.getLogger(this.getClass());
 
-    private static final String[] EMPTY_STRING_ARRAY = new String[0];
     private static final char DOT = '.';
     private static final char METHOD_PARAM_START = '(';
     private static final char METHOD_PARAM_END = ')';

diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/ObjectUtils.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/ObjectUtils.java
@@ -0,0 +1,13 @@
+package com.navercorp.pinpoint.common.server.util;
+
+public final class ObjectUtils {
+    private ObjectUtils() {
+    }
+
+    public static final String EMPTY_STRING = "";
+    public static final String NULL_STRING = "null";
+
+    public static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
+    public static final String[] EMPTY_STRING_ARRAY = new String[0];
+
+}
diff --git a/...avercorp/pinpoint/plugin/mongo/interceptor/MongoCollectionImplConstructorInterceptor.java b/...avercorp/pinpoint/plugin/mongo/interceptor/MongoCollectionImplConstructorInterceptor.java
@@ -77,7 +77,7 @@ public void after(Object target, Object[] args, Object result, Throwable throwab
             }
 
             final DatabaseInfo databaseInfo = new MongoDatabaseInfo(MongoConstants.MONGODB, MongoConstants.MONGO_EXECUTE_QUERY,
-                    null, null, Collections.EMPTY_LIST, databaseId, collectionName, readPreferenceName, writeConcernName);
+                    null, null, Collections.emptyList(), databaseId, collectionName, readPreferenceName, writeConcernName);
             ((DatabaseInfoAccessor) target)._$PINPOINT$_setDatabaseInfo(databaseInfo);
             if (isDebug) {
                 logger.debug("Set databaseInfo={}", databaseId);

diff --git a/...point/plugin/mongo/interceptor/ReactiveMongoOperationPublisherConstructorInterceptor.java b/...point/plugin/mongo/interceptor/ReactiveMongoOperationPublisherConstructorInterceptor.java
@@ -20,7 +20,6 @@
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
-import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.internal.MongoClientImpl;
 import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo;
 import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
@@ -112,6 +111,6 @@ List<String> getHostList(Object[] args) {
                 }
             }
         }
-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
     }
 }
diff --git a/...istat-collector/src/main/java/com/navercorp/pinpoint/uristat/collector/model/UriStat.java b/...istat-collector/src/main/java/com/navercorp/pinpoint/uristat/collector/model/UriStat.java
@@ -22,8 +22,9 @@
 import java.util.Arrays;
 import java.util.Objects;
 
+import static com.navercorp.pinpoint.common.server.util.ObjectUtils.EMPTY_STRING;
+
 public class UriStat {
-    private static final String EMPTY_STRING = "";
     private static final long EMPTY_NUMBER = 0L;
     private final String tenantId;
     private final String serviceName;

diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/model/UriStatGroup.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/model/UriStatGroup.java
@@ -17,28 +17,28 @@
 package com.navercorp.pinpoint.uristat.web.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.navercorp.pinpoint.common.server.util.ObjectUtils;
 import com.navercorp.pinpoint.metric.common.model.StringPrecondition;
 import com.navercorp.pinpoint.metric.web.util.TimeWindow;
 import com.navercorp.pinpoint.metric.web.view.TimeSeriesValueView;
 import com.navercorp.pinpoint.metric.web.view.TimeseriesValueGroupView;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.Arrays;
 import java.util.stream.Collectors;
 
 public class UriStatGroup implements TimeseriesValueGroupView {
-    private static final String EMPTY_STRING = "";
     private final String uri;
 
     private final List<TimeSeriesValueView> values;
 
     public static final UriStatGroup EMPTY_URI_STAT_GROUP = new UriStatGroup();
 
     public UriStatGroup() {
-        this.uri = EMPTY_STRING;
+        this.uri = ObjectUtils.EMPTY_STRING;
         this.values = Collections.emptyList();
     }