From b52d2aae17c21f6018ef316998297d149b90ddd6 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 14 Dec 2020 15:31:58 +0200 Subject: [PATCH] Get rid of configuration field --- application/src/main/data/upgrade/2.6.0/schema_update.cql | 1 - application/src/main/data/upgrade/2.6.0/schema_update.sql | 1 - .../server/service/edge/rpc/EdgeGrpcSession.java | 2 +- .../java/org/thingsboard/server/common/data/edge/Edge.java | 2 -- common/edge-api/src/main/proto/edge.proto | 2 +- .../org/thingsboard/server/dao/model/ModelConstants.java | 1 - .../org/thingsboard/server/dao/model/nosql/EdgeEntity.java | 6 ------ .../org/thingsboard/server/dao/model/sql/EdgeEntity.java | 6 ------ dao/src/main/resources/cassandra/schema-entities.cql | 1 - dao/src/main/resources/sql/schema-entities-hsql.sql | 1 - dao/src/main/resources/sql/schema-entities.sql | 1 - 11 files changed, 2 insertions(+), 22 deletions(-) diff --git a/application/src/main/data/upgrade/2.6.0/schema_update.cql b/application/src/main/data/upgrade/2.6.0/schema_update.cql index cad6d658a6..8a95c62969 100644 --- a/application/src/main/data/upgrade/2.6.0/schema_update.cql +++ b/application/src/main/data/upgrade/2.6.0/schema_update.cql @@ -59,7 +59,6 @@ CREATE TABLE IF NOT EXISTS thingsboard.edge ( secret text, edge_license_key text, cloud_endpoint text, - configuration text, additional_info text, PRIMARY KEY (id, tenant_id, customer_id, type) ); diff --git a/application/src/main/data/upgrade/2.6.0/schema_update.sql b/application/src/main/data/upgrade/2.6.0/schema_update.sql index b3bfd07620..c08a854a66 100644 --- a/application/src/main/data/upgrade/2.6.0/schema_update.sql +++ b/application/src/main/data/upgrade/2.6.0/schema_update.sql @@ -19,7 +19,6 @@ CREATE TABLE IF NOT EXISTS edge ( additional_info varchar, customer_id varchar(31), root_rule_chain_id varchar(31), - configuration varchar(10000000), type varchar(255), name varchar(255), label varchar(255), diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java index 83fbc637cb..f4d2a6a3b2 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java @@ -969,7 +969,7 @@ public final class EdgeGrpcSession implements Closeable { .setSecret(edge.getSecret()) .setEdgeLicenseKey(edge.getEdgeLicenseKey()) .setCloudEndpoint(edge.getCloudEndpoint()) - .setConfiguration(JacksonUtil.toString(edge.getConfiguration())) + .setAdditionalInfo(JacksonUtil.toString(edge.getAdditionalInfo())) .setCloudType("CE"); if (edge.getCustomerId() != null) { builder.setCustomerIdMSB(edge.getCustomerId().getId().getMostSignificantBits()) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java index 699fdf954a..67319740ca 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java @@ -47,7 +47,6 @@ public class Edge extends SearchTextBasedWithAdditionalInfo implements H private String secret; private String edgeLicenseKey; private String cloudEndpoint; - private transient JsonNode configuration; public Edge() { super(); @@ -68,7 +67,6 @@ public class Edge extends SearchTextBasedWithAdditionalInfo implements H this.secret = edge.getSecret(); this.edgeLicenseKey = edge.getEdgeLicenseKey(); this.cloudEndpoint = edge.getCloudEndpoint(); - this.configuration = edge.getConfiguration(); } @Override diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto index 1ea5839a2b..d14215d848 100644 --- a/common/edge-api/src/main/proto/edge.proto +++ b/common/edge-api/src/main/proto/edge.proto @@ -87,7 +87,7 @@ message EdgeConfiguration { string secret = 10; string edgeLicenseKey = 11; string cloudEndpoint = 12; - string configuration = 13; + string additionalInfo = 13; string cloudType = 14; } 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 688a22675d..6ad975901d 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 @@ -366,7 +366,6 @@ public class ModelConstants { public static final String EDGE_NAME_PROPERTY = "name"; public static final String EDGE_LABEL_PROPERTY = "label"; public static final String EDGE_TYPE_PROPERTY = "type"; - public static final String EDGE_CONFIGURATION_PROPERTY = "configuration"; public static final String EDGE_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY; public static final String EDGE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "edge_by_tenant_and_search_text"; public static final String EDGE_BY_TENANT_BY_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "edge_by_tenant_by_type_and_search_text"; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EdgeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EdgeEntity.java index 5480a9109f..79d06a4615 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EdgeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EdgeEntity.java @@ -34,7 +34,6 @@ import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.EDGE_ADDITIONAL_INFO_PROPERTY; import static org.thingsboard.server.dao.model.ModelConstants.EDGE_CLOUD_ENDPOINT_KEY_PROPERTY; import static org.thingsboard.server.dao.model.ModelConstants.EDGE_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.EDGE_CONFIGURATION_PROPERTY; import static org.thingsboard.server.dao.model.ModelConstants.EDGE_CUSTOMER_ID_PROPERTY; import static org.thingsboard.server.dao.model.ModelConstants.EDGE_LABEL_PROPERTY; import static org.thingsboard.server.dao.model.ModelConstants.EDGE_LICENSE_KEY_PROPERTY; @@ -91,9 +90,6 @@ public class EdgeEntity implements SearchTextEntity { @Column(name = EDGE_SECRET_PROPERTY) private String secret; - @Column(name = EDGE_CONFIGURATION_PROPERTY, codec = JsonCodec.class) - private JsonNode configuration; - @Column(name = EDGE_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; @@ -131,7 +127,6 @@ public class EdgeEntity implements SearchTextEntity { this.secret = edge.getSecret(); this.edgeLicenseKey = edge.getEdgeLicenseKey(); this.cloudEndpoint = edge.getCloudEndpoint(); - this.configuration = edge.getConfiguration(); this.additionalInfo = edge.getAdditionalInfo(); } @@ -160,7 +155,6 @@ public class EdgeEntity implements SearchTextEntity { edge.setSecret(secret); edge.setEdgeLicenseKey(edgeLicenseKey); edge.setCloudEndpoint(cloudEndpoint); - edge.setConfiguration(configuration); edge.setAdditionalInfo(additionalInfo); return edge; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java index 76bd4f2961..1896e57e66 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EdgeEntity.java @@ -89,10 +89,6 @@ public class EdgeEntity extends BaseSqlEntity implements SearchTextEntity< @Column(name = EDGE_CLOUD_ENDPOINT_KEY_PROPERTY) private String cloudEndpoint; - @Type(type = "json") - @Column(name = ModelConstants.EDGE_CONFIGURATION_PROPERTY) - private JsonNode configuration; - @Type(type = "json") @Column(name = ModelConstants.EDGE_ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; @@ -121,7 +117,6 @@ public class EdgeEntity extends BaseSqlEntity implements SearchTextEntity< this.secret = edge.getSecret(); this.edgeLicenseKey = edge.getEdgeLicenseKey(); this.cloudEndpoint = edge.getCloudEndpoint(); - this.configuration = edge.getConfiguration(); this.additionalInfo = edge.getAdditionalInfo(); } @@ -159,7 +154,6 @@ public class EdgeEntity extends BaseSqlEntity implements SearchTextEntity< edge.setSecret(secret); edge.setEdgeLicenseKey(edgeLicenseKey); edge.setCloudEndpoint(cloudEndpoint); - edge.setConfiguration(configuration); edge.setAdditionalInfo(additionalInfo); return edge; } diff --git a/dao/src/main/resources/cassandra/schema-entities.cql b/dao/src/main/resources/cassandra/schema-entities.cql index 0c3265b6ed..6e65783747 100644 --- a/dao/src/main/resources/cassandra/schema-entities.cql +++ b/dao/src/main/resources/cassandra/schema-entities.cql @@ -739,7 +739,6 @@ CREATE TABLE IF NOT EXISTS thingsboard.edge ( secret text, edge_license_key text, cloud_endpoint text, - configuration text, additional_info text, PRIMARY KEY (id, tenant_id, customer_id, type) ); diff --git a/dao/src/main/resources/sql/schema-entities-hsql.sql b/dao/src/main/resources/sql/schema-entities-hsql.sql index 8aea89a2b4..98e6798ea4 100644 --- a/dao/src/main/resources/sql/schema-entities-hsql.sql +++ b/dao/src/main/resources/sql/schema-entities-hsql.sql @@ -259,7 +259,6 @@ CREATE TABLE IF NOT EXISTS edge ( additional_info varchar, customer_id varchar(31), root_rule_chain_id varchar(31), - configuration varchar(10000000), type varchar(255), name varchar(255), label varchar(255), diff --git a/dao/src/main/resources/sql/schema-entities.sql b/dao/src/main/resources/sql/schema-entities.sql index 4ec76cc845..a30a5b81eb 100644 --- a/dao/src/main/resources/sql/schema-entities.sql +++ b/dao/src/main/resources/sql/schema-entities.sql @@ -259,7 +259,6 @@ CREATE TABLE IF NOT EXISTS edge ( additional_info varchar, customer_id varchar(31), root_rule_chain_id varchar(31), - configuration varchar(10000000), type varchar(255), name varchar(255), label varchar(255),