From bd9ec316efb8f2dbe95119f3ea9246bf3618eae9 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Wed, 15 Jul 2020 15:00:33 +0300 Subject: [PATCH] Tiny improvements --- .../server/controller/AbstractWebTest.java | 4 ++-- .../server/dao/entity/BaseEntityService.java | 1 + .../server/dao/sql/event/JpaBaseEventDao.java | 20 ------------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java index 970c2fecf6..afa08c05db 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java @@ -423,7 +423,7 @@ public abstract class AbstractWebTest { } protected ResultActions doPost(String urlTemplate, T content, String... params) throws Exception { - MockHttpServletRequestBuilder postRequest = post(urlTemplate); + MockHttpServletRequestBuilder postRequest = post(urlTemplate, params); setJwtToken(postRequest); String json = json(content); postRequest.contentType(contentType).content(json); @@ -431,7 +431,7 @@ public abstract class AbstractWebTest { } protected ResultActions doPostAsync(String urlTemplate, T content, Long timeout, String... params) throws Exception { - MockHttpServletRequestBuilder postRequest = post(urlTemplate); + MockHttpServletRequestBuilder postRequest = post(urlTemplate, params); setJwtToken(postRequest); String json = json(content); postRequest.contentType(contentType).content(json); diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java index 3c0332feba..5ff9d2f7c1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java @@ -114,6 +114,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, query); } + //TODO: 3.1 Remove this from project. @Override public ListenableFuture fetchEntityNameAsync(TenantId tenantId, EntityId entityId) { log.trace("Executing fetchEntityNameAsync [{}]", entityId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index 27f9738e16..c9e9750a5f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -182,24 +182,4 @@ public class JpaBaseEventDao extends JpaAbstractDao implemen return Optional.of(DaoUtil.getData(eventInsertRepository.saveOrUpdate(entity))); } - private Specification getEntityFieldsSpec(UUID tenantId, EntityId entityId, String eventType) { - return (root, criteriaQuery, criteriaBuilder) -> { - List predicates = new ArrayList<>(); - if (tenantId != null) { - Predicate tenantIdPredicate = criteriaBuilder.equal(root.get("tenantId"), tenantId); - predicates.add(tenantIdPredicate); - } - if (entityId != null) { - Predicate entityTypePredicate = criteriaBuilder.equal(root.get("entityType"), entityId.getEntityType()); - predicates.add(entityTypePredicate); - Predicate entityIdPredicate = criteriaBuilder.equal(root.get("entityId"), entityId.getId()); - predicates.add(entityIdPredicate); - } - if (eventType != null) { - Predicate eventTypePredicate = criteriaBuilder.equal(root.get("eventType"), eventType); - predicates.add(eventTypePredicate); - } - return criteriaBuilder.and(predicates.toArray(new Predicate[]{})); - }; - } }