dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8425 from YevhenBondarenko/fix/log-node

Browse Source 
fexed NPE in log node
This commit is contained in:
Andrew Shvayka 2023-04-24 19:34:35 +03:00 committed by GitHub
commit b6efa77605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbLogNode.java
View File

@ -92,10 +92,12 @@ public class TbLogNode implements TbNode {
boolean isStandard(TbLogNodeConfiguration conf) { boolean isStandard(TbLogNodeConfiguration conf) {
Objects.requireNonNull(conf, "node config is null"); Objects.requireNonNull(conf, "node config is null");
final TbLogNodeConfiguration defaultConfig = new TbLogNodeConfiguration().defaultConfiguration(); final TbLogNodeConfiguration defaultConfig = new TbLogNodeConfiguration().defaultConfiguration();
switch (conf.getScriptLang()) {
case JS: return defaultConfig.getJsScript().equals(conf.getJsScript()); if (conf.getScriptLang() == null || conf.getScriptLang().equals(ScriptLanguage.JS)) {
case TBEL: return defaultConfig.getTbelScript().equals(conf.getTbelScript()); return defaultConfig.getJsScript().equals(conf.getJsScript());
default: } else if (conf.getScriptLang().equals(ScriptLanguage.TBEL)) {
return defaultConfig.getTbelScript().equals(conf.getTbelScript());
} else {
log.warn("No rule to define isStandard script for script language [{}], assuming that is non-standard", conf.getScriptLang()); log.warn("No rule to define isStandard script for script language [{}], assuming that is non-standard", conf.getScriptLang());
return false; return false;
} }

13
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbLogNodeTest.java
View File

@ -110,6 +110,19 @@ public class TbLogNodeTest {
} }
@Test
void backwardCompatibility_whenScriptLangIsNull() throws TbNodeException {
TbLogNodeConfiguration config = new TbLogNodeConfiguration().defaultConfiguration();
TbLogNode node = spy(new TbLogNode());
TbNodeConfiguration tbNodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
TbContext ctx = mock(TbContext.class);
node.init(ctx, tbNodeConfiguration);
assertThat(node.isStandard(config)).as("Script is standard for language JS").isTrue();
verify(node, never()).createScriptEngine(any(), any());
verify(ctx, never()).createScriptEngine(any(), anyString());
}
@Test @Test
void givenScriptEngineEnum_whenNewAdded_thenFailed() { void givenScriptEngineEnum_whenNewAdded_thenFailed() {
assertThat(ScriptLanguage.values().length).as("only two ScriptLanguage supported").isEqualTo(2); assertThat(ScriptLanguage.values().length).as("only two ScriptLanguage supported").isEqualTo(2);