fixes after merge to PE

common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java

@@ -35,7 +35,13 @@ public enum EntityType {
     ALARM,
     RULE_CHAIN,
     RULE_NODE,
-    ENTITY_VIEW,
+    ENTITY_VIEW {
+        // backward compatibility for TbMsgTypeSwitchNode to return correct rule node connection.
+        @Override
+        public String getNormalName() {
+            return "Entity View";
+        }
+    },
     WIDGETS_BUNDLE,
     WIDGET_TYPE,
     TENANT_PROFILE,
@@ -53,7 +59,6 @@ public enum EntityType {
     NOTIFICATION,
     NOTIFICATION_RULE;
 
-
     public static final List<String> NORMAL_NAMES = EnumSet.allOf(EntityType.class).stream()
             .map(EntityType::getNormalName).collect(Collectors.toUnmodifiableList());
 

common/data/src/test/java/org/thingsboard/server/common/data/EntityTypeTest.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class EntityTypeTest {
+
+    // backward-compatibility test
+    @Test
+    void getNormalNameTest() {
+        assertThat(EntityType.ENTITY_VIEW.getNormalName()).isEqualTo("Entity View");
+    }
+
+}

common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java

@@ -438,11 +438,7 @@ public final class TbMsg implements Serializable {
 
     public TbMsgCallback getCallback() {
         // May be null in case of deserialization;
-        if (callback != null) {
-            return callback;
-        } else {
-            return TbMsgCallback.EMPTY;
-        }
+        return Objects.requireNonNullElse(callback, TbMsgCallback.EMPTY);
     }
 
     public void pushToStack(RuleChainId ruleChainId, RuleNodeId ruleNodeId) {

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java

@@ -96,7 +96,7 @@ public class TbCopyAttributesToEntityViewNode implements TbNode {
                                 if ((endTime != 0 && endTime > now && startTime < now) || (endTime == 0 && startTime < now)) {
                                     if (ATTRIBUTES_DELETED.name().equals(msg.getType())) {
                                         List<String> attributes = new ArrayList<>();
-                                        for (JsonElement element : new JsonParser().parse(msg.getData()).getAsJsonObject().get("attributes").getAsJsonArray()) {
+                                        for (JsonElement element : JsonParser.parseString(msg.getData()).getAsJsonObject().get("attributes").getAsJsonArray()) {
                                             if (element.isJsonPrimitive()) {
                                                 JsonPrimitive value = element.getAsJsonPrimitive();
                                                 if (value.isString()) {
@@ -111,7 +111,7 @@ public class TbCopyAttributesToEntityViewNode implements TbNode {
                                                     getFutureCallback(ctx, msg, entityView));
                                         }
                                     } else {
-                                        Set<AttributeKvEntry> attributes = JsonConverter.convertToAttributes(new JsonParser().parse(msg.getData()));
+                                        Set<AttributeKvEntry> attributes = JsonConverter.convertToAttributes(JsonParser.parseString(msg.getData()));
                                         List<AttributeKvEntry> filteredAttributes =
                                                 attributes.stream().filter(attr -> attributeContainsInEntityView(scope, attr.getKey(), entityView)).collect(Collectors.toList());
                                         ctx.getTelemetryService().saveAndNotify(ctx.getTenantId(), entityView.getId(), scope, filteredAttributes,

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNode.java

@@ -28,6 +28,7 @@ import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -96,7 +97,7 @@ public class TbMsgGeneratorNode implements TbNode {
             if (initialized.compareAndSet(false, true)) {
                 this.scriptEngine = ctx.createScriptEngine(config.getScriptLang(),
                         ScriptLanguage.TBEL.equals(config.getScriptLang()) ? config.getTbelScript() : config.getJsScript(), "prevMsg", "prevMetadata", "prevMsgType");
-                scheduleTickMsg(ctx);
+                scheduleTickMsg(ctx, null);
             }
         } else if (initialized.compareAndSet(true, false)) {
             destroy();
@@ -113,7 +114,7 @@ public class TbMsgGeneratorNode implements TbNode {
                         log.trace("onMsg onSuccess callback, took {}ms, config {}, msg {}", sw.stopAndGetTotalTimeMillis(), config, msg);
                         if (initialized.get() && (config.getMsgCount() == TbMsgGeneratorNodeConfiguration.UNLIMITED_MSG_COUNT || currentMsgCount < config.getMsgCount())) {
                             ctx.enqueueForTellNext(m, TbNodeConnectionType.SUCCESS);
-                            scheduleTickMsg(ctx);
+                            scheduleTickMsg(ctx, msg);
                             currentMsgCount++;
                         }
                     },
@@ -121,14 +122,14 @@ public class TbMsgGeneratorNode implements TbNode {
                         log.trace("onMsg onFailure callback, took {}ms, config {}, msg {}", sw.stopAndGetTotalTimeMillis(), config, msg, t);
                         if (initialized.get() && (config.getMsgCount() == TbMsgGeneratorNodeConfiguration.UNLIMITED_MSG_COUNT || currentMsgCount < config.getMsgCount())) {
                             ctx.tellFailure(msg, t);
-                            scheduleTickMsg(ctx);
+                            scheduleTickMsg(ctx, msg);
                             currentMsgCount++;
                         }
                     });
         }
     }
 
-    private void scheduleTickMsg(TbContext ctx) {
+    private void scheduleTickMsg(TbContext ctx, TbMsg msg) {
         log.trace("scheduleTickMsg, config {}", config);
         long curTs = System.currentTimeMillis();
         if (lastScheduledTs == 0L) {
@@ -136,7 +137,8 @@ public class TbMsgGeneratorNode implements TbNode {
         }
         lastScheduledTs = lastScheduledTs + delay;
         long curDelay = Math.max(0L, (lastScheduledTs - curTs));
-        TbMsg tickMsg = ctx.newMsg(config.getQueueName(), TbMsgType.GENERATOR_NODE_SELF_MSG, ctx.getSelfId(), TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
+        TbMsg tickMsg = ctx.newMsg(config.getQueueName(), TbMsgType.GENERATOR_NODE_SELF_MSG, ctx.getSelfId(),
+                getCustomerIdFromMsg(msg), TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING);
         nextTickId = tickMsg.getId();
         ctx.tellSelf(tickMsg, curDelay);
     }
@@ -159,6 +161,10 @@ public class TbMsgGeneratorNode implements TbNode {
 
     }
 
+    private CustomerId getCustomerIdFromMsg(TbMsg msg) {
+        return msg != null ? msg.getCustomerId() : null;
+    }
+
     @Override
     public void destroy() {
         log.trace("destroy, config {}", config);

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java

@@ -88,7 +88,7 @@ public class TbMsgTimeseriesNode implements TbNode {
         }
         long ts = computeTs(msg, config.isUseServerTs());
         String src = msg.getData();
-        Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToTelemetry(new JsonParser().parse(src), ts);
+        Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToTelemetry(JsonParser.parseString(src), ts);
         if (tsKvMap.isEmpty()) {
             ctx.tellFailure(msg, new IllegalArgumentException("Msg body is empty: " + src));
             return;