solve the sonar problem

Author: zeusoo001

framework/src/main/java/org/tron/core/services/event/BlockEventGet.java

@@ -59,7 +59,6 @@ public BlockEvent getBlockEvent(long blockNum) throws Exception {
     blockEvent.setBlockId(block.getBlockId());
     blockEvent.setParentId(block.getParentBlockId());
     blockEvent.setSolidId(manager.getChainBaseManager().getBlockIdByNum(solidNum));
-    blockEvent.setBlockTime(block.getTimeStamp());
     if (instance.isBlockLogTriggerEnable()) {
       blockEvent.setBlockLogTriggerCapsule(getBlockLogTrigger(block, solidNum));
     }
@@ -145,11 +144,45 @@ private List<ContractTrigger> parseLogs(Protocol.Transaction tx,
 
     Map<String, String> addrMap = new HashMap<>();
     Map<String, SmartContractOuterClass.SmartContract.ABI> abiMap = new HashMap<>();
+    parseLogs(logs, originAddress, addrMap, abiMap);
 
+    int index = 1;
     for (Protocol.TransactionInfo.Log log : logs) {
 
       byte[] contractAddress = TransactionTrace
           .convertToTronAddress(log.getAddress().toByteArray());
+      String strContractAddress =
+          ArrayUtils.isEmpty(contractAddress) ? "" : StringUtil.encode58Check(contractAddress);
+      SmartContractOuterClass.SmartContract.ABI abi = abiMap.get(strContractAddress);
+      ContractTrigger event = new ContractTrigger();
+      String creatorAddr = addrMap.get(strContractAddress);
+      String txId = Hex.toHexString(txInfo.getId().toByteArray());
+      event.setUniqueId(txId + "_" + index);
+      event.setTransactionId(txId);
+      event.setContractAddress(strContractAddress);
+      event.setOriginAddress(originAddress);
+      event.setCallerAddress("");
+      event.setCreatorAddress(StringUtils.isEmpty(creatorAddr) ? "" : creatorAddr);
+      event.setBlockNumber(txInfo.getBlockNumber());
+      event.setTimeStamp(txInfo.getBlockTimeStamp());
+      event.setLogInfo(buildLogInfo(log));
+      event.setAbi(abi);
+
+      list.add(event);
+      index++;
+    }
+
+    return list;
+  }
+
+  private void parseLogs(List<Protocol.TransactionInfo.Log> logs,
+                         String originAddress,
+                         Map<String, String> addrMap, Map<String,
+                         SmartContractOuterClass.SmartContract.ABI> abiMap) {
+    for (Protocol.TransactionInfo.Log log : logs) {
+
+      byte[] contractAddress = TransactionTrace
+        .convertToTronAddress(log.getAddress().toByteArray());
       String strContractAddr =
           ArrayUtils.isEmpty(contractAddress) ? "" : StringUtil.encode58Check(contractAddress);
       if (addrMap.get(strContractAddr) != null) {
@@ -175,34 +208,6 @@ private List<ContractTrigger> parseLogs(Protocol.Transaction tx,
       addrMap.put(strContractAddr, creatorAddr);
       abiMap.put(strContractAddr, abi);
     }
-
-    int index = 1;
-    for (Protocol.TransactionInfo.Log log : logs) {
-
-      byte[] contractAddress = TransactionTrace
-          .convertToTronAddress(log.getAddress().toByteArray());
-      String strContractAddress =
-          ArrayUtils.isEmpty(contractAddress) ? "" : StringUtil.encode58Check(contractAddress);
-      SmartContractOuterClass.SmartContract.ABI abi = abiMap.get(strContractAddress);
-      ContractTrigger event = new ContractTrigger();
-      String creatorAddr = addrMap.get(strContractAddress);
-      String txId = Hex.toHexString(txInfo.getId().toByteArray());
-      event.setUniqueId(txId + "_" + index);
-      event.setTransactionId(txId);
-      event.setContractAddress(strContractAddress);
-      event.setOriginAddress(originAddress);
-      event.setCallerAddress("");
-      event.setCreatorAddress(StringUtils.isEmpty(creatorAddr) ? "" : creatorAddr);
-      event.setBlockNumber(txInfo.getBlockNumber());
-      event.setTimeStamp(txInfo.getBlockTimeStamp());
-      event.setLogInfo(buildLogInfo(log));
-      event.setAbi(abi);
-
-      list.add(event);
-      index++;
-    }
-
-    return list;
   }
 
   private LogInfo buildLogInfo(Protocol.TransactionInfo.Log log) {

framework/src/main/java/org/tron/core/services/event/HistoryEventService.java

@@ -61,8 +61,11 @@ private void syncEvent() {
         Thread.sleep(30);
       }
       initEventService(manager.getChainBaseManager().getBlockIdByNum(endNum));
-    } catch (Exception e) {
-      logger.error("Sync event failed.", e);
+    } catch (InterruptedException e1) {
+      logger.warn("Sync event interrupted.");
+      Thread.currentThread().interrupt();
+    } catch (Exception e2) {
+      logger.error("Sync event failed.", e2);
     }
   }
 

framework/src/main/java/org/tron/core/services/event/bo/BlockEvent.java

@@ -1,22 +1,34 @@
 package org.tron.core.services.event.bo;
 
 import java.util.List;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.tron.common.logsfilter.capsule.BlockLogTriggerCapsule;
 import org.tron.common.logsfilter.capsule.SolidityTriggerCapsule;
 import org.tron.common.logsfilter.capsule.TransactionLogTriggerCapsule;
 import org.tron.core.capsule.BlockCapsule;
 
-@Data
 public class BlockEvent {
+  @Getter
+  @Setter
   private BlockCapsule.BlockId blockId;
+  @Getter
+  @Setter
   private BlockCapsule.BlockId parentId;
+  @Getter
+  @Setter
   private BlockCapsule.BlockId solidId;
-  private long blockTime;
-
+  @Getter
+  @Setter
   private BlockLogTriggerCapsule blockLogTriggerCapsule;
+  @Getter
+  @Setter
   private List<TransactionLogTriggerCapsule> transactionLogTriggerCapsules;
+  @Getter
+  @Setter
   private SolidityTriggerCapsule solidityTriggerCapsule;
+  @Getter
+  @Setter
   private SmartContractTrigger smartContractTrigger;
 
   public BlockEvent() {}

framework/src/main/java/org/tron/core/services/event/bo/Event.java

@@ -1,10 +1,14 @@
 package org.tron.core.services.event.bo;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
 public class Event {
+  @Getter
+  @Setter
   private boolean isRemove;
+  @Getter
+  @Setter
   private BlockEvent blockEvent;
 
   public Event(BlockEvent blockEvent, boolean isRemove) {

framework/src/main/java/org/tron/core/services/event/bo/SmartContractTrigger.java

@@ -2,13 +2,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.tron.common.logsfilter.trigger.ContractEventTrigger;
 import org.tron.common.logsfilter.trigger.ContractLogTrigger;
 
-@Data
 public class SmartContractTrigger {
+  @Getter
+  @Setter
   private List<ContractLogTrigger> contractLogTriggers = new ArrayList<>();
+  @Getter
+  @Setter
   private List<ContractEventTrigger> contractEventTriggers = new ArrayList<>();
+  @Getter
+  @Setter
   private List<ContractLogTrigger> redundancies = new ArrayList<>();
 }