[#noissue] Cleanup PMD warning

minwoo-jung · Jul 11, 2024 · 58c70b9 · 58c70b9
1 parent f86114b
commit 58c70b9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/...va/com/navercorp/pinpoint/common/server/dao/hbase/mapper/AgentInfoBoResultsExtractor.java b/...va/com/navercorp/pinpoint/common/server/dao/hbase/mapper/AgentInfoBoResultsExtractor.java
@@ -16,6 +16,7 @@
 
 package com.navercorp.pinpoint.common.server.dao.hbase.mapper;
 
+import com.google.common.collect.Iterables;
 import com.navercorp.pinpoint.common.hbase.ResultsExtractor;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
 import com.navercorp.pinpoint.common.server.bo.AgentInfoBo;
@@ -39,9 +40,11 @@ public AgentInfoBoResultsExtractor(RowMapper<AgentInfoBo> agentInfoMapper) {
 
     @Override
     public AgentInfoBo extractData(ResultScanner results) throws Exception {
-        for (Result result : results) {
-            return agentInfoMapper.mapRow(result, 0);
+        final Result first = Iterables.getFirst(results, null);
+        if (first == null) {
+            return null;
         }
-        return null;
+        return agentInfoMapper.mapRow(first, 0);
+
     }
 }
diff --git a/.../src/main/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinAgentStatBoMapper.java b/.../src/main/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinAgentStatBoMapper.java
@@ -16,14 +16,13 @@
 
 package com.navercorp.pinpoint.flink.mapper.thrift.stat;
 
+import com.google.common.collect.Iterables;
 import com.navercorp.pinpoint.common.server.bo.stat.join.JoinAgentStatBo;
 import com.navercorp.pinpoint.flink.mapper.thrift.ThriftBoMapper;
 import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat;
 import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStatBatch;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.List;
-
 /**
  * @author minwoo.jung
  */
@@ -70,11 +69,11 @@ public JoinAgentStatBo map(TFAgentStatBatch tFAgentStatBatch) {
 
 
     private long getTimeStamp(TFAgentStatBatch joinAgentStatBo) {
-        List<TFAgentStat> agentStats = joinAgentStatBo.getAgentStats();
-        for (TFAgentStat agentStat : agentStats) {
-            return agentStat.getTimestamp();
+        final TFAgentStat first = Iterables.getFirst(joinAgentStatBo.getAgentStats(), null);
+        if (first == null) {
+            return Long.MIN_VALUE;
         }
-        return Long.MIN_VALUE;
+        return first.getTimestamp();
     }
 
 }
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/AgentInfoResultsExtractor.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/AgentInfoResultsExtractor.java
@@ -16,6 +16,7 @@
 
 package com.navercorp.pinpoint.web.mapper;
 
+import com.google.common.collect.Iterables;
 import com.navercorp.pinpoint.common.hbase.ResultsExtractor;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
 import com.navercorp.pinpoint.common.server.bo.AgentInfoBo;
@@ -46,10 +47,11 @@ public AgentInfoResultsExtractor(ServiceTypeRegistryService registryService,
 
     @Override
     public AgentInfo extractData(ResultScanner results) throws Exception {
-        for (Result result : results) {
-            AgentInfoBo agentInfoBo = agentInfoMapper.mapRow(result, 0);
-            return factory.build(agentInfoBo);
+        final Result first = Iterables.getFirst(results, null);
+        if (first == null) {
+            return null;
         }
-        return null;
+        AgentInfoBo agentInfoBo = agentInfoMapper.mapRow(first, 0);
+        return factory.build(agentInfoBo);
     }
 }
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/DetailedAgentInfoResultsExtractor.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/DetailedAgentInfoResultsExtractor.java
@@ -16,6 +16,7 @@
 
 package com.navercorp.pinpoint.web.mapper;
 
+import com.google.common.collect.Iterables;
 import com.navercorp.pinpoint.common.hbase.ResultsExtractor;
 import com.navercorp.pinpoint.common.hbase.RowMapper;
 import com.navercorp.pinpoint.common.server.bo.AgentInfoBo;
@@ -47,11 +48,12 @@ public DetailedAgentInfoResultsExtractor(ServiceTypeRegistryService registryServ
 
     @Override
     public DetailedAgentInfo extractData(ResultScanner results) throws Exception {
-        for (Result result : results) {
-            AgentInfoBo agentInfoBo = agentInfoMapper.mapRow(result, 0);
-            AgentInfo agentInfo = factory.build(agentInfoBo);
-            return new DetailedAgentInfo(agentInfo, agentInfoBo.getServerMetaData(), agentInfoBo.getJvmInfo());
+        final Result first = Iterables.getFirst(results, null);
+        if (first == null) {
+            return null;
         }
-        return null;
+        AgentInfoBo agentInfoBo = agentInfoMapper.mapRow(first, 0);
+        AgentInfo agentInfo = factory.build(agentInfoBo);
+        return new DetailedAgentInfo(agentInfo, agentInfoBo.getServerMetaData(), agentInfoBo.getJvmInfo());
     }
 }