Merge branch 'rc' of github.com:thingsboard/thingsboard

application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java

@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.netty.channel.EventLoopGroup;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.util.Arrays;
+import org.thingsboard.common.util.DebugModeUtil;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ListeningExecutor;
 import org.thingsboard.rule.engine.api.MailService;
@@ -64,7 +65,6 @@ import org.thingsboard.server.common.data.msg.TbNodeConnectionType;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.rule.RuleNode;
-import org.thingsboard.common.util.DebugModeUtil;
 import org.thingsboard.server.common.data.rule.RuleNodeState;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
 import org.thingsboard.server.common.msg.TbActorMsg;
@@ -196,8 +196,7 @@ public class DefaultTbContext implements TbContext {
 
     @Override
     public void enqueue(TbMsg tbMsg, Runnable onSuccess, Consumer<Throwable> onFailure) {
-        TopicPartitionInfo tpi = resolvePartition(tbMsg, MAIN_QUEUE_NAME);
-        enqueue(tpi, tbMsg, onFailure, onSuccess);
+        enqueue(tbMsg, MAIN_QUEUE_NAME, onSuccess, onFailure);
     }
 
     @Override

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java

@@ -144,11 +144,19 @@ public interface TbContext {
 
     /**
      * Puts new message to queue for processing by the Root Rule Chain
+     * WARNING: message is put to the Main queue. To specify other queue name - use {@link #enqueue(TbMsg, String, Runnable, Consumer)}
      *
      * @param msg - message
      */
     void enqueue(TbMsg msg, Runnable onSuccess, Consumer<Throwable> onFailure);
 
+    /**
+     * Puts new message to custom queue for processing
+     *
+     * @param msg - message
+     */
+    void enqueue(TbMsg msg, String queueName, Runnable onSuccess, Consumer<Throwable> onFailure);
+
     /**
      * Sends message to the nested rule chain.
      * Fails processing of the message if the nested rule chain is not found.
@@ -167,13 +175,6 @@ public interface TbContext {
      */
     void output(TbMsg msg, String relationType);
 
-    /**
-     * Puts new message to custom queue for processing
-     *
-     * @param msg - message
-     */
-    void enqueue(TbMsg msg, String queueName, Runnable onSuccess, Consumer<Throwable> onFailure);
-
     void enqueueForTellFailure(TbMsg msg, String failureMessage);
 
     void enqueueForTellFailure(TbMsg tbMsg, Throwable t);