Browse Source

renamed property

pull/10581/head
IrynaMatveieva 2 years ago
parent
commit
baed618604
  1. 10
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNode.java
  2. 4
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeConfiguration.java
  3. 12
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeTest.java

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

@ -175,7 +175,7 @@ public class TbSaveToCustomCassandraTableNode implements TbNode {
query.append("?, "); query.append("?, ");
} }
} }
if (config.getDefaultTtL() > 0) { if (config.getDefaultTtl() > 0) {
query.append(" USING TTL ?"); query.append(" USING TTL ?");
} }
return query.toString(); return query.toString();
@ -219,8 +219,8 @@ public class TbSaveToCustomCassandraTableNode implements TbNode {
} }
i.getAndIncrement(); i.getAndIncrement();
}); });
if (config.getDefaultTtL() > 0) { if (config.getDefaultTtl() > 0) {
stmtBuilder.setInt(i.get(), config.getDefaultTtL()); stmtBuilder.setInt(i.get(), config.getDefaultTtl());
} }
return getFuture(executeAsyncWrite(ctx, stmtBuilder.build()), rs -> null); return getFuture(executeAsyncWrite(ctx, stmtBuilder.build()), rs -> null);
} }
@ -267,9 +267,9 @@ public class TbSaveToCustomCassandraTableNode implements TbNode {
boolean hasChanges = false; boolean hasChanges = false;
switch (fromVersion) { switch (fromVersion) {
case 0: case 0:
if (!oldConfiguration.has("defaultTtL")) { if (!oldConfiguration.has("defaultTtl")) {
hasChanges = true; hasChanges = true;
((ObjectNode) oldConfiguration).put("defaultTtL", 0); ((ObjectNode) oldConfiguration).put("defaultTtl", 0);
} }
break; break;
default: default:

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

@ -27,13 +27,13 @@ public class TbSaveToCustomCassandraTableNodeConfiguration implements NodeConfig
private String tableName; private String tableName;
private Map<String, String> fieldsMapping; private Map<String, String> fieldsMapping;
private int defaultTtL; private int defaultTtl;
@Override @Override
public TbSaveToCustomCassandraTableNodeConfiguration defaultConfiguration() { public TbSaveToCustomCassandraTableNodeConfiguration defaultConfiguration() {
TbSaveToCustomCassandraTableNodeConfiguration configuration = new TbSaveToCustomCassandraTableNodeConfiguration(); TbSaveToCustomCassandraTableNodeConfiguration configuration = new TbSaveToCustomCassandraTableNodeConfiguration();
configuration.setDefaultTtL(0); configuration.setDefaultTtl(0);
configuration.setTableName(""); configuration.setTableName("");
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("", ""); map.put("", "");

12
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeTest.java

@ -135,7 +135,7 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
public void verifyDefaultConfig() { public void verifyDefaultConfig() {
assertThat(config.getTableName()).isEqualTo(""); assertThat(config.getTableName()).isEqualTo("");
assertThat(config.getFieldsMapping()).isEqualTo(Map.of("", "")); assertThat(config.getFieldsMapping()).isEqualTo(Map.of("", ""));
assertThat(config.getDefaultTtL()).isEqualTo(0); assertThat(config.getDefaultTtl()).isEqualTo(0);
} }
@Test @Test
@ -240,7 +240,7 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
Consumer<BoundStatementBuilder> verifyBuilder) throws TbNodeException { Consumer<BoundStatementBuilder> verifyBuilder) throws TbNodeException {
config.setTableName("readings"); config.setTableName("readings");
config.setFieldsMapping(Map.of("$entityId", "entityIdTableColumn")); config.setFieldsMapping(Map.of("$entityId", "entityIdTableColumn"));
config.setDefaultTtL(ttlFromConfig); config.setDefaultTtl(ttlFromConfig);
mockOnInit(); mockOnInit();
willAnswer(invocation -> boundStatementBuilderMock).given(node).getStmtBuilder(); willAnswer(invocation -> boundStatementBuilderMock).given(node).getStmtBuilder();
@ -271,7 +271,7 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
@Test @Test
public void givenValidMsgStructure_whenOnMsg_thenVerifyMatchOfValuesInsertionOrderIntoStatementAndSaveToCustomCassandraTable() throws TbNodeException { public void givenValidMsgStructure_whenOnMsg_thenVerifyMatchOfValuesInsertionOrderIntoStatementAndSaveToCustomCassandraTable() throws TbNodeException {
config.setDefaultTtL(25); config.setDefaultTtl(25);
config.setTableName("readings"); config.setTableName("readings");
Map<String, String> mappings = Map.of( Map<String, String> mappings = Map.of(
"$entityId", "entityIdTableColumn", "$entityId", "entityIdTableColumn",
@ -325,13 +325,13 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad
Arguments.of(0, Arguments.of(0,
"{\"tableName\":\"\",\"fieldsMapping\":{\"\":\"\"}}", "{\"tableName\":\"\",\"fieldsMapping\":{\"\":\"\"}}",
true, true,
"{\"tableName\":\"\",\"fieldsMapping\":{\"\":\"\"},\"defaultTtL\":0}" "{\"tableName\":\"\",\"fieldsMapping\":{\"\":\"\"},\"defaultTtl\":0}"
), ),
// default config for version 1 with upgrade from version 1 // default config for version 1 with upgrade from version 1
Arguments.of(1, Arguments.of(1,
"{\"tableName\":\"\",\"fieldsMapping\":{\"\":\"\"},\"defaultTtL\":0}", "{\"tableName\":\"\",\"fieldsMapping\":{\"\":\"\"},\"defaultTtl\":0}",
false, false,
"{\"tableName\":\"\",\"fieldsMapping\":{\"\":\"\"},\"defaultTtL\":0}" "{\"tableName\":\"\",\"fieldsMapping\":{\"\":\"\"},\"defaultTtl\":0}"
) )
); );
} }

Loading…
Cancel
Save