Merge pull request tronprotocol#10 from tronprotocol/develop

fix bug for event plugin

Author: DorianRust

.idea/vcs.xml

@@ -3,23 +3,23 @@
 import org.pf4j.ExtensionPoint;
 
 public interface IPluginEventListener extends ExtensionPoint {
-    public void setServerAddress(String address);
+    void setServerAddress(String address);
 
-    public void setTopic(int eventType, String topic);
+    void setTopic(int eventType, String topic);
 
-    public void setDBConfig(String dbConfig);
+    void setDBConfig(String dbConfig);
 
     // start should be called after setServerAddress, setTopic, setDBConfig
-    public void start();
+    void start();
 
-    public void handleBlockEvent(Object data);
+    void handleBlockEvent(Object data);
 
-    public void handleTransactionTrigger(Object data);
+    void handleTransactionTrigger(Object data);
 
-    public void handleContractLogTrigger(Object data);
+    void handleContractLogTrigger(Object data);
 
-    public void handleContractEventTrigger(Object data);
+    void handleContractEventTrigger(Object data);
 
-    public void handleSolidityTrigger(Object trigger);
+    void handleSolidityTrigger(Object trigger);
 
 }

api/src/main/java/org/tron/common/logsfilter/IPluginEventListener.java

@@ -16,4 +16,8 @@ public String toString() {
         .append(", latestSolidifiedBlockNumber: ")
         .append(latestSolidifiedBlockNumber).toString();
   }
+
+  public SolidityTrigger() {
+    setTriggerName(Trigger.SOLIDITY_TRIGGER_NAME);
+  }
 }

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

@@ -16,9 +16,11 @@ public class Trigger {
   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 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";
 }

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

@@ -44,7 +44,7 @@ public void handleBlockEvent(Object data) {
             return;
         }
 
-        MessageSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MessageSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 
     @Override
@@ -53,7 +53,7 @@ public void handleTransactionTrigger(Object data) {
             return;
         }
 
-        MessageSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MessageSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 
     @Override
@@ -62,7 +62,7 @@ public void handleSolidityTrigger(Object data) {
             return;
         }
 
-        MessageSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MessageSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 
     @Override
@@ -71,7 +71,7 @@ public void handleContractLogTrigger(Object data) {
             return;
         }
 
-        MessageSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MessageSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 
     @Override
@@ -80,6 +80,6 @@ public void handleContractEventTrigger(Object data) {
             return;
         }
 
-        MessageSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MessageSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 }

plugins/kafkaplugin/src/main/java/org/tron/eventplugin/KafkaEventListener.java

@@ -44,7 +44,7 @@ public void handleBlockEvent(Object data) {
             return;
         }
 
-        MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MongodbSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 
     @Override
@@ -53,7 +53,7 @@ public void handleTransactionTrigger(Object data) {
             return;
         }
 
-        MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MongodbSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 
     @Override
@@ -62,7 +62,7 @@ public void handleContractLogTrigger(Object data) {
             return;
         }
 
-        MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MongodbSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 
     @Override
@@ -71,7 +71,7 @@ public void handleContractEventTrigger(Object data) {
             return;
         }
 
-        MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MongodbSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 
     @Override
@@ -80,6 +80,6 @@ public void handleSolidityTrigger(Object data) {
             return;
         }
 
-        MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+        MongodbSenderImpl.getInstance().getTriggerQueue().offer(data);
     }
 }

plugins/mongodbplugin/src/main/java/org/tron/eventplugin/MongodbEventListener.java

@@ -134,6 +134,9 @@ private void createCollections(){
 
         mongoManager.createCollection(contractEventTopic);
         createMongoTemplate(contractEventTopic);
+
+        mongoManager.createCollection(solidityTopic);
+        createMongoTemplate(solidityTopic);
     }
 
     private void loadMongoConfig(){