Merge pull request #51 from 317787106/hotfix/use_enum

fix(api): use uniform Enum EventTopic

Author: CodeNinjaEvan

api/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java

@@ -28,7 +28,7 @@ public class BlockLogTrigger extends Trigger {
   private List<String> transactionList = new ArrayList<>();
 
   public BlockLogTrigger() {
-    setTriggerName(Trigger.BLOCK_TRIGGER_NAME);
+    setTriggerName(EventTopic.BLOCK_TRIGGER.getName());
   }
 
   @Override

api/src/main/java/org/tron/common/logsfilter/trigger/ContractEventTrigger.java

@@ -39,6 +39,6 @@ public class ContractEventTrigger extends ContractTrigger {
 
   public ContractEventTrigger() {
     super();
-    setTriggerName(Trigger.CONTRACTEVENT_TRIGGER_NAME);
+    setTriggerName(EventTopic.CONTRACT_EVENT_TRIGGER.getName());
   }
 }

api/src/main/java/org/tron/common/logsfilter/trigger/ContractLogTrigger.java

@@ -22,6 +22,6 @@ public class ContractLogTrigger extends ContractTrigger {
 
   public ContractLogTrigger() {
     super();
-    setTriggerName(Trigger.CONTRACTLOG_TRIGGER_NAME);
+    setTriggerName(EventTopic.CONTRACT_LOG_TRIGGER.getName());
   }
 }

api/src/main/java/org/tron/common/logsfilter/trigger/ContractTrigger.java

@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-public class ContractTrigger extends Trigger {
+public abstract class ContractTrigger extends Trigger {
 
   /**
    * id of the transaction which produce this event.

api/src/main/java/org/tron/common/logsfilter/trigger/EventTopic.java

@@ -0,0 +1,41 @@
+package org.tron.common.logsfilter.trigger;
+
+
+import lombok.Getter;
+
+@Getter
+public enum EventTopic {
+  BLOCK_TRIGGER(0, "blockTrigger"),
+  TRANSACTION_TRIGGER(1, "transactionTrigger"),
+  CONTRACT_LOG_TRIGGER(2, "contractLogTrigger"),
+  CONTRACT_EVENT_TRIGGER(3, "contractEventTrigger"),
+  SOLIDITY_TRIGGER(4, "solidityTrigger"),
+  SOLIDITY_EVENT(5, "solidityEventTrigger"),
+  SOLIDITY_LOG(6, "solidityLogTrigger");
+
+  private final Integer type;
+  private final String name;
+
+  EventTopic(Integer type, String name) {
+    this.type = type;
+    this.name = name;
+  }
+
+  public static EventTopic getEventTopicByType(int topicType) {
+    for (EventTopic member : values()) {
+      if (member.getType() == topicType) {
+        return member;
+      }
+    }
+    return null;
+  }
+
+  public static EventTopic getEventTopicByName(String topicName) {
+    for (EventTopic member : values()) {
+      if (member.getName().equals(topicName)) {
+        return member;
+      }
+    }
+    return null;
+  }
+}

api/src/main/java/org/tron/common/logsfilter/trigger/SolidityTrigger.java

@@ -17,6 +17,6 @@ public String toString() {
   }
 
   public SolidityTrigger() {
-    setTriggerName(Trigger.SOLIDITY_TRIGGER_NAME);
+    setTriggerName(EventTopic.SOLIDITY_TRIGGER.getName());
   }
 }

api/src/main/java/org/tron/common/logsfilter/trigger/TransactionLogTrigger.java

@@ -95,6 +95,6 @@ public void setTimeStamp(long ts) {
   private List<InternalTransactionPojo> internalTrananctionList;
 
   public TransactionLogTrigger() {
-    setTriggerName(Trigger.TRANSACTION_TRIGGER_NAME);
+    setTriggerName(EventTopic.TRANSACTION_TRIGGER.getName());
   }
 }

api/src/main/java/org/tron/common/logsfilter/trigger/Trigger.java

@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-public class Trigger {
+public abstract class Trigger {
 
   @Getter
   @Setter
@@ -12,18 +12,4 @@ public class Trigger {
   @Getter
   @Setter
   private String triggerName;
-
-  public static final int BLOCK_TRIGGER = 0;
-  public static final int TRANSACTION_TRIGGER = 1;
-  public static final int CONTRACTLOG_TRIGGER = 2;
-  public static final int CONTRACTEVENT_TRIGGER = 3;
-  public static final int SOLIDITY_TRIGGER = 4;
-  public static final int SOLIDITY_EVENT = 5;
-  public static final int SOLIDITY_LOG = 6;
-
-  public static final String BLOCK_TRIGGER_NAME = "blockTrigger";
-  public static final String TRANSACTION_TRIGGER_NAME = "transactionTrigger";
-  public static final String CONTRACTLOG_TRIGGER_NAME = "contractLogTrigger";
-  public static final String CONTRACTEVENT_TRIGGER_NAME = "contractEventTrigger";
-  public static final String SOLIDITY_TRIGGER_NAME = "solidityTrigger";
 }

app/src/main/java/org/tron/eventplugin/app/PluginLauncher.java

@@ -29,7 +29,7 @@
 import org.pf4j.PluginManager;
 import org.tron.common.logsfilter.IPluginEventListener;
 import org.tron.common.logsfilter.trigger.BlockLogTrigger;
-import org.tron.common.logsfilter.trigger.Trigger;
+import org.tron.common.logsfilter.trigger.EventTopic;
 
 @Slf4j
 public class PluginLauncher {
@@ -69,13 +69,13 @@ protected CompoundPluginDescriptorFinder createPluginDescriptorFinder() {
     });
 
     eventListeners.forEach(listener -> {
-      listener.setTopic(Trigger.BLOCK_TRIGGER, "block");
-      listener.setTopic(Trigger.TRANSACTION_TRIGGER, "transaction");
-      listener.setTopic(Trigger.CONTRACTEVENT_TRIGGER, "contractevent");
-      listener.setTopic(Trigger.CONTRACTLOG_TRIGGER, "contractlog");
-      listener.setTopic(Trigger.SOLIDITY_TRIGGER, "solidity");
-      listener.setTopic(Trigger.SOLIDITY_EVENT, "solidityevent");
-      listener.setTopic(Trigger.SOLIDITY_LOG, "soliditylog");
+      listener.setTopic(EventTopic.BLOCK_TRIGGER.getType(), EventTopic.BLOCK_TRIGGER.getName());
+      listener.setTopic(EventTopic.TRANSACTION_TRIGGER.getType(), EventTopic.TRANSACTION_TRIGGER.getName());
+      listener.setTopic(EventTopic.CONTRACT_LOG_TRIGGER.getType(), EventTopic.CONTRACT_LOG_TRIGGER.getName());
+      listener.setTopic(EventTopic.CONTRACT_EVENT_TRIGGER.getType(), EventTopic.CONTRACT_EVENT_TRIGGER.getName());
+      listener.setTopic(EventTopic.SOLIDITY_TRIGGER.getType(), EventTopic.SOLIDITY_TRIGGER.getName());
+      listener.setTopic(EventTopic.SOLIDITY_EVENT.getType(), EventTopic.SOLIDITY_EVENT.getName());
+      listener.setTopic(EventTopic.SOLIDITY_LOG.getType(), EventTopic.SOLIDITY_LOG.getName());
     });
 
     eventListeners.forEach(IPluginEventListener::start);

plugins/kafkaplugin/build.gradle

@@ -5,5 +5,6 @@ dependencies {
     compileOnly group: 'com.alibaba', name: 'fastjson', version: '1.2.83'
     implementation("org.apache.kafka:kafka-clients:3.9.1") {
         exclude group: "org.slf4j"
+        exclude group: 'org.lz4', module: 'lz4-java'
     }
 }