Data structures

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/TelemetryPluginCmdsWrapper.java

@@ -21,6 +21,8 @@ import org.thingsboard.server.service.telemetry.cmd.v1.GetHistoryCmd;
 import org.thingsboard.server.service.telemetry.cmd.v1.TimeseriesSubscriptionCmd;
 import org.thingsboard.server.service.telemetry.cmd.v2.AlarmDataCmd;
 import org.thingsboard.server.service.telemetry.cmd.v2.AlarmDataUnsubscribeCmd;
+import org.thingsboard.server.service.telemetry.cmd.v2.EntityCountCmd;
+import org.thingsboard.server.service.telemetry.cmd.v2.EntityCountUnsubscribeCmd;
 import org.thingsboard.server.service.telemetry.cmd.v2.EntityDataCmd;
 import org.thingsboard.server.service.telemetry.cmd.v2.EntityDataUnsubscribeCmd;
 
@@ -46,4 +48,8 @@ public class TelemetryPluginCmdsWrapper {
 
     private List<AlarmDataUnsubscribeCmd> alarmDataUnsubscribeCmds;
 
+    private List<EntityCountCmd> entityCountCmds;
+
+    private List<EntityCountUnsubscribeCmd> entityCountUnsubscribeCmds;
+
 }

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/AlarmDataUpdate.java

@@ -18,14 +18,14 @@ package org.thingsboard.server.service.telemetry.cmd.v2;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.AlarmData;
-import org.thingsboard.server.common.data.query.EntityData;
 import org.thingsboard.server.service.telemetry.sub.SubscriptionErrorCode;
 
 import java.util.List;
 
+@ToString
 public class AlarmDataUpdate extends DataUpdate<AlarmData> {
 
     @Getter
@@ -44,8 +44,8 @@ public class AlarmDataUpdate extends DataUpdate<AlarmData> {
     }
 
     @Override
-    public DataUpdateType getDataUpdateType() {
-        return DataUpdateType.ALARM_DATA;
+    public CmdUpdateType getCmdUpdateType() {
+        return CmdUpdateType.ALARM_DATA;
     }
 
     @JsonCreator

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/CmdUpdate.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.telemetry.cmd.v2;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public abstract class CmdUpdate {
+
+    private final int cmdId;
+    private final int errorCode;
+    private final String errorMsg;
+
+    public abstract CmdUpdateType getCmdUpdateType();
+
+}

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/DataUpdateType.java → application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/CmdUpdateType.java

@@ -15,7 +15,8 @@
  */
 package org.thingsboard.server.service.telemetry.cmd.v2;
 
-public enum DataUpdateType {
+public enum CmdUpdateType {
     ENTITY_DATA,
-    ALARM_DATA
+    ALARM_DATA,
+    COUNT_DATA
 }

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/DataUpdate.java

@@ -18,21 +18,27 @@ package org.thingsboard.server.service.telemetry.cmd.v2;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.service.telemetry.sub.SubscriptionErrorCode;
 
 import java.util.List;
 
-@Data
-@AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class DataUpdate<T> {
+public abstract class DataUpdate<T> extends CmdUpdate {
 
-    private final int cmdId;
+    @Getter
     private final PageData<T> data;
+    @Getter
     private final List<T> update;
-    private final int errorCode;
-    private final String errorMsg;
+
+    public DataUpdate(int cmdId, PageData<T> data, List<T> update, int errorCode, String errorMsg) {
+        super(cmdId, errorCode, errorMsg);
+        this.data = data;
+        this.update = update;
+    }
 
     public DataUpdate(int cmdId, PageData<T> data, List<T> update) {
         this(cmdId, data, update, SubscriptionErrorCode.NO_ERROR.getCode(), null);
@@ -42,5 +48,4 @@ public abstract class DataUpdate<T> {
         this(cmdId, null, null, errorCode, errorMsg);
     }
 
-    public abstract DataUpdateType getDataUpdateType();
 }

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/EntityCountCmd.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.telemetry.cmd.v2;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import org.thingsboard.server.common.data.query.EntityCountQuery;
+import org.thingsboard.server.common.data.query.EntityDataQuery;
+
+public class EntityCountCmd extends DataCmd {
+
+    @Getter
+    private final EntityCountQuery query;
+
+    @JsonCreator
+    public EntityCountCmd(@JsonProperty("cmdId") int cmdId,
+                          @JsonProperty("query") EntityCountQuery query) {
+        super(cmdId);
+        this.query = query;
+    }
+}

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/EntityCountUnsubscribeCmd.java

@@ -0,0 +1,25 @@
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.telemetry.cmd.v2;
+
+import lombok.Data;
+
+@Data
+public class EntityCountUnsubscribeCmd implements UnsubscribeCmd {
+
+    private final int cmdId;
+
+}

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/EntityCountUpdate.java

@@ -0,0 +1,57 @@
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.telemetry.cmd.v2;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.ToString;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.query.EntityData;
+import org.thingsboard.server.service.telemetry.sub.SubscriptionErrorCode;
+
+import java.util.List;
+
+@ToString
+public class EntityCountUpdate extends CmdUpdate {
+
+    @Getter
+    private int count;
+
+    public EntityCountUpdate(int cmdId, int count) {
+        super(cmdId, SubscriptionErrorCode.NO_ERROR.getCode(), null);
+        this.count = count;
+    }
+
+    public EntityCountUpdate(int cmdId, int errorCode, String errorMsg) {
+        super(cmdId, errorCode, errorMsg);
+    }
+
+    @Override
+    public CmdUpdateType getCmdUpdateType() {
+        return CmdUpdateType.COUNT_DATA;
+    }
+
+    @JsonCreator
+    public EntityCountUpdate(@JsonProperty("cmdId") int cmdId,
+                             @JsonProperty("count") int count,
+                             @JsonProperty("errorCode") int errorCode,
+                             @JsonProperty("errorMsg") String errorMsg) {
+        super(cmdId, errorCode, errorMsg);
+        this.count = count;
+    }
+
+}

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/EntityDataUpdate.java

@@ -16,16 +16,16 @@
 package org.thingsboard.server.service.telemetry.cmd.v2;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
+import lombok.ToString;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.query.EntityData;
 import org.thingsboard.server.service.telemetry.sub.SubscriptionErrorCode;
 
 import java.util.List;
 
-
+@ToString
 public class EntityDataUpdate extends DataUpdate<EntityData> {
 
     @Getter
@@ -41,8 +41,8 @@ public class EntityDataUpdate extends DataUpdate<EntityData> {
     }
 
     @Override
-    public DataUpdateType getDataUpdateType() {
-        return DataUpdateType.ENTITY_DATA;
+    public CmdUpdateType getCmdUpdateType() {
+        return CmdUpdateType.ENTITY_DATA;
     }
 
     @JsonCreator

application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/UnsubscribeCmd.java

@@ -15,8 +15,6 @@
  */
 package org.thingsboard.server.service.telemetry.cmd.v2;
 
-import lombok.Data;
-
 public interface UnsubscribeCmd {
 
     int getCmdId();

common/data/src/main/java/org/thingsboard/server/common/data/query/AbstractDataQuery.java

@@ -29,15 +29,13 @@ public abstract class AbstractDataQuery<T extends EntityDataPageLink> extends En
     protected List<EntityKey> entityFields;
     @Getter
     protected List<EntityKey> latestValues;
-    @Getter
-    protected List<KeyFilter> keyFilters;
 
     public AbstractDataQuery() {
         super();
     }
 
-    public AbstractDataQuery(EntityFilter entityFilter) {
-        super(entityFilter);
+    public AbstractDataQuery(EntityFilter entityFilter, List<KeyFilter> keyFilters) {
+        super(entityFilter, keyFilters);
     }
 
     public AbstractDataQuery(EntityFilter entityFilter,
@@ -45,11 +43,10 @@ public abstract class AbstractDataQuery<T extends EntityDataPageLink> extends En
                              List<EntityKey> entityFields,
                              List<EntityKey> latestValues,
                              List<KeyFilter> keyFilters) {
-        super(entityFilter);
+        super(entityFilter, keyFilters);
         this.pageLink = pageLink;
         this.entityFields = entityFields;
         this.latestValues = latestValues;
-        this.keyFilters = keyFilters;
     }
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataQuery.java

@@ -30,8 +30,8 @@ public class AlarmDataQuery extends AbstractDataQuery<AlarmDataPageLink> {
     public AlarmDataQuery() {
     }
 
-    public AlarmDataQuery(EntityFilter entityFilter) {
-        super(entityFilter);
+    public AlarmDataQuery(EntityFilter entityFilter, List<KeyFilter> keyFilters) {
+        super(entityFilter, keyFilters);
     }
 
     public AlarmDataQuery(EntityFilter entityFilter, AlarmDataPageLink pageLink, List<EntityKey> entityFields, List<EntityKey> latestValues, List<KeyFilter> keyFilters, List<EntityKey> alarmFields) {

common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java

@@ -17,14 +17,26 @@ package org.thingsboard.server.common.data.query;
 
 import lombok.Getter;
 
+import java.util.Collections;
+import java.util.List;
+
 public class EntityCountQuery {
 
     @Getter
     private EntityFilter entityFilter;
 
-    public EntityCountQuery() {}
+    @Getter
+    protected List<KeyFilter> keyFilters;
+
+    public EntityCountQuery() {
+    }
 
     public EntityCountQuery(EntityFilter entityFilter) {
+        this(entityFilter, Collections.emptyList());
+    }
+
+    public EntityCountQuery(EntityFilter entityFilter, List<KeyFilter> keyFilters) {
         this.entityFilter = entityFilter;
+        this.keyFilters = keyFilters;
     }
 }

common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataQuery.java

@@ -27,8 +27,8 @@ public class EntityDataQuery extends AbstractDataQuery<EntityDataPageLink> {
     public EntityDataQuery() {
     }
 
-    public EntityDataQuery(EntityFilter entityFilter) {
-        super(entityFilter);
+    public EntityDataQuery(EntityFilter entityFilter, List<KeyFilter> keyFilters) {
+        super(entityFilter, keyFilters);
     }
 
     public EntityDataQuery(EntityFilter entityFilter, EntityDataPageLink pageLink, List<EntityKey> entityFields, List<EntityKey> latestValues, List<KeyFilter> keyFilters) {

dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java

@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.dao.service;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.junit.After;
@@ -31,25 +28,48 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.id.*;
-import org.thingsboard.server.common.data.kv.*;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.AttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.LongDataEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.query.*;
+import org.thingsboard.server.common.data.query.AssetSearchQueryFilter;
+import org.thingsboard.server.common.data.query.DeviceSearchQueryFilter;
+import org.thingsboard.server.common.data.query.DeviceTypeFilter;
+import org.thingsboard.server.common.data.query.EntityCountQuery;
+import org.thingsboard.server.common.data.query.EntityData;
+import org.thingsboard.server.common.data.query.EntityDataPageLink;
+import org.thingsboard.server.common.data.query.EntityDataQuery;
+import org.thingsboard.server.common.data.query.EntityDataSortOrder;
+import org.thingsboard.server.common.data.query.EntityKey;
+import org.thingsboard.server.common.data.query.EntityKeyType;
+import org.thingsboard.server.common.data.query.EntityListFilter;
+import org.thingsboard.server.common.data.query.FilterPredicateValue;
+import org.thingsboard.server.common.data.query.KeyFilter;
+import org.thingsboard.server.common.data.query.NumericFilterPredicate;
+import org.thingsboard.server.common.data.query.RelationsQueryFilter;
+import org.thingsboard.server.common.data.query.StringFilterPredicate;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.EntityTypeFilter;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
-import org.thingsboard.server.common.data.rule.RuleChain;
-import org.thingsboard.server.common.data.rule.RuleChainMetaData;
-import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.model.sqlts.ts.TsKvEntity;
-import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
-import org.thingsboard.server.dao.util.DaoTestUtil;
-import org.thingsboard.server.dao.util.SqlDbType;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;