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

Removed unused changes to AttributeDao

Browse Source
This commit is contained in:
vzikratyi 2020-10-08 11:47:11 +03:00
parent 90234bf7a3
commit d2f45db0a6
6 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dao-api/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java
View File

@ -36,8 +36,6 @@ public interface AttributesService {
ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, String scope);
ListenableFuture<List<EntityAttributeKvEntry>> findAllByAttributeKey(String attributeKey);
ListenableFuture<List<Void>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes);
ListenableFuture<List<Void>> removeAll(TenantId tenantId, EntityId entityId, String scope, List<String> attributeKeys);

2
dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java
View File

@ -36,8 +36,6 @@ public interface AttributesDao {
ListenableFuture<List<AttributeKvEntry>> findAll(TenantId tenantId, EntityId entityId, String attributeType);
ListenableFuture<List<EntityAttributeKvEntry>> findAllByAttributeKey(String attributeKey);
ListenableFuture<Void> save(TenantId tenantId, EntityId entityId, String attributeType, AttributeKvEntry attribute);
ListenableFuture<List<Void>> removeAll(TenantId tenantId, EntityId entityId, String attributeType, List<String> keys);

6
dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
View File

@ -60,12 +60,6 @@ public class BaseAttributesService implements AttributesService {
return attributesDao.findAll(tenantId, entityId, scope);
}
@Override
public ListenableFuture<List<EntityAttributeKvEntry>> findAllByAttributeKey(String attributeKey) {
Validator.validateString(attributeKey, "Incorrect attribute key " + attributeKey);
return attributesDao.findAllByAttributeKey(attributeKey);
}
@Override
public ListenableFuture<List<Void>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) {
validate(entityId, scope);

33
dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java
View File

@ -16,10 +16,20 @@
package org.thingsboard.server.dao.model.sql;
import lombok.Data;
import org.thingsboard.server.common.data.kv.*;
import org.thingsboard.server.common.data.kv.AttributeKvEntry;
import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
import org.thingsboard.server.common.data.kv.BooleanDataEntry;
import org.thingsboard.server.common.data.kv.DoubleDataEntry;
import org.thingsboard.server.common.data.kv.JsonDataEntry;
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.dao.model.ToData;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import static org.thingsboard.server.dao.model.ModelConstants.BOOLEAN_VALUE_COLUMN;
@ -32,7 +42,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.STRING_VALUE_COLUM
@Data
@Entity
@Table(name = "attribute_kv")
// TODO maybe move ToData<AttributeKvEntry> to local field as well (or implement ToData<EntityAttributeKvEntry> differently)
public class AttributeKvEntity implements ToData<AttributeKvEntry>, Serializable {
@EmbeddedId
@ -73,22 +82,4 @@ public class AttributeKvEntity implements ToData<AttributeKvEntry>, Serializable
return new BaseAttributeKvEntry(kvEntry, lastUpdateTs);
}
@Transient
public final ToData<EntityAttributeKvEntry> toEntityAttributeKvEntry = () -> {
KvEntry kvEntry = null;
if (strValue != null) {
kvEntry = new StringDataEntry(id.getAttributeKey(), strValue);
} else if (booleanValue != null) {
kvEntry = new BooleanDataEntry(id.getAttributeKey(), booleanValue);
} else if (doubleValue != null) {
kvEntry = new DoubleDataEntry(id.getAttributeKey(), doubleValue);
} else if (longValue != null) {
kvEntry = new LongDataEntry(id.getAttributeKey(), longValue);
} else if (jsonValue != null) {
kvEntry = new JsonDataEntry(id.getAttributeKey(), jsonValue);
}
return new BaseEntityAttributeKvEntry(id.getEntityId(), lastUpdateTs, kvEntry);
};
}

4
dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java
View File

@ -36,10 +36,6 @@ public interface AttributeKvRepository extends CrudRepository<AttributeKvEntity,
@Param("entityId") UUID entityId,
@Param("attributeType") String attributeType);
@Query("SELECT a FROM AttributeKvEntity a WHERE a.id.attributeKey = :attributeKey")
List<AttributeKvEntity> findAllByAttributeKey(@Param("attributeKey") String attributeKey);
@Transactional
@Modifying
@Query("DELETE FROM AttributeKvEntity a WHERE a.id.entityType = :entityType " +

12
dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
View File

@ -137,18 +137,6 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl
attributeType))));
}
@Override
public ListenableFuture<List<EntityAttributeKvEntry>> findAllByAttributeKey(String attributeKey) {
return Futures.immediateFuture(
DaoUtil.convertDataList(
attributeKvRepository.findAllByAttributeKey(attributeKey).stream()
.map(attributeKvEntity -> attributeKvEntity.toEntityAttributeKvEntry)
.collect(Collectors.toList())
)
);
}
@Override
public ListenableFuture<Void> save(TenantId tenantId, EntityId entityId, String attributeType, AttributeKvEntry attribute) {
AttributeKvEntity entity = new AttributeKvEntity();