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

Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge

Browse Source
This commit is contained in:
Volodymyr Babak 2020-12-14 15:45:38 +02:00
commit 32b608e10d
9 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/data/upgrade/2.6.0/schema_update.cql
View File

@ -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)
);

1
application/src/main/data/upgrade/2.6.0/schema_update.sql
View File

@ -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),

2
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
View File

@ -976,7 +976,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())

2
common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
View File

@ -47,7 +47,6 @@ public class Edge extends SearchTextBasedWithAdditionalInfo<EdgeId> 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<EdgeId> implements H
this.secret = edge.getSecret();
this.edgeLicenseKey = edge.getEdgeLicenseKey();
this.cloudEndpoint = edge.getCloudEndpoint();
this.configuration = edge.getConfiguration();
}
@Override

2
common/edge-api/src/main/proto/edge.proto
View File

@ -87,7 +87,7 @@ message EdgeConfiguration {
string secret = 10;
string edgeLicenseKey = 11;
string cloudEndpoint = 12;
string configuration = 13;
string additionalInfo = 13;
string cloudType = 14;
}

1
dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
View File

@ -465,7 +465,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";

7
dao/src/main/java/org/thingsboard/server/dao/model/sql/AbstractEdgeEntity.java
View File

@ -86,10 +86,6 @@ public abstract class AbstractEdgeEntity<T extends Edge> extends BaseSqlEntity<T
@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;
@ -118,7 +114,6 @@ public abstract class AbstractEdgeEntity<T extends Edge> extends BaseSqlEntity<T
this.secret = edge.getSecret();
this.edgeLicenseKey = edge.getEdgeLicenseKey();
this.cloudEndpoint = edge.getCloudEndpoint();
this.configuration = edge.getConfiguration();
this.additionalInfo = edge.getAdditionalInfo();
}
@ -135,7 +130,6 @@ public abstract class AbstractEdgeEntity<T extends Edge> extends BaseSqlEntity<T
this.secret = edgeEntity.getSecret();
this.edgeLicenseKey = edgeEntity.getEdgeLicenseKey();
this.cloudEndpoint = edgeEntity.getCloudEndpoint();
this.configuration = edgeEntity.getConfiguration();
this.additionalInfo = edgeEntity.getAdditionalInfo();
}
@ -172,7 +166,6 @@ public abstract class AbstractEdgeEntity<T extends Edge> extends BaseSqlEntity<T
edge.setSecret(secret);
edge.setEdgeLicenseKey(edgeLicenseKey);
edge.setCloudEndpoint(cloudEndpoint);
edge.setConfiguration(configuration);
edge.setAdditionalInfo(additionalInfo);
return edge;
}

1
dao/src/main/resources/sql/schema-entities-hsql.sql
View File

@ -427,7 +427,6 @@ CREATE TABLE IF NOT EXISTS edge (
additional_info varchar,
customer_id uuid,
root_rule_chain_id uuid,
configuration varchar(10000000),
type varchar(255),
name varchar(255),
label varchar(255),

1
dao/src/main/resources/sql/schema-entities.sql
View File

@ -454,7 +454,6 @@ CREATE TABLE IF NOT EXISTS edge (
additional_info varchar,
customer_id uuid,
root_rule_chain_id uuid,
configuration varchar(10000000),
type varchar(255),
name varchar(255),
label varchar(255),