diff --git a/application/src/main/data/upgrade/1.5.0/schema_update.cql b/application/src/main/data/upgrade/1.5.0/schema_update.cql index 3e56de1bb3..aa8b10bdfd 100644 --- a/application/src/main/data/upgrade/1.5.0/schema_update.cql +++ b/application/src/main/data/upgrade/1.5.0/schema_update.cql @@ -68,7 +68,7 @@ CREATE TABLE IF NOT EXISTS thingsboard.rule_chain ( name text, search_text text, first_rule_node_id uuid, - is_root boolean, + root boolean, configuration text, additional_info text, PRIMARY KEY (id, tenant_id) diff --git a/application/src/main/data/upgrade/1.5.0/schema_update.sql b/application/src/main/data/upgrade/1.5.0/schema_update.sql index 12b80b3072..0043ed5bb0 100644 --- a/application/src/main/data/upgrade/1.5.0/schema_update.sql +++ b/application/src/main/data/upgrade/1.5.0/schema_update.sql @@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS rule_chain ( configuration varchar(10000000), name varchar(255), first_rule_node_id varchar(31), - is_root boolean, + root boolean, search_text varchar(255), tenant_id varchar(31) ); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java index 48bc5de4de..e82c850b9d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java @@ -36,7 +36,7 @@ public class RuleChain extends SearchTextBasedWithAdditionalInfo im private TenantId tenantId; private String name; private RuleNodeId firstRuleNodeId; - private boolean isRoot; + private boolean root; private transient JsonNode configuration; @JsonIgnore private byte[] configurationBytes; @@ -54,7 +54,7 @@ public class RuleChain extends SearchTextBasedWithAdditionalInfo im this.tenantId = ruleChain.getTenantId(); this.name = ruleChain.getName(); this.firstRuleNodeId = ruleChain.getFirstRuleNodeId(); - this.isRoot = ruleChain.isRoot(); + this.root = ruleChain.isRoot(); this.setConfiguration(ruleChain.getConfiguration()); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java index c68c23dc91..a159b9e6ec 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java @@ -339,7 +339,7 @@ public class ModelConstants { public static final String RULE_CHAIN_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String RULE_CHAIN_NAME_PROPERTY = "name"; public static final String RULE_CHAIN_FIRST_RULE_NODE_ID_PROPERTY = "first_rule_node_id"; - public static final String RULE_CHAIN_IS_ROOT_PROPERTY = "is_root"; + public static final String RULE_CHAIN_ROOT_PROPERTY = "root"; public static final String RULE_CHAIN_CONFIGURATION_PROPERTY = "configuration"; public static final String RULE_CHAIN_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "rule_chain_by_tenant_and_search_text"; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java index 962da0a68c..34659a83df 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleChainEntity.java @@ -52,8 +52,8 @@ public class RuleChainEntity implements SearchTextEntity { private String searchText; @Column(name = RULE_CHAIN_FIRST_RULE_NODE_ID_PROPERTY) private UUID firstRuleNodeId; - @Column(name = RULE_CHAIN_IS_ROOT_PROPERTY) - private boolean isRoot; + @Column(name = RULE_CHAIN_ROOT_PROPERTY) + private boolean root; @Column(name = RULE_CHAIN_CONFIGURATION_PROPERTY, codec = JsonCodec.class) private JsonNode configuration; @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) @@ -70,7 +70,7 @@ public class RuleChainEntity implements SearchTextEntity { this.name = ruleChain.getName(); this.searchText = ruleChain.getName(); this.firstRuleNodeId = DaoUtil.getId(ruleChain.getFirstRuleNodeId()); - this.isRoot = ruleChain.isRoot(); + this.root = ruleChain.isRoot(); this.configuration = ruleChain.getConfiguration(); this.additionalInfo = ruleChain.getAdditionalInfo(); } @@ -120,11 +120,11 @@ public class RuleChainEntity implements SearchTextEntity { } public boolean isRoot() { - return isRoot; + return root; } - public void setRoot(boolean isRoot) { - this.isRoot = isRoot; + public void setRoot(boolean root) { + this.root = root; } public String getSearchText() { @@ -156,7 +156,7 @@ public class RuleChainEntity implements SearchTextEntity { if (this.firstRuleNodeId != null) { ruleChain.setFirstRuleNodeId(new RuleNodeId(this.firstRuleNodeId)); } - ruleChain.setRoot(this.isRoot); + ruleChain.setRoot(this.root); ruleChain.setConfiguration(this.configuration); ruleChain.setAdditionalInfo(this.additionalInfo); return ruleChain; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java index 518eda7821..471ec7b06b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleChainEntity.java @@ -55,8 +55,8 @@ public class RuleChainEntity extends BaseSqlEntity implements SearchT @Column(name = ModelConstants.RULE_CHAIN_FIRST_RULE_NODE_ID_PROPERTY) private String firstRuleNodeId; - @Column(name = ModelConstants.RULE_CHAIN_IS_ROOT_PROPERTY) - private boolean isRoot; + @Column(name = ModelConstants.RULE_CHAIN_ROOT_PROPERTY) + private boolean root; @Type(type = "json") @Column(name = ModelConstants.RULE_CHAIN_CONFIGURATION_PROPERTY) @@ -79,7 +79,7 @@ public class RuleChainEntity extends BaseSqlEntity implements SearchT if (ruleChain.getFirstRuleNodeId() != null) { this.firstRuleNodeId = UUIDConverter.fromTimeUUID(ruleChain.getFirstRuleNodeId().getId()); } - this.isRoot = ruleChain.isRoot(); + this.root = ruleChain.isRoot(); this.configuration = ruleChain.getConfiguration(); this.additionalInfo = ruleChain.getAdditionalInfo(); } @@ -103,7 +103,7 @@ public class RuleChainEntity extends BaseSqlEntity implements SearchT if (firstRuleNodeId != null) { ruleChain.setFirstRuleNodeId(new RuleNodeId(UUIDConverter.fromString(firstRuleNodeId))); } - ruleChain.setRoot(isRoot); + ruleChain.setRoot(root); ruleChain.setConfiguration(configuration); ruleChain.setAdditionalInfo(additionalInfo); return ruleChain; diff --git a/dao/src/main/resources/cassandra/schema.cql b/dao/src/main/resources/cassandra/schema.cql index 0ccf2badf8..42c13f3ee6 100644 --- a/dao/src/main/resources/cassandra/schema.cql +++ b/dao/src/main/resources/cassandra/schema.cql @@ -668,7 +668,7 @@ CREATE TABLE IF NOT EXISTS thingsboard.rule_chain ( name text, search_text text, first_rule_node_id uuid, - is_root boolean, + root boolean, configuration text, additional_info text, PRIMARY KEY (id, tenant_id) diff --git a/dao/src/main/resources/sql/schema.sql b/dao/src/main/resources/sql/schema.sql index e525007080..106204ab64 100644 --- a/dao/src/main/resources/sql/schema.sql +++ b/dao/src/main/resources/sql/schema.sql @@ -262,7 +262,7 @@ CREATE TABLE IF NOT EXISTS rule_chain ( configuration varchar(10000000), name varchar(255), first_rule_node_id varchar(31), - is_root boolean, + root boolean, search_text varchar(255), tenant_id varchar(31) );