From 1a2040d4cd1b7d82b09e5c9b41b407262e3c481d Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Fri, 5 Jul 2024 14:32:42 +0300
Subject: [PATCH] Remove redundant existsById from dao.removeById

---
 dao/src/main/java/org/thingsboard/server/dao/Dao.java        | 2 +-
 .../java/org/thingsboard/server/dao/sql/JpaAbstractDao.java  | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/Dao.java b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
index e7290cdced..e912872496 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/Dao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
@@ -39,7 +39,7 @@ public interface Dao<T> {
 
     T saveAndFlush(TenantId tenantId, T t);
 
-    boolean removeById(TenantId tenantId, UUID id);
+    void removeById(TenantId tenantId, UUID id);
 
     void removeAllByIds(Collection<UUID> ids);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
index 9a58e68895..423dc8a41a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
@@ -144,12 +144,9 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
 
     @Override
     @Transactional
-    public boolean removeById(TenantId tenantId, UUID id) {
-//        jdbcTemplate.queryForObject("DELETE FROM " + getEntityType().getTableName() + " WHERE id = ? RETURNING version", Integer.class, id);
-        // TODO: increment version...
+    public void removeById(TenantId tenantId, UUID id) {
         getRepository().deleteById(id);
         log.debug("Remove request: {}", id);
-        return !getRepository().existsById(id);
     }
 
     @Transactional