Skip to content

Commit dc60c05

Browse files
emeroademeroad
committed
[#noissue] Cleanup
1 parent 291d3dd commit dc60c05

File tree

12 files changed

+102
-70
lines changed

12 files changed

+102
-70
lines changed

‎hbase/hbase-schema/src/main/java/com/navercorp/pinpoint/hbase/schema/reader/core/TableConfiguration.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public String toString() {
3030
}
3131
};
3232

33-
private Long maxFileSize;
34-
private Boolean readOnly;
35-
private Boolean compactionEnabled;
36-
private Long memstoreFlushSize;
37-
private Durability durability;
33+
private final Long maxFileSize;
34+
private final Boolean readOnly;
35+
private final Boolean compactionEnabled;
36+
private final Long memstoreFlushSize;
37+
private final Durability durability;
3838

3939
public enum Durability {
4040
ASYNC_WAL,

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/cache/IdAllocator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public interface IdAllocator {
88
int allocate();
99

1010
enum ID_TYPE {
11-
BYPASS, ZIGZAG;
11+
BYPASS, ZIGZAG
1212
}
1313

1414
class ZigZagAllocator implements IdAllocator {

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InterceptorDefinitionFactory.java

+14-5
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,19 @@
1616

1717
package com.navercorp.pinpoint.profiler.instrument.interceptor;
1818

19-
import com.navercorp.pinpoint.bootstrap.interceptor.*;
19+
import com.navercorp.pinpoint.bootstrap.interceptor.ApiIdAwareAroundInterceptor;
20+
import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
21+
import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor0;
22+
import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor1;
23+
import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor2;
24+
import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor3;
25+
import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor4;
26+
import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor5;
27+
import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor;
28+
import com.navercorp.pinpoint.bootstrap.interceptor.StaticAroundInterceptor;
2029
import com.navercorp.pinpoint.bootstrap.interceptor.annotation.IgnoreMethod;
21-
import org.apache.logging.log4j.Logger;
2230
import org.apache.logging.log4j.LogManager;
31+
import org.apache.logging.log4j.Logger;
2332

2433
import java.lang.reflect.Method;
2534
import java.util.ArrayList;
@@ -159,13 +168,13 @@ private InterceptorDefinition createInterceptorDefinition(Class<? extends Interc
159168
final boolean afterIgnoreMethod = afterMethod.isAnnotationPresent(IgnoreMethod.class);
160169

161170

162-
if (beforeIgnoreMethod == true && afterIgnoreMethod == true) {
171+
if (beforeIgnoreMethod && afterIgnoreMethod) {
163172
return new DefaultInterceptorDefinition(interceptorClazz, targetInterceptorClazz, interceptorType, CaptureType.NON, null, null);
164173
}
165-
if (beforeIgnoreMethod == true) {
174+
if (beforeIgnoreMethod) {
166175
return new DefaultInterceptorDefinition(interceptorClazz, targetInterceptorClazz, interceptorType, CaptureType.AFTER, null, afterMethod);
167176
}
168-
if (afterIgnoreMethod == true) {
177+
if (afterIgnoreMethod) {
169178
return new DefaultInterceptorDefinition(interceptorClazz, targetInterceptorClazz, interceptorType, CaptureType.BEFORE, beforeMethod, null);
170179
}
171180
return new DefaultInterceptorDefinition(interceptorClazz, targetInterceptorClazz, interceptorType, CaptureType.AROUND, beforeMethod, afterMethod);

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaClassJava15.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,33 @@
1616

1717
package com.navercorp.pinpoint.profiler.instrument.lambda;
1818

19-
import java.util.Arrays;
19+
import java.util.Collections;
2020
import java.util.List;
2121

2222
public class LambdaClassJava15 implements LambdaClass {
2323

2424
public static final String DELEGATE_CLASS = "com/navercorp/pinpoint/bootstrap/java15/lambda/MethodHandlesLookupDelegatorJava15";
2525

26-
private final List<MethodInsn> methodInsnList;
26+
private final MethodInsn methodInsn;
2727

2828
public LambdaClassJava15() {
29-
this.methodInsnList = Arrays.asList(
30-
new MethodInsn("generateInnerClass", "java/lang/invoke/MethodHandles$Lookup", "defineHiddenClass", DELEGATE_CLASS, "defineHiddenClass", "(Ljava/lang/invoke/MethodHandles$Lookup;[BZ[Ljava/lang/invoke/MethodHandles$Lookup$ClassOption;)Ljava/lang/invoke/MethodHandles$Lookup;"));
29+
this.methodInsn = new MethodInsn("generateInnerClass",
30+
"java/lang/invoke/MethodHandles$Lookup",
31+
"defineHiddenClass",
32+
DELEGATE_CLASS,
33+
"defineHiddenClass",
34+
"(Ljava/lang/invoke/MethodHandles$Lookup;[BZ[Ljava/lang/invoke/MethodHandles$Lookup$ClassOption;)Ljava/lang/invoke/MethodHandles$Lookup;");
3135
}
3236

3337
@Override
3438
public List<MethodInsn> getMethodInsnList() {
35-
return methodInsnList;
39+
return Collections.singletonList(methodInsn);
3640
}
3741

3842
@Override
3943
public String toString() {
4044
return "LambdaClassJava15{" +
41-
"methodInsnList=" + methodInsnList +
45+
"methodInsn=" + methodInsn +
4246
'}';
4347
}
4448
}

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaClassJava16.java

+16-7
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,33 @@ public class LambdaClassJava16 implements LambdaClass {
2323

2424
public static final String DELEGATE_CLASS = "com/navercorp/pinpoint/bootstrap/java16/lambda/MethodHandlesLookupDelegatorJava16";
2525

26-
private final List<MethodInsn> methodInsnList;
26+
private final MethodInsn[] methodInsnList;
2727

2828
public LambdaClassJava16() {
29-
this.methodInsnList = Arrays.asList(
30-
new MethodInsn("generateInnerClass", "java/lang/invoke/MethodHandles$Lookup", "defineHiddenClass", DELEGATE_CLASS, "defineHiddenClass", "(Ljava/lang/invoke/MethodHandles$Lookup;[BZ[Ljava/lang/invoke/MethodHandles$Lookup$ClassOption;)Ljava/lang/invoke/MethodHandles$Lookup;"),
31-
new MethodInsn("generateInnerClass", "java/lang/invoke/MethodHandles$Lookup", "defineHiddenClassWithClassData", DELEGATE_CLASS, "defineHiddenClassWithClassData", "(Ljava/lang/invoke/MethodHandles$Lookup;[BLjava/lang/Object;Z[Ljava/lang/invoke/MethodHandles$Lookup$ClassOption;)Ljava/lang/invoke/MethodHandles$Lookup;")
32-
);
29+
final MethodInsn insn1 = new MethodInsn("generateInnerClass",
30+
"java/lang/invoke/MethodHandles$Lookup",
31+
"defineHiddenClass",
32+
DELEGATE_CLASS,
33+
"defineHiddenClass",
34+
"(Ljava/lang/invoke/MethodHandles$Lookup;[BZ[Ljava/lang/invoke/MethodHandles$Lookup$ClassOption;)Ljava/lang/invoke/MethodHandles$Lookup;");
35+
final MethodInsn insn2 = new MethodInsn("generateInnerClass",
36+
"java/lang/invoke/MethodHandles$Lookup",
37+
"defineHiddenClassWithClassData",
38+
DELEGATE_CLASS,
39+
"defineHiddenClassWithClassData",
40+
"(Ljava/lang/invoke/MethodHandles$Lookup;[BLjava/lang/Object;Z[Ljava/lang/invoke/MethodHandles$Lookup$ClassOption;)Ljava/lang/invoke/MethodHandles$Lookup;");
41+
this.methodInsnList = new MethodInsn[]{insn1, insn2};
3342
}
3443

3544
@Override
3645
public List<MethodInsn> getMethodInsnList() {
37-
return methodInsnList;
46+
return Arrays.asList(methodInsnList);
3847
}
3948

4049
@Override
4150
public String toString() {
4251
return "LambdaClassJava16{" +
43-
"methodInsnList=" + methodInsnList +
52+
"methodInsnList=" + Arrays.toString(methodInsnList) +
4453
'}';
4554
}
4655
}

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaClassJava8.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.navercorp.pinpoint.profiler.instrument.lambda;
1818

19-
import java.util.Arrays;
19+
import java.util.Collections;
2020
import java.util.List;
2121

2222
/**
@@ -26,14 +26,20 @@ public class LambdaClassJava8 implements LambdaClass {
2626

2727
public static final String DELEGATE_CLASS = "com/navercorp/pinpoint/bootstrap/lambda/UnsafeDelegatorJava8";
2828

29-
private final List<MethodInsn> methodInsnList;
29+
private final MethodInsn methodInsn;
3030

3131
public LambdaClassJava8() {
32-
this.methodInsnList = Arrays.asList(new MethodInsn("spinInnerClass", "sun/misc/Unsafe", "defineAnonymousClass", DELEGATE_CLASS, "defineAnonymousClass", null));
32+
this.methodInsn = new MethodInsn("spinInnerClass",
33+
"sun/misc/Unsafe",
34+
"defineAnonymousClass",
35+
DELEGATE_CLASS,
36+
"defineAnonymousClass",
37+
null);
38+
3339
}
3440

3541
@Override
3642
public List<MethodInsn> getMethodInsnList() {
37-
return methodInsnList;
43+
return Collections.singletonList(methodInsn);
3844
}
3945
}

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaClassJava9.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.navercorp.pinpoint.profiler.instrument.lambda;
1818

19-
import java.util.Arrays;
19+
import java.util.Collections;
2020
import java.util.List;
2121

2222
/**
@@ -26,14 +26,19 @@ public class LambdaClassJava9 implements LambdaClass {
2626

2727
public static final String DELEGATE_CLASS = "com/navercorp/pinpoint/bootstrap/java9/lambda/UnsafeDelegatorJava9";
2828

29-
private final List<MethodInsn> methodInsnList;
29+
private final MethodInsn methodInsn;
3030

3131
public LambdaClassJava9() {
32-
this.methodInsnList = Arrays.asList(new MethodInsn("spinInnerClass", "jdk/internal/misc/Unsafe", "defineAnonymousClass", DELEGATE_CLASS, "defineAnonymousClass", null));
32+
this.methodInsn = new MethodInsn("spinInnerClass",
33+
"jdk/internal/misc/Unsafe",
34+
"defineAnonymousClass",
35+
DELEGATE_CLASS,
36+
"defineAnonymousClass",
37+
null);
3338
}
3439

3540
@Override
3641
public List<MethodInsn> getMethodInsnList() {
37-
return methodInsnList;
42+
return Collections.singletonList(methodInsn);
3843
}
3944
}

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/MethodInsn.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import java.util.Objects;
2020

2121
public class MethodInsn {
22-
private String methodName;
23-
private String targetClassName;
24-
private String targetMethodName;
25-
private String delegateClassName;
26-
private String delegateMethodName;
27-
private String delegateDescriptor;
22+
private final String methodName;
23+
private final String targetClassName;
24+
private final String targetMethodName;
25+
private final String delegateClassName;
26+
private final String delegateMethodName;
27+
private final String delegateDescriptor;
2828

2929
public MethodInsn(String methodName, String targetClassName, String targetMethodName, String delegateClassName, String delegateMethodName, String delegateDescriptor) {
3030
this.methodName = Objects.requireNonNull(methodName);

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/jdbc/BindValueConverter.java

+20-22
Original file line numberDiff line numberDiff line change
@@ -166,49 +166,47 @@ public String convert(Object value) {
166166
return "null";
167167
}
168168

169-
if (Byte.class.isInstance(value)) {
169+
if (value instanceof Byte) {
170170
return simpleTypeConverter.convert(value);
171-
} else if (Boolean.class.isInstance(value)) {
171+
} else if (value instanceof Boolean) {
172172
return simpleTypeConverter.convert(value);
173-
} else if (Short.class.isInstance(value)) {
173+
} else if (value instanceof Short) {
174174
return simpleTypeConverter.convert(value);
175-
} else if (Integer.class.isInstance(value)) {
175+
} else if (value instanceof Integer) {
176176
return simpleTypeConverter.convert(value);
177-
} else if (Long.class.isInstance(value)) {
177+
} else if (value instanceof Long) {
178178
return simpleTypeConverter.convert(value);
179-
} else if (Float.class.isInstance(value)) {
179+
} else if (value instanceof Float) {
180180
return simpleTypeConverter.convert(value);
181-
} else if (Double.class.isInstance(value)) {
181+
} else if (value instanceof Double) {
182182
return simpleTypeConverter.convert(value);
183-
} else if (BigDecimal.class.isInstance(value)) {
183+
} else if (value instanceof BigDecimal) {
184184
return simpleTypeConverter.convert(value);
185-
} else if (String.class.isInstance(value)) {
185+
} else if (value instanceof String) {
186186
// String/NString
187187
return simpleTypeConverter.convert(value);
188-
} else if (Date.class.isInstance(value)) {
188+
} else if (value instanceof Date) {
189189
return simpleTypeConverter.convert(value);
190-
} else if (Time.class.isInstance(value)) {
190+
} else if (value instanceof Time) {
191191
return simpleTypeConverter.convert(value);
192-
} else if (Timestamp.class.isInstance(value)) {
192+
} else if (value instanceof Timestamp) {
193193
return simpleTypeConverter.convert(value);
194-
} else if (URL.class.isInstance(value)) {
194+
} else if (value instanceof URL) {
195195
return simpleTypeConverter.convert(value);
196-
} else if (Ref.class.isInstance(value)) {
196+
} else if (value instanceof Ref) {
197197
return simpleTypeConverter.convert(value);
198-
} else if (InputStream.class.isInstance(value)) {
198+
} else if (value instanceof InputStream) {
199199
return classNameConverter.convert(value);
200-
} else if (Reader.class.isInstance(value)) {
200+
} else if (value instanceof Reader) {
201201
return classNameConverter.convert(value);
202-
} else if (Array.class.isInstance(value)) {
202+
} else if (value instanceof Array) {
203203
return classNameConverter.convert(value);
204-
} else if (SQLXML.class.isInstance(value)) {
204+
} else if (value instanceof SQLXML) {
205205
return classNameConverter.convert(value);
206-
} else if (byte[].class.isInstance(value)) {
206+
} else if (value instanceof byte[]) {
207207
return hexBytesConverter.convert(value);
208-
} else if (Object.class.isInstance(value)) {
209-
return objectConverter.convert(value);
210208
}
211-
return "";
209+
return objectConverter.convert(value);
212210
}
213211

214212
}

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/TcpDataSender.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package com.navercorp.pinpoint.profiler.sender;
1818

1919

20-
import java.util.Objects;
21-
2220
import com.navercorp.pinpoint.common.util.Assert;
2321
import com.navercorp.pinpoint.common.util.StringUtils;
2422
import com.navercorp.pinpoint.io.request.Message;
@@ -36,15 +34,16 @@
3634
import com.navercorp.pinpoint.thrift.io.HeaderTBaseDeserializer;
3735
import com.navercorp.pinpoint.thrift.io.HeaderTBaseDeserializerFactory;
3836
import com.navercorp.pinpoint.thrift.util.SerializationUtils;
37+
import org.apache.logging.log4j.LogManager;
38+
import org.apache.logging.log4j.Logger;
3939
import org.apache.thrift.TBase;
4040
import org.jboss.netty.buffer.ChannelBuffers;
4141
import org.jboss.netty.util.HashedWheelTimer;
4242
import org.jboss.netty.util.Timeout;
4343
import org.jboss.netty.util.Timer;
4444
import org.jboss.netty.util.TimerTask;
45-
import org.apache.logging.log4j.Logger;
46-
import org.apache.logging.log4j.LogManager;
4745

46+
import java.util.Objects;
4847
import java.util.Set;
4948
import java.util.concurrent.TimeUnit;
5049
import java.util.concurrent.atomic.AtomicBoolean;
@@ -81,7 +80,7 @@ public class TcpDataSender<T> implements EnhancedDataSender<T> {
8180

8281
public TcpDataSender(String name, String host, int port, PinpointClientFactory clientFactory) {
8382
this(name, ClientFactoryUtils.newPinpointClientProvider(host, port, clientFactory),
84-
(MessageSerializer<T, byte[]>) newDefaultMessageSerializer(), DEFAULT_QUEUE_SIZE);
83+
newDefaultMessageSerializer(), DEFAULT_QUEUE_SIZE);
8584
}
8685

8786

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/grpc/StatGrpcDataSender.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import com.google.protobuf.Empty;
2121
import com.google.protobuf.GeneratedMessageV3;
22-
import java.util.Objects;
2322
import com.navercorp.pinpoint.grpc.client.ChannelFactory;
2423
import com.navercorp.pinpoint.grpc.trace.PAgentStat;
2524
import com.navercorp.pinpoint.grpc.trace.PAgentStatBatch;
@@ -35,6 +34,8 @@
3534
import com.navercorp.pinpoint.profiler.util.NamedRunnable;
3635
import io.grpc.stub.ClientCallStreamObserver;
3736

37+
import java.util.Objects;
38+
3839
import static com.navercorp.pinpoint.grpc.MessageFormatUtils.debugLog;
3940

4041
/**
@@ -101,7 +102,7 @@ public StatGrpcDataSender(String host, int port,
101102
super(host, port, executorQueueSize, messageConverter, channelFactory);
102103

103104
this.reconnectExecutor = Objects.requireNonNull(reconnectExecutor, "reconnectExecutor");
104-
final Runnable reconnectJob = new NamedRunnable(this.ID) {
105+
final Runnable reconnectJob = new NamedRunnable(ID) {
105106
@Override
106107
public void run() {
107108
startStream();

‎profiler/src/test/java/com/navercorp/pinpoint/profiler/context/LocalTraceTest.java renamed to ‎profiler/src/test/java/com/navercorp/pinpoint/profiler/context/id/LocalTraceTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package com.navercorp.pinpoint.profiler.context;
1+
package com.navercorp.pinpoint.profiler.context.id;
22

33
import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder;
44
import com.navercorp.pinpoint.bootstrap.context.SpanRecorder;
55
import com.navercorp.pinpoint.bootstrap.context.Trace;
6+
import com.navercorp.pinpoint.profiler.context.DisableAsyncChildTrace;
7+
import com.navercorp.pinpoint.profiler.context.DisableTrace;
8+
import com.navercorp.pinpoint.profiler.context.LocalAsyncId;
69
import com.navercorp.pinpoint.profiler.context.active.ActiveTraceHandle;
7-
import com.navercorp.pinpoint.profiler.context.id.LocalTraceRoot;
8-
import com.navercorp.pinpoint.profiler.context.id.TraceRoot;
910
import com.navercorp.pinpoint.profiler.context.storage.UriStatStorage;
1011
import org.junit.jupiter.api.Assertions;
1112
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)