Browse Source

Remove redundant existsById from dao.removeById

pull/11112/head
ViacheslavKlimov 2 years ago
parent
commit
1a2040d4cd
  1. 2
      dao/src/main/java/org/thingsboard/server/dao/Dao.java
  2. 5
      dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java

2
dao/src/main/java/org/thingsboard/server/dao/Dao.java

@ -39,7 +39,7 @@ public interface Dao<T> {
T saveAndFlush(TenantId tenantId, T t); T saveAndFlush(TenantId tenantId, T t);
boolean removeById(TenantId tenantId, UUID id); void removeById(TenantId tenantId, UUID id);
void removeAllByIds(Collection<UUID> ids); void removeAllByIds(Collection<UUID> ids);

5
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 @Override
@Transactional @Transactional
public boolean removeById(TenantId tenantId, UUID id) { public void removeById(TenantId tenantId, UUID id) {
// jdbcTemplate.queryForObject("DELETE FROM " + getEntityType().getTableName() + " WHERE id = ? RETURNING version", Integer.class, id);
// TODO: increment version...
getRepository().deleteById(id); getRepository().deleteById(id);
log.debug("Remove request: {}", id); log.debug("Remove request: {}", id);
return !getRepository().existsById(id);
} }
@Transactional @Transactional

Loading…
Cancel
Save