From 06063387f6e989620f4d6c9388968474d5fad5df Mon Sep 17 00:00:00 2001 From: emeroad Date: Tue, 30 Aug 2022 11:31:55 +0900 Subject: [PATCH] [#noissue] Polishing --- .../mapper/grpc/GrpcJvmInfoBoMapper.java | 5 +---- .../grpc/event/GrpcDeadlockBoMapper.java | 13 ++++++------ .../grpc/event/GrpcMonitorInfoBoMapper.java | 5 +---- .../mapper/thrift/ThriftJvmInfoBoMapper.java | 5 +---- .../thrift/event/ThriftDeadlockBoMapper.java | 11 +++++----- .../event/ThriftMonitorInfoBoMapper.java | 5 +---- .../event/ThriftAgentEventMapperTest.java | 5 +++-- .../pinpoint/common/server/bo/JvmInfoBo.java | 16 +++++++------- .../common/server/bo/event/DeadlockBo.java | 21 +++++++++++-------- .../common/server/bo/event/MonitorInfoBo.java | 16 +++++++------- .../util/AgentEventMessageDeserializerV1.java | 10 ++------- .../AgentEventMessageSerializerV1Test.java | 8 ++----- 12 files changed, 50 insertions(+), 70 deletions(-) diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/GrpcJvmInfoBoMapper.java b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/GrpcJvmInfoBoMapper.java index f6332ba84cc3..bab8bbbfec92 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/GrpcJvmInfoBoMapper.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/GrpcJvmInfoBoMapper.java @@ -39,9 +39,6 @@ public JvmInfoBo map(final PJvmInfo jvmInfo) { final short version = (short) jvmInfo.getVersion(); final String jvmVersion = jvmInfo.getVmVersion(); final String gcTypeName = this.jvmGcTypeMapper.map(jvmInfo.getGcType()).name(); - final JvmInfoBo jvmInfoBo = new JvmInfoBo(version); - jvmInfoBo.setJvmVersion(jvmVersion); - jvmInfoBo.setGcTypeName(gcTypeName); - return jvmInfoBo; + return new JvmInfoBo(version, jvmVersion, gcTypeName); } } \ No newline at end of file diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/event/GrpcDeadlockBoMapper.java b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/event/GrpcDeadlockBoMapper.java index 80a36ab572d0..796a66fcd213 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/event/GrpcDeadlockBoMapper.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/event/GrpcDeadlockBoMapper.java @@ -39,19 +39,20 @@ public GrpcDeadlockBoMapper(GrpcThreadDumpBoMapper threadDumpBoMapper) { } public DeadlockBo map(final PDeadlock deadlock) { - final DeadlockBo deadlockBo = new DeadlockBo(); - deadlockBo.setDeadlockedThreadCount(deadlock.getCount()); + List threadDumpBoList = getThreadDumpList(deadlock); + return new DeadlockBo(deadlock.getCount(), threadDumpBoList); + } + private List getThreadDumpList(PDeadlock deadlock) { final List threadDumpList = deadlock.getThreadDumpList(); if (CollectionUtils.hasLength(threadDumpList)) { - final List threadDumpBoList = new ArrayList<>(); + final List threadDumpBoList = new ArrayList<>(threadDumpList.size()); for (PThreadDump threadDump : threadDumpList) { final ThreadDumpBo threadDumpBo = this.threadDumpBoMapper.map(threadDump); threadDumpBoList.add(threadDumpBo); } - deadlockBo.setThreadDumpBoList(threadDumpBoList); + return threadDumpBoList; } - - return deadlockBo; + return List.of(); } } \ No newline at end of file diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/event/GrpcMonitorInfoBoMapper.java b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/event/GrpcMonitorInfoBoMapper.java index 893fef6f3a40..c3e4362b2b1c 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/event/GrpcMonitorInfoBoMapper.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/grpc/event/GrpcMonitorInfoBoMapper.java @@ -27,9 +27,6 @@ public class GrpcMonitorInfoBoMapper { public MonitorInfoBo map(final PMonitorInfo monitorInfo) { - final MonitorInfoBo monitorInfoBo = new MonitorInfoBo(); - monitorInfoBo.setStackDepth(monitorInfo.getStackDepth()); - monitorInfoBo.setStackFrame(monitorInfo.getStackFrame()); - return monitorInfoBo; + return new MonitorInfoBo(monitorInfo.getStackDepth(), monitorInfo.getStackFrame()); } } \ No newline at end of file diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftJvmInfoBoMapper.java b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftJvmInfoBoMapper.java index 71b1dabbc9e5..2dff525a5bcc 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftJvmInfoBoMapper.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/ThriftJvmInfoBoMapper.java @@ -40,9 +40,6 @@ public JvmInfoBo map(TJvmInfo thriftObject) { short version = thriftObject.getVersion(); String jvmVersion = thriftObject.getVmVersion(); String gcTypeName = this.jvmGcTypeMapper.map(thriftObject.getGcType()).name(); - JvmInfoBo jvmInfoBo = new JvmInfoBo(version); - jvmInfoBo.setJvmVersion(jvmVersion); - jvmInfoBo.setGcTypeName(gcTypeName); - return jvmInfoBo; + return new JvmInfoBo(version, jvmVersion, gcTypeName); } } diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftDeadlockBoMapper.java b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftDeadlockBoMapper.java index abc37ad77e17..c3280877252d 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftDeadlockBoMapper.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftDeadlockBoMapper.java @@ -40,18 +40,19 @@ public ThriftDeadlockBoMapper(ThriftThreadDumpBoMapper threadDumpBoMapper) { } public DeadlockBo map(final TDeadlock tDeadlock) { - final DeadlockBo deadlockBo = new DeadlockBo(); - deadlockBo.setDeadlockedThreadCount(tDeadlock.getDeadlockedThreadCount()); + List threadDumpList = getThreadDumpList(tDeadlock); + return new DeadlockBo(tDeadlock.getDeadlockedThreadCount(), threadDumpList); + } + private List getThreadDumpList(TDeadlock tDeadlock) { if (tDeadlock.isSetDeadlockedThreadList()) { final List threadDumpBoList = new ArrayList<>(); for (TThreadDump threadDump : tDeadlock.getDeadlockedThreadList()) { final ThreadDumpBo threadDumpBo = this.threadDumpBoMapper.map(threadDump); threadDumpBoList.add(threadDumpBo); } - deadlockBo.setThreadDumpBoList(threadDumpBoList); + return threadDumpBoList; } - - return deadlockBo; + return List.of(); } } \ No newline at end of file diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftMonitorInfoBoMapper.java b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftMonitorInfoBoMapper.java index 48732d5ce2b4..664f9e7a54b6 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftMonitorInfoBoMapper.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftMonitorInfoBoMapper.java @@ -28,9 +28,6 @@ public class ThriftMonitorInfoBoMapper implements ThriftBoMapper { public MonitorInfoBo map(final TMonitorInfo monitorInfo) { - final MonitorInfoBo monitorInfoBo = new MonitorInfoBo(); - monitorInfoBo.setStackDepth(monitorInfo.getStackDepth()); - monitorInfoBo.setStackFrame(monitorInfo.getStackFrame()); - return monitorInfoBo; + return new MonitorInfoBo(monitorInfo.getStackDepth(), monitorInfo.getStackFrame()); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftAgentEventMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftAgentEventMapperTest.java index 7edc8be9a405..4fe8690498f7 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftAgentEventMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftAgentEventMapperTest.java @@ -32,6 +32,8 @@ import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; +import java.util.List; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -58,8 +60,7 @@ public void simpleTest1() { final long eventTimestamp = startTimestamp; final TAgentStat agentStat = createAgentStat(agentId, startTimestamp, eventTimestamp, 2); - DeadlockBo deadlockBo = new DeadlockBo(); - deadlockBo.setDeadlockedThreadCount(agentStat.getDeadlock().getDeadlockedThreadCount()); + DeadlockBo deadlockBo = new DeadlockBo(agentStat.getDeadlock().getDeadlockedThreadCount(), List.of()); DeadlockEventBo expectedEventBo = new DeadlockEventBo(agentId, startTimestamp, eventTimestamp, AgentEventType.AGENT_DEADLOCK_DETECTED, deadlockBo); when(this.deadlockEventBoMapper.map(agentId, startTimestamp, startTimestamp, agentStat.getDeadlock())).thenReturn(expectedEventBo); diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/JvmInfoBo.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/JvmInfoBo.java index b397baccc744..048a3f35ff23 100644 --- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/JvmInfoBo.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/JvmInfoBo.java @@ -20,20 +20,24 @@ import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.buffer.FixedBuffer; +import java.util.Objects; + /** * @author HyunGil Jeong */ public class JvmInfoBo { private final byte version; - private String jvmVersion; - private String gcTypeName; + private final String jvmVersion; + private final String gcTypeName; - public JvmInfoBo(int version) { + public JvmInfoBo(int version, String jvmVersion, String gcTypeName) { if (version < 0 || version > 255) { throw new IllegalArgumentException("version out of range (0~255)"); } this.version = (byte) (version & 0xFF); + this.jvmVersion = Objects.requireNonNull(jvmVersion, "jvmVersion"); + this.gcTypeName = Objects.requireNonNull(gcTypeName, "gcTypeName"); } public JvmInfoBo(byte[] serializedJvmInfoBo) { @@ -60,17 +64,11 @@ public String getJvmVersion() { return jvmVersion; } - public void setJvmVersion(String jvmVersion) { - this.jvmVersion = jvmVersion; - } public String getGcTypeName() { return gcTypeName; } - public void setGcTypeName(String gcTypeName) { - this.gcTypeName = gcTypeName; - } public byte[] writeValue() { final Buffer buffer = new AutomaticBuffer(); diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/event/DeadlockBo.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/event/DeadlockBo.java index dd43487f2570..9c87e4e8f3be 100644 --- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/event/DeadlockBo.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/event/DeadlockBo.java @@ -17,6 +17,7 @@ package com.navercorp.pinpoint.common.server.bo.event; import java.util.List; +import java.util.Objects; /** * @author jaehong.kim @@ -24,23 +25,25 @@ public class DeadlockBo { public static final int UNCOLLECTED_INT_VALUE = -1; - private int deadlockedThreadCount = UNCOLLECTED_INT_VALUE; - private List threadDumpBoList; + private final int deadlockedThreadCount; + private final List threadDumpBoList; - public int getDeadlockedThreadCount() { - return deadlockedThreadCount; + public DeadlockBo() { + this.deadlockedThreadCount = UNCOLLECTED_INT_VALUE; + this.threadDumpBoList = List.of(); } - public void setDeadlockedThreadCount(int deadlockedThreadCount) { + public DeadlockBo(int deadlockedThreadCount, List threadDumpBoList) { this.deadlockedThreadCount = deadlockedThreadCount; + this.threadDumpBoList = Objects.requireNonNull(threadDumpBoList, "threadDumpBoList"); } - public List getThreadDumpBoList() { - return threadDumpBoList; + public int getDeadlockedThreadCount() { + return deadlockedThreadCount; } - public void setThreadDumpBoList(List threadDumpBoList) { - this.threadDumpBoList = threadDumpBoList; + public List getThreadDumpBoList() { + return threadDumpBoList; } @Override diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/event/MonitorInfoBo.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/event/MonitorInfoBo.java index e4cc7bc3010c..28d06bd90234 100644 --- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/event/MonitorInfoBo.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/event/MonitorInfoBo.java @@ -20,25 +20,23 @@ * @author jaehong.kim */ public class MonitorInfoBo { - private int stackDepth; - private String stackFrame; + private final int stackDepth; + private final String stackFrame; + + public MonitorInfoBo(int stackDepth, String stackFrame) { + this.stackDepth = stackDepth; + this.stackFrame = stackFrame; + } public int getStackDepth() { return stackDepth; } - public void setStackDepth(int stackDepth) { - this.stackDepth = stackDepth; - } public String getStackFrame() { return stackFrame; } - public void setStackFrame(String stackFrame) { - this.stackFrame = stackFrame; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("MonitorInfoBo{"); diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageDeserializerV1.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageDeserializerV1.java index 124ee0447183..f9ffea0c5793 100644 --- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageDeserializerV1.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageDeserializerV1.java @@ -62,10 +62,7 @@ private DeadlockBo deserializeDeadlockBo(final byte[] eventBody) { threadDumpBoList.add(readThreadDumpBo(buffer)); } - final DeadlockBo deadlockBo = new DeadlockBo(); - deadlockBo.setDeadlockedThreadCount(deadlockedThreadCount); - deadlockBo.setThreadDumpBoList(threadDumpBoList); - return deadlockBo; + return new DeadlockBo(deadlockedThreadCount, threadDumpBoList); } private ThreadDumpBo readThreadDumpBo(final Buffer buffer) { @@ -133,9 +130,6 @@ private MonitorInfoBo readMonitorInfoBo(final Buffer buffer) { final int stackDepth = buffer.readInt(); final String stackFrame = buffer.readPrefixedString(); - final MonitorInfoBo monitorInfoBo = new MonitorInfoBo(); - monitorInfoBo.setStackDepth(stackDepth); - monitorInfoBo.setStackFrame(stackFrame); - return monitorInfoBo; + return new MonitorInfoBo(stackDepth, stackFrame); } } \ No newline at end of file diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerializerV1Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerializerV1Test.java index 865cca493642..9b5f91688da0 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerializerV1Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerializerV1Test.java @@ -38,8 +38,6 @@ public class AgentEventMessageSerializerV1Test { public void serialize() throws Exception { AgentEventMessageSerializerV1 serializer = new AgentEventMessageSerializerV1(); // Mock - final DeadlockBo deadlockBo = new DeadlockBo(); - deadlockBo.setDeadlockedThreadCount(1); List threadDumpBoList = new ArrayList<>(); ThreadDumpBo threadDumpBo = new ThreadDumpBo(); threadDumpBo.setThreadName("threadName"); @@ -57,15 +55,13 @@ public void serialize() throws Exception { threadDumpBo.setStackTraceList(Arrays.asList("foo", "bar")); List monitorInfoBoList = new ArrayList<>(); - MonitorInfoBo monitorInfoBo = new MonitorInfoBo(); - monitorInfoBo.setStackDepth(9); - monitorInfoBo.setStackFrame("Frame"); + MonitorInfoBo monitorInfoBo = new MonitorInfoBo(9, "Frame"); monitorInfoBoList.add(monitorInfoBo); threadDumpBo.setLockedMonitorInfoList(monitorInfoBoList); threadDumpBo.setLockedSynchronizerList(Arrays.asList("foo", "bar")); threadDumpBoList.add(threadDumpBo); - deadlockBo.setThreadDumpBoList(threadDumpBoList); + final DeadlockBo deadlockBo = new DeadlockBo(1, threadDumpBoList); byte[] bytes = serializer.serialize(AgentEventType.AGENT_DEADLOCK_DETECTED, deadlockBo);