Skip to content

Commit a3024f4

Browse files
emeroademeroad
committed
[#noissue] Cleanup
1 parent 793ad90 commit a3024f4

File tree

9 files changed

+26
-49
lines changed

9 files changed

+26
-49
lines changed

‎agent-module/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/util/spring/StringUtils.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
*/
4747
class StringUtils {
4848

49+
private static final String[] EMPTY_STRING_ARRAY = new String[0];
50+
4951
/**
5052
* Check whether the given {@code CharSequence} contains actual <em>text</em>.
5153
* <p>More specifically, this method returns {@code true} if the
@@ -149,7 +151,7 @@ public static String[] tokenizeToStringArray(
149151
if (trimTokens) {
150152
token = token.trim();
151153
}
152-
if (!ignoreEmptyTokens || token.length() > 0) {
154+
if (!ignoreEmptyTokens || !token.isEmpty()) {
153155
tokens.add(token);
154156
}
155157
}
@@ -168,7 +170,7 @@ public static String[] toStringArray(Collection<String> collection) {
168170
if (collection == null) {
169171
return null;
170172
}
171-
return collection.toArray(new String[0]);
173+
return collection.toArray(EMPTY_STRING_ARRAY);
172174
}
173175

174176
}

‎agent-module/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/storage/AsyncQueueingUriStatStorage.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ protected void pollTimeout(long timeout) {
9595

9696
static class UriStatConsumer implements MultiConsumer<UriStatInfo> {
9797

98+
private final UriStatInfo[] uriStatInfos = new UriStatInfo[0];
99+
98100
private static final int DEFAULT_COLLECT_INTERVAL = 30000; // 30s
99101

100102
private static final int SNAPSHOT_LIMIT = 4;
@@ -126,9 +128,9 @@ public void acceptN(Collection<UriStatInfo> messageList) {
126128

127129
AgentUriStatData agentUriStatData = snapshotManager.getCurrent(currentBaseTimestamp);
128130

129-
Object[] dataList = messageList.toArray();
131+
UriStatInfo[] dataList = messageList.toArray(uriStatInfos);
130132
for (int i = 0; i < CollectionUtils.nullSafeSize(messageList); i++) {
131-
addUriData(agentUriStatData, (UriStatInfo) dataList[i]);
133+
addUriData(agentUriStatData, dataList[i]);
132134
}
133135
}
134136

‎agent-module/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/ASMClassNodeAdapter.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ private static byte[] readStream(String classPath, ClassInputStreamProvider plug
114114
return null;
115115
}
116116

117+
private static final String[] EMPTY_STRING_ARRAY = new String[0];
118+
117119
private final ClassInputStreamProvider pluginInputStreamProvider;
118120
private final ClassLoader classLoader;
119121
private final ProtectionDomain protectionDomain;
@@ -167,7 +169,7 @@ public boolean isAnnotation() {
167169
public String[] getInterfaceNames() {
168170
final List<String> interfaces = this.classNode.interfaces;
169171
if (CollectionUtils.isEmpty(interfaces)) {
170-
return new String[0];
172+
return EMPTY_STRING_ARRAY;
171173
}
172174

173175
final List<String> list = new ArrayList<>(interfaces.size());
@@ -177,7 +179,7 @@ public String[] getInterfaceNames() {
177179
}
178180
}
179181

180-
return list.toArray(new String[0]);
182+
return list.toArray(EMPTY_STRING_ARRAY);
181183
}
182184

183185
public ASMMethodNodeAdapter getDeclaredMethod(final String methodName, final String desc) {
@@ -377,7 +379,7 @@ private String[] getSuperMethodExceptions(ASMMethodNodeAdapter superMethodNode)
377379
if (superMethodNodeExceptions == null) {
378380
return null;
379381
}
380-
return superMethodNodeExceptions.toArray(new String[0]);
382+
return superMethodNodeExceptions.toArray(EMPTY_STRING_ARRAY);
381383
}
382384

383385
public void addGetterMethod(final String methodName, final ASMFieldNodeAdapter fieldNode) {

‎agent-module/profiler/src/main/java/com/navercorp/pinpoint/profiler/plugin/PinpointProfilerPackageFilter.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
package com.navercorp.pinpoint.profiler.plugin;
1818

19-
import org.apache.logging.log4j.LogManager;
20-
import org.apache.logging.log4j.Logger;
21-
2219
import java.util.ArrayList;
2320
import java.util.List;
2421
import java.util.Objects;
@@ -28,9 +25,6 @@
2825
*/
2926
public class PinpointProfilerPackageFilter implements ClassNameFilter {
3027

31-
private final Logger logger = LogManager.getLogger(this.getClass());
32-
private final boolean debug = logger.isDebugEnabled();
33-
3428
private final String[] packageList;
3529

3630
public PinpointProfilerPackageFilter() {

‎commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/parallel/ParallelResultScanner.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
*/
3939
public class ParallelResultScanner implements ResultScanner {
4040

41+
private static final Result[] RESULT_EMPTY_ARRAY = {};
42+
4143
private final AbstractRowKeyDistributor keyDistributor;
4244
private final List<ScanTask> scanTasks;
4345
private final Result[] nextResults;
@@ -154,7 +156,7 @@ public Result[] next(int nbRows) throws IOException {
154156
break;
155157
}
156158
}
157-
return resultSets.toArray(new Result[0]);
159+
return resultSets.toArray(RESULT_EMPTY_ARRAY);
158160
}
159161

160162
@Override

‎commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/InetAddressUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.navercorp.pinpoint.common.server.util;
1818

19+
import com.google.common.net.InetAddresses;
1920
import com.navercorp.pinpoint.common.util.CollectionUtils;
2021
import org.apache.commons.lang3.StringUtils;
21-
import com.google.common.net.InetAddresses;
2222

2323
import java.net.InetAddress;
2424
import java.util.ArrayList;
@@ -36,7 +36,7 @@ public static List<InetAddress> toInetAddressList(List<String> addressList) {
3636
if (CollectionUtils.isEmpty(addressList)) {
3737
return Collections.emptyList();
3838
}
39-
final List<InetAddress> inetAddressList = new ArrayList<InetAddress>(addressList.size());
39+
final List<InetAddress> inetAddressList = new ArrayList<>(addressList.size());
4040
for (String ignoreAddress : addressList) {
4141
if (StringUtils.isBlank(ignoreAddress)) {
4242
continue;

‎commons/src/main/java/com/navercorp/pinpoint/common/util/ObjectUtils.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎commons/src/main/java/com/navercorp/pinpoint/common/util/concurrent/FutureUtils.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import java.util.function.Supplier;
99

1010
public final class FutureUtils {
11+
12+
private static final CompletableFuture<?>[] FUTURE_EMPTY_ARRAY =new CompletableFuture<?>[0];
13+
1114
private FutureUtils() {
1215
}
1316

@@ -45,7 +48,7 @@ public static Throwable unwrapCompletionException(Throwable error) {
4548
public static <T> List<T> allOf(List<CompletableFuture<T>> futures) {
4649
Objects.requireNonNull(futures, "futures");
4750

48-
CompletableFuture<T>[] futuresArray = (CompletableFuture<T>[]) futures.toArray(new CompletableFuture<?>[0]);
51+
CompletableFuture<T>[] futuresArray = (CompletableFuture<T>[]) futures.toArray(FUTURE_EMPTY_ARRAY);
4952
return allOf(futuresArray);
5053
}
5154

@@ -64,7 +67,7 @@ public static <T> List<T> allOf(CompletableFuture<T>[] futures) {
6467
public static <T> CompletableFuture<List<T>> allOfAsync(List<CompletableFuture<T>> futures) {
6568
Objects.requireNonNull(futures, "futures");
6669

67-
final CompletableFuture<T>[] futuresArray = (CompletableFuture<T>[]) futures.toArray(new CompletableFuture<?>[0]);
70+
final CompletableFuture<T>[] futuresArray = (CompletableFuture<T>[]) futures.toArray(FUTURE_EMPTY_ARRAY);
6871
return allOfAsync(futuresArray);
6972
}
7073

‎inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/definition/MetricDefinition.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.fasterxml.jackson.annotation.JsonCreator;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
21-
import com.navercorp.pinpoint.common.util.ObjectUtils;
2221
import com.navercorp.pinpoint.inspector.web.definition.metric.EmptyPostProcessor;
2322
import com.navercorp.pinpoint.inspector.web.definition.metric.EmptyPreProcessor;
2423
import com.navercorp.pinpoint.inspector.web.definition.metric.field.Field;
@@ -54,9 +53,9 @@ public MetricDefinition(@JsonProperty("definitionId") String definitionId,
5453
this.definitionId = Objects.requireNonNull(definitionId, "definitionId");
5554
this.metricName = Objects.requireNonNull(metricName, "metricName");
5655
this.title = Objects.requireNonNull(title, "title");
57-
this.groupingRule = ObjectUtils.defaultIfNull(groupingRule, GroupingRule.UNKNOWN);
58-
this.preProcess = Objects.toString(preProcess, EmptyPreProcessor.INSTANCE.getName());
59-
this.postProcess = Objects.toString(postProcess, EmptyPostProcessor.INSTANCE.getName());
56+
this.groupingRule = Objects.requireNonNullElse(groupingRule, GroupingRule.UNKNOWN);
57+
this.preProcess = Objects.requireNonNullElse(preProcess, EmptyPreProcessor.INSTANCE.getName());
58+
this.postProcess = Objects.requireNonNullElse(postProcess, EmptyPostProcessor.INSTANCE.getName());
6059
this.fields = Objects.requireNonNull(fields, "fields");
6160
}
6261

0 commit comments

Comments
 (0)