Remove admin settings on tenant deletion

application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java

@@ -72,7 +72,7 @@ public abstract class TbAbstractVersionControlSettingsService<T extends Serializ
     }
 
     public boolean delete(TenantId tenantId) {
-        boolean result = adminSettingsService.deleteAdminSettings(tenantId, settingsKey);
+        boolean result = adminSettingsService.deleteAdminSettingsByTenantIdAndKey(tenantId, settingsKey);
         cache.evict(tenantId);
         return result;
     }

common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java

@@ -29,6 +29,8 @@ public interface AdminSettingsService {
 
     AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings);
 
-    boolean deleteAdminSettings(TenantId tenantId, String key);
+    boolean deleteAdminSettingsByTenantIdAndKey(TenantId tenantId, String key);
+
+    void deleteAdminSettingsByTenantId(TenantId tenantId);
 
 }

dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java

@@ -41,4 +41,6 @@ public interface AdminSettingsDao extends Dao<AdminSettings> {
 
     boolean removeByTenantIdAndKey(UUID tenantId, String key);
 
+    void removeByTenantId(UUID tenantId);
+
 }

dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java

@@ -71,9 +71,15 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     }
 
     @Override
-    public boolean deleteAdminSettings(TenantId tenantId, String key) {
+    public boolean deleteAdminSettingsByTenantIdAndKey(TenantId tenantId, String key) {
         log.trace("Executing deleteAdminSettings, tenantId [{}], key [{}]", tenantId, key);
         Validator.validateString(key, "Incorrect key " + key);
         return adminSettingsDao.removeByTenantIdAndKey(tenantId.getId(), key);
     }
+
+    @Override
+    public void deleteAdminSettingsByTenantId(TenantId tenantId) {
+        adminSettingsDao.removeByTenantId(tenantId.getId());
+    }
+
 }

dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java

@@ -29,6 +29,8 @@ public interface AdminSettingsRepository extends JpaRepository<AdminSettingsEnti
 
     void deleteByTenantIdAndKey(UUID tenantId, String key);
 
+    void deleteByTenantId(UUID tenantId);
+
     boolean existsByTenantIdAndKey(UUID tenantId, String key);
 
 }

dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java

@@ -60,4 +60,10 @@ public class JpaAdminSettingsDao extends JpaAbstractDao<AdminSettingsEntity, Adm
         }
         return false;
     }
+
+    @Override
+    public void removeByTenantId(UUID tenantId) {
+        adminSettingsRepository.deleteByTenantId(tenantId);
+    }
+
 }

dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java

@@ -41,6 +41,7 @@ import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
 import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
@@ -107,6 +108,9 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
     @Autowired
     private QueueService queueService;
 
+    @Autowired
+    private AdminSettingsService adminSettingsService;
+
     @Override
     public Tenant findTenantById(TenantId tenantId) {
         log.trace("Executing findTenantById [{}]", tenantId);
@@ -164,6 +168,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
         otaPackageService.deleteOtaPackagesByTenantId(tenantId);
         rpcService.deleteAllRpcByTenantId(tenantId);
         queueService.deleteQueuesByTenantId(tenantId);
+        adminSettingsService.deleteAdminSettingsByTenantId(tenantId);
         tenantDao.removeById(tenantId, tenantId.getId());
         deleteEntityRelations(tenantId, tenantId);
     }