Improvements for dao calls audit

common/dao-api/src/main/java/org/thingsboard/server/dao/util/TenantDbCall.java → common/dao-api/src/main/java/org/thingsboard/server/dao/util/SqlDao.java

@@ -20,8 +20,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface TenantDbCall {
+@Target(ElementType.TYPE)
-
+public @interface SqlDao {
 }

dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStats.java

@@ -30,19 +30,19 @@ import java.util.stream.Collectors;
 public class DbCallStats {
 
     private final TenantId tenantId;
-    private final ConcurrentMap<String, Pair<AtomicInteger, AtomicLong>> methodStats = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, MethodCallStats> methodStats = new ConcurrentHashMap<>();
     private final AtomicInteger successCalls = new AtomicInteger();
     private final AtomicInteger failureCalls = new AtomicInteger();
 
     public void onMethodCall(String methodName, boolean success, long executionTime) {
-        var pair = methodStats.computeIfAbsent(methodName,
+        var methodCallStats = methodStats.computeIfAbsent(methodName, m -> new MethodCallStats());
-                m -> Pair.of(new AtomicInteger(0), new AtomicLong(0L)));
+        methodCallStats.getExecutions().incrementAndGet();
-        pair.getFirst().incrementAndGet();
+        methodCallStats.getTiming().addAndGet(executionTime);
-        pair.getSecond().addAndGet(executionTime);
         if (success) {
             successCalls.incrementAndGet();
         } else {
             failureCalls.incrementAndGet();
+            methodCallStats.getFailures().incrementAndGet();
         }
     }
 
@@ -51,9 +51,8 @@ public class DbCallStats {
                 .tenantId(tenantId)
                 .totalSuccess(successCalls.get())
                 .totalFailure(failureCalls.get())
-                .methodExecutions(methodStats.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getFirst().get())))
+                .methodStats(methodStats.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().snapshot())))
-                .methodTimings(methodStats.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().getSecond().get())))
+                .totalTiming(methodStats.values().stream().map(MethodCallStats::getTiming).map(AtomicLong::get).reduce(0L, Long::sum))
-                .totalTiming(methodStats.values().stream().map(Pair::getSecond).map(AtomicLong::get).reduce(0L, Long::sum))
                 .build();
     }
 

dao/src/main/java/org/thingsboard/server/dao/aspect/DbCallStatsSnapshot.java

@@ -29,8 +29,7 @@ public class DbCallStatsSnapshot {
     private final int totalSuccess;
     private final int totalFailure;
     private final long totalTiming;
-    private final Map<String, Integer> methodExecutions;
+    private final Map<String, MethodCallStatsSnapshot> methodStats;
-    private final Map<String, Long> methodTimings;
 
     public int getTotalCalls() {
         return totalSuccess + totalFailure;

dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStats.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.aspect;
+
+import lombok.Data;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+@Data
+public class MethodCallStats {
+    private final AtomicInteger executions = new AtomicInteger();
+    private final AtomicInteger failures = new AtomicInteger();
+    private final AtomicLong timing = new AtomicLong();
+
+    public MethodCallStatsSnapshot snapshot() {
+        return new MethodCallStatsSnapshot(executions.get(), failures.get(), timing.get());
+    }
+
+}

dao/src/main/java/org/thingsboard/server/dao/aspect/MethodCallStatsSnapshot.java

@@ -0,0 +1,25 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.aspect;
+
+import lombok.Data;
+
+@Data
+public class MethodCallStatsSnapshot {
+    private final int executions;
+    private final int failures;
+    private final long timing;
+}

dao/src/main/java/org/thingsboard/server/dao/aspect/TenantDbCallAspect.java → dao/src/main/java/org/thingsboard/server/dao/aspect/SqlDaoCallsAspect.java

@@ -20,9 +20,12 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -31,70 +34,87 @@ import org.thingsboard.server.common.data.id.TenantId;
 
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Aspect
 @ConditionalOnProperty(prefix = "sql", value = "log_tenant_stats", havingValue = "true")
 @Component
 @Slf4j
-public class TenantDbCallAspect {
+public class SqlDaoCallsAspect {
 
     private final Set<String> invalidTenantDbCallMethods = ConcurrentHashMap.newKeySet();
     private final ConcurrentMap<TenantId, DbCallStats> statsMap = new ConcurrentHashMap<>();
 
-    @Scheduled(fixedDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}")
+    @Scheduled(initialDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}",
+            fixedDelayString = "${sql.log_tenant_stats.log_tenant_stats_interval:60000}")
     public void printStats() {
+        List<DbCallStatsSnapshot> snapshots = snapshot();
+        if (snapshots.isEmpty()) return;
         try {
             if (log.isTraceEnabled()) {
-                List<DbCallStatsSnapshot> snapshots = snapshot();
                 logTopNTenants(snapshots, Comparator.comparing(DbCallStatsSnapshot::getTotalTiming).reversed(), 0, snapshot -> {
-                    log.trace("[{}]: calls: {}, exec time: {} ", snapshot.getTenantId(), snapshot.getTotalCalls(), snapshot.getTotalTiming());
+                    logSnapshot(snapshot, 0, Comparator.comparing(MethodCallStatsSnapshot::getTiming).reversed(), log::trace);
-                    snapshot.getMethodExecutions().forEach((method, count) -> {
+                });
-                        log.trace("[{}]: method: {}, count: {}, exec time: {}",
+
-                                snapshot.getTenantId(), method, count, snapshot.getMethodTimings().getOrDefault(method, 0L));
+                Map<String, Map<TenantId, MethodCallStatsSnapshot>> byMethodStats = new HashMap<>();
+                for (DbCallStatsSnapshot snapshot : snapshots) {
+                    snapshot.getMethodStats().forEach((method, stats) -> {
+                        byMethodStats.computeIfAbsent(method, m -> new HashMap<>())
+                                .put(snapshot.getTenantId(), stats);
                     });
+                }
+                byMethodStats.forEach((method, byTenantStats) -> {
+                    log.trace("Top tenants for method {} by calls:", method);
+                    byTenantStats.entrySet().stream()
+                            .sorted(Map.Entry.comparingByValue(Comparator.comparing(MethodCallStatsSnapshot::getExecutions).reversed()))
+                            .limit(10)
+                            .forEach(e -> {
+                                TenantId tenantId = e.getKey();
+                                MethodCallStatsSnapshot methodStats = e.getValue();
+                                log.trace("[{}] calls: {}, failures: {}, timing: {}", tenantId,
+                                        methodStats.getExecutions(), methodStats.getFailures(), methodStats.getTiming());
+                            });
                 });
-                // todo: log top 10 tenants for each method sorted by number of execution.
             } else if (log.isDebugEnabled()) {
-                List<DbCallStatsSnapshot> snapshots = snapshot();
                 log.debug("Total calls statistics below:");
-                logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalCalls).reversed(),
+                logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalCalls).reversed(), 10,
-                        10, s -> logSnapshotWithDebugLevel(s, 10));
+                        s -> logSnapshot(s, 10, Comparator.comparing(MethodCallStatsSnapshot::getExecutions).reversed(), log::debug));
                 log.debug("Total timing statistics below:");
                 logTopNTenants(snapshots, Comparator.comparingLong(DbCallStatsSnapshot::getTotalTiming).reversed(),
-                        10, s -> logSnapshotWithDebugLevel(s, 10));
+                        10, s -> logSnapshot(s, 10, Comparator.comparing(MethodCallStatsSnapshot::getTiming).reversed(), log::debug));
                 log.debug("Total errors statistics below:");
                 logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalFailure).reversed(),
-                        10, s -> logSnapshotWithDebugLevel(s, 10));
+                        10, s -> logSnapshot(s, 10, Comparator.comparing(MethodCallStatsSnapshot::getFailures).reversed(), log::debug));
             } else if (log.isInfoEnabled()) {
-                log.debug("Total calls statistics below:");
+                log.info("Total calls statistics below:");
-                List<DbCallStatsSnapshot> snapshots = snapshot();
                 logTopNTenants(snapshots, Comparator.comparingInt(DbCallStatsSnapshot::getTotalFailure).reversed(),
-                        3, s -> logSnapshotWithDebugLevel(s, 3));
+                        3, s -> logSnapshot(s, 3, Comparator.comparing(MethodCallStatsSnapshot::getFailures).reversed(), log::info));
             }
         } finally {
             statsMap.clear();
         }
     }
 
-    private void logSnapshotWithDebugLevel(DbCallStatsSnapshot snapshot, int limit) {
+    private void logSnapshot(DbCallStatsSnapshot snapshot, int limit, Comparator<MethodCallStatsSnapshot> methodStatsComparator, Consumer<String> logger) {
-        log.debug("[{}]: calls: {}, failures: {}, exec time: {} ",
+        logger.accept(String.format("[%s]: calls: %s, failures: %s, exec time: %s ",
-                snapshot.getTenantId(), snapshot.getTotalCalls(), snapshot.getTotalFailure(), snapshot.getTotalTiming());
+                snapshot.getTenantId(), snapshot.getTotalCalls(), snapshot.getTotalFailure(), snapshot.getTotalTiming()));
-        var stream = snapshot.getMethodTimings().entrySet().stream()
+        var stream = snapshot.getMethodStats().entrySet().stream()
-                .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()));
+                .sorted(Map.Entry.comparingByValue(methodStatsComparator));
         if (limit > 0) {
             stream = stream.limit(limit);
         }
         stream.forEach(e -> {
-            long timing = snapshot.getMethodTimings().getOrDefault(e.getKey(), 0L);
+            MethodCallStatsSnapshot methodStats = e.getValue();
-            log.debug("[{}]: method: {}, count: {}, exec time: {}", snapshot.getTenantId(), e.getKey(), e.getValue(), timing);
+            logger.accept(String.format("[%s]: method: %s, calls: %s, failures: %s, exec time: %s", snapshot.getTenantId(), e.getKey(),
+                    methodStats.getExecutions(), methodStats.getFailures(), methodStats.getTiming()));
         });
     }
 
@@ -102,19 +122,9 @@ public class TenantDbCallAspect {
         return statsMap.values().stream().map(DbCallStats::snapshot).collect(Collectors.toList());
     }
 
-//    private void logTopNMethods(List<DbCallStatsSnapshot> snapshots, Comparator<DbCallStatsSnapshot> comparator,
-//                                int n, Consumer<DbCallStatsSnapshot> logFunction) {
-////        var stream = snapshots.stream().sorted(comparator).sorted();
-//        // find top methods by execution time and then top
-//        if (n > 0) {
-//            stream = stream.limit(n);
-//        }
-//        stream.forEach(logFunction);
-//    }
-
     private void logTopNTenants(List<DbCallStatsSnapshot> snapshots, Comparator<DbCallStatsSnapshot> comparator,
                                 int n, Consumer<DbCallStatsSnapshot> logFunction) {
-        var stream = snapshots.stream().sorted(comparator).sorted();
+        var stream = snapshots.stream().sorted(comparator);
         if (n > 0) {
             stream = stream.limit(n);
         }
@@ -122,16 +132,16 @@ public class TenantDbCallAspect {
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    @Around("@annotation(org.thingsboard.server.dao.util.TenantDbCall)")
+    @Around("@within(org.thingsboard.server.dao.util.SqlDao)")
     public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable {
-        var signature = joinPoint.getSignature();
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        var method = signature.toShortString();
+        var methodName = signature.toShortString();
-        if (invalidTenantDbCallMethods.contains(method)) {
+        if (invalidTenantDbCallMethods.contains(methodName)) {
             //Simply call the method if tenant is not found
             return joinPoint.proceed();
         }
-        var tenantId = getTenantId(method, joinPoint.getArgs());
+        var tenantId = getTenantId(signature, methodName, joinPoint.getArgs());
-        if (tenantId == null) {
+        if (tenantId == null || tenantId.isNullUid()) {
             //Simply call the method if tenant is null
             return joinPoint.proceed();
         }
@@ -143,21 +153,21 @@ public class TenantDbCallAspect {
                         new FutureCallback<>() {
                             @Override
                             public void onSuccess(@Nullable Object result) {
-                                logTenantMethodExecution(tenantId, method, true, startTime);
+                                logTenantMethodExecution(tenantId, methodName, true, startTime);
                             }
 
                             @Override
                             public void onFailure(Throwable t) {
-                                logTenantMethodExecution(tenantId, method, false, startTime);
+                                logTenantMethodExecution(tenantId, methodName, false, startTime);
                             }
                         },
                         MoreExecutors.directExecutor());
             } else {
-                logTenantMethodExecution(tenantId, method, true, startTime);
+                logTenantMethodExecution(tenantId, methodName, true, startTime);
             }
             return result;
         } catch (Throwable t) {
-            logTenantMethodExecution(tenantId, method, false, startTime);
+            logTenantMethodExecution(tenantId, methodName, false, startTime);
             throw t;
         }
     }
@@ -167,23 +177,32 @@ public class TenantDbCallAspect {
                 .onMethodCall(method, success, System.currentTimeMillis() - startTime);
     }
 
-    TenantId getTenantId(String methodName, Object[] args) {
+    TenantId getTenantId(MethodSignature signature, String methodName, Object[] args) {
         if (args == null || args.length == 0) {
             addAndLogInvalidMethods(methodName);
             return null;
         }
-        for (Object arg : args) {
+        for (int i = 0; i < args.length; i++) {
+            Object arg = args[i];
             if (arg instanceof TenantId) {
-                log.debug("Method: {} is annotated with @TenantDbCall but the TenantId is null. Args: {}", methodName, Arrays.toString(args));
                 return (TenantId) arg;
+            } else if (arg instanceof UUID) {
+                if (signature.getParameterNames() != null && StringUtils.equals(signature.getParameterNames()[i], "tenantId")) {
+                    log.trace("Method {} uses UUID for tenantId param instead of TenantId class", methodName);
+                    return TenantId.fromUUID((UUID) arg);
+                }
             }
         }
-        addAndLogInvalidMethods(methodName);
+        if (ArrayUtils.contains(signature.getParameterTypes(), TenantId.class) ||
+                ArrayUtils.contains(signature.getParameterNames(), "tenantId")) {
+            log.debug("Null was submitted as tenantId to method {}. Args: {}", methodName, Arrays.toString(args));
+        } else {
+            addAndLogInvalidMethods(methodName);
+        }
         return null;
     }
 
     private void addAndLogInvalidMethods(String methodName) {
-        log.warn("Method: {} is annotated with @TenantDbCall but no TenantId in args", methodName);
         invalidTenantDbCallMethods.add(methodName);
     }
 

dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java

@@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.BaseEntity;
-import org.thingsboard.server.dao.util.TenantDbCall;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Collection;
 import java.util.List;
@@ -36,6 +36,7 @@ import java.util.UUID;
  * @author Valerii Sosliuk
  */
 @Slf4j
+@SqlDao
 public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
         extends JpaAbstractDaoListeningExecutorService
         implements Dao<D> {
@@ -76,7 +77,6 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
         return d;
     }
 
-    @TenantDbCall
     @Override
     public D findById(TenantId tenantId, UUID key) {
         log.debug("Get entity by key {}", key);
@@ -84,7 +84,6 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
         return DaoUtil.getData(entity);
     }
 
-    @TenantDbCall
     @Override
     public ListenableFuture<D> findByIdAsync(TenantId tenantId, UUID key) {
         log.debug("Get entity by key async {}", key);

dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java

@@ -42,6 +42,7 @@ import org.thingsboard.server.dao.model.sql.AlarmEntity;
 import org.thingsboard.server.dao.model.sql.EntityAlarmEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.sql.query.AlarmQueryRepository;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -55,6 +56,7 @@ import java.util.UUID;
  */
 @Slf4j
 @Component
+@SqlDao
 public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements AlarmDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java

@@ -33,6 +33,7 @@ import org.thingsboard.server.dao.asset.AssetDao;
 import org.thingsboard.server.dao.model.sql.AssetEntity;
 import org.thingsboard.server.dao.model.sql.AssetInfoEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,6 +48,7 @@ import static org.thingsboard.server.dao.asset.BaseAssetService.TB_SERVICE_QUEUE
  * Created by Valerii Sosliuk on 5/19/2017.
  */
 @Component
+@SqlDao
 @Slf4j
 public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> implements AssetDao {
 

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

@@ -37,6 +37,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService;
 import org.thingsboard.server.dao.sql.ScheduledLogExecutorComponent;
 import org.thingsboard.server.dao.sql.TbSqlBlockingQueueParams;
 import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -50,6 +51,7 @@ import java.util.stream.Collectors;
 
 @Component
 @Slf4j
+@SqlDao
 public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService implements AttributesDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/audit/JpaAuditLogDao.java

@@ -30,12 +30,14 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.audit.AuditLogDao;
 import org.thingsboard.server.dao.model.sql.AuditLogEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
 @Component
+@SqlDao
 public class JpaAuditLogDao extends JpaAbstractDao<AuditLogEntity, AuditLog> implements AuditLogDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java

@@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.customer.CustomerDao;
 import org.thingsboard.server.dao.model.sql.CustomerEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -37,6 +38,7 @@ import java.util.UUID;
  * Created by Valerii Sosliuk on 5/6/2017.
  */
 @Component
+@SqlDao
 public class JpaCustomerDao extends JpaAbstractSearchTextDao<CustomerEntity, Customer> implements CustomerDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java

@@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.dashboard.DashboardDao;
 import org.thingsboard.server.dao.model.sql.DashboardEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.Optional;
@@ -37,6 +38,7 @@ import java.util.UUID;
  * Created by Valerii Sosliuk on 5/6/2017.
  */
 @Component
+@SqlDao
 public class JpaDashboardDao extends JpaAbstractSearchTextDao<DashboardEntity, Dashboard> implements DashboardDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java

@@ -27,6 +27,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.dashboard.DashboardInfoDao;
 import org.thingsboard.server.dao.model.sql.DashboardInfoEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +39,7 @@ import java.util.UUID;
  */
 @Slf4j
 @Component
+@SqlDao
 public class JpaDashboardInfoDao extends JpaAbstractSearchTextDao<DashboardInfoEntity, DashboardInfo> implements DashboardInfoDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java

@@ -25,6 +25,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.device.DeviceCredentialsDao;
 import org.thingsboard.server.dao.model.sql.DeviceCredentialsEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
@@ -32,6 +33,7 @@ import java.util.UUID;
  * Created by Valerii Sosliuk on 5/6/2017.
  */
 @Component
+@SqlDao
 public class JpaDeviceCredentialsDao extends JpaAbstractDao<DeviceCredentialsEntity, DeviceCredentials> implements DeviceCredentialsDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java

@@ -41,6 +41,7 @@ import org.thingsboard.server.dao.device.DeviceDao;
 import org.thingsboard.server.dao.model.sql.DeviceEntity;
 import org.thingsboard.server.dao.model.sql.DeviceInfoEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -53,6 +54,7 @@ import java.util.UUID;
  * Created by Valerii Sosliuk on 5/6/2017.
  */
 @Component
+@SqlDao
 @Slf4j
 public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device> implements DeviceDao {
 

dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java

@@ -32,12 +32,14 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.device.DeviceProfileDao;
 import org.thingsboard.server.dao.model.sql.DeviceProfileEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 
 @Component
+@SqlDao
 public class JpaDeviceProfileDao extends JpaAbstractSearchTextDao<DeviceProfileEntity, DeviceProfile> implements DeviceProfileDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaBaseEdgeEventDao.java

@@ -36,6 +36,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 import org.thingsboard.server.dao.sql.ScheduledLogExecutorComponent;
 import org.thingsboard.server.dao.sql.TbSqlBlockingQueueParams;
 import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -53,6 +54,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaBaseEdgeEventDao extends JpaAbstractSearchTextDao<EdgeEventEntity, EdgeEvent> implements EdgeEventDao {
 
     private final UUID systemTenantId = NULL_UUID;

dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java

@@ -32,6 +32,7 @@ import org.thingsboard.server.dao.edge.EdgeDao;
 import org.thingsboard.server.dao.model.sql.EdgeEntity;
 import org.thingsboard.server.dao.model.sql.EdgeInfoEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -42,6 +43,7 @@ import java.util.UUID;
 
 @Component
 @Slf4j
+@SqlDao
 public class JpaEdgeDao extends JpaAbstractSearchTextDao<EdgeEntity, Edge> implements EdgeDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java

@@ -33,6 +33,7 @@ import org.thingsboard.server.dao.entityview.EntityViewDao;
 import org.thingsboard.server.dao.model.sql.EntityViewEntity;
 import org.thingsboard.server.dao.model.sql.EntityViewInfoEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,6 +47,7 @@ import java.util.UUID;
  */
 @Component
 @Slf4j
+@SqlDao
 public class JpaEntityViewDao extends JpaAbstractSearchTextDao<EntityViewEntity, EntityView>
         implements EntityViewDao {
 

dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java

@@ -44,6 +44,7 @@ import org.thingsboard.server.dao.sql.TbSqlBlockingQueueParams;
 import org.thingsboard.server.dao.sql.TbSqlBlockingQueueWrapper;
 import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository;
 import org.thingsboard.server.dao.timeseries.SqlPartition;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -61,6 +62,7 @@ import java.util.function.Function;
  */
 @Slf4j
 @Component
+@SqlDao
 public class JpaBaseEventDao implements EventDao {
 
     private final Map<EventType, Map<Long, SqlPartition>> partitionsByEventType = new ConcurrentHashMap<>();

dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientRegistrationTemplateDao.java

@@ -23,6 +23,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.OAuth2ClientRegistrationTemplateEntity;
 import org.thingsboard.server.dao.oauth2.OAuth2ClientRegistrationTemplateDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,6 +32,7 @@ import java.util.UUID;
 
 @Component
 @RequiredArgsConstructor
+@SqlDao
 public class JpaOAuth2ClientRegistrationTemplateDao extends JpaAbstractDao<OAuth2ClientRegistrationTemplateEntity, OAuth2ClientRegistrationTemplate> implements OAuth2ClientRegistrationTemplateDao {
     private final OAuth2ClientRegistrationTemplateRepository repository;
 

dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2DomainDao.java

@@ -23,12 +23,14 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.OAuth2DomainEntity;
 import org.thingsboard.server.dao.oauth2.OAuth2DomainDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.UUID;
 
 @Component
 @RequiredArgsConstructor
+@SqlDao
 public class JpaOAuth2DomainDao extends JpaAbstractDao<OAuth2DomainEntity, OAuth2Domain> implements OAuth2DomainDao {
 
     private final OAuth2DomainRepository repository;

dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2MobileDao.java

@@ -23,12 +23,14 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.OAuth2MobileEntity;
 import org.thingsboard.server.dao.oauth2.OAuth2MobileDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.UUID;
 
 @Component
 @RequiredArgsConstructor
+@SqlDao
 public class JpaOAuth2MobileDao extends JpaAbstractDao<OAuth2MobileEntity, OAuth2Mobile> implements OAuth2MobileDao {
 
     private final OAuth2MobileRepository repository;

dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ParamsDao.java

@@ -22,11 +22,13 @@ import org.thingsboard.server.common.data.oauth2.OAuth2Params;
 import org.thingsboard.server.dao.model.sql.OAuth2ParamsEntity;
 import org.thingsboard.server.dao.oauth2.OAuth2ParamsDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
 @Component
 @RequiredArgsConstructor
+@SqlDao
 public class JpaOAuth2ParamsDao extends JpaAbstractDao<OAuth2ParamsEntity, OAuth2Params> implements OAuth2ParamsDao {
     private final OAuth2ParamsRepository repository;
 

dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2RegistrationDao.java

@@ -25,12 +25,14 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.OAuth2RegistrationEntity;
 import org.thingsboard.server.dao.oauth2.OAuth2RegistrationDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.UUID;
 
 @Component
 @RequiredArgsConstructor
+@SqlDao
 public class JpaOAuth2RegistrationDao extends JpaAbstractDao<OAuth2RegistrationEntity, OAuth2Registration> implements OAuth2RegistrationDao {
 
     private final OAuth2RegistrationRepository repository;

dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java

@@ -25,11 +25,13 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.sql.OtaPackageEntity;
 import org.thingsboard.server.dao.ota.OtaPackageDao;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaOtaPackageDao extends JpaAbstractSearchTextDao<OtaPackageEntity, OtaPackage> implements OtaPackageDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageInfoDao.java

@@ -30,12 +30,14 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.OtaPackageInfoEntity;
 import org.thingsboard.server.dao.ota.OtaPackageInfoDao;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Objects;
 import java.util.UUID;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaOtaPackageInfoDao extends JpaAbstractSearchTextDao<OtaPackageInfoEntity, OtaPackageInfo> implements OtaPackageInfoDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/queue/JpaQueueDao.java

@@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.QueueEntity;
 import org.thingsboard.server.dao.queue.QueueDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.Objects;
@@ -35,6 +36,7 @@ import java.util.UUID;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaQueueDao extends JpaAbstractDao<QueueEntity, Queue> implements QueueDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java

@@ -32,6 +32,7 @@ import org.thingsboard.server.dao.model.sql.RelationCompositeKey;
 import org.thingsboard.server.dao.model.sql.RelationEntity;
 import org.thingsboard.server.dao.relation.RelationDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,6 +45,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Component
+@SqlDao
 public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService implements RelationDao {
 
     private static final List<String> ALL_TYPE_GROUP_NAMES = new ArrayList<>();

dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java

@@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.TbResourceEntity;
 import org.thingsboard.server.dao.resource.TbResourceDao;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.Objects;
@@ -35,6 +36,7 @@ import java.util.UUID;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaTbResourceDao extends JpaAbstractSearchTextDao<TbResourceEntity, TbResource> implements TbResourceDao {
 
     private final TbResourceRepository resourceRepository;

dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java

@@ -27,12 +27,14 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.TbResourceInfoEntity;
 import org.thingsboard.server.dao.resource.TbResourceInfoDao;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Objects;
 import java.util.UUID;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaTbResourceInfoDao extends JpaAbstractSearchTextDao<TbResourceInfoEntity, TbResourceInfo> implements TbResourceInfoDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/rpc/JpaRpcDao.java

@@ -30,12 +30,14 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.RpcEntity;
 import org.thingsboard.server.dao.rpc.RpcDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
 @Slf4j
 @Component
 @AllArgsConstructor
+@SqlDao
 public class JpaRpcDao extends JpaAbstractDao<RpcEntity, Rpc> implements RpcDao {
 
     private final RpcRepository rpcRepository;

dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java

@@ -30,6 +30,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.RuleChainEntity;
 import org.thingsboard.server.dao.rule.RuleChainDao;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Collection;
 import java.util.Objects;
@@ -38,6 +39,7 @@ import java.util.UUID;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaRuleChainDao extends JpaAbstractSearchTextDao<RuleChainEntity, RuleChain> implements RuleChainDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java

@@ -30,6 +30,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.RuleNodeEntity;
 import org.thingsboard.server.dao.rule.RuleNodeDao;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.Objects;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaRuleNodeDao extends JpaAbstractSearchTextDao<RuleNodeEntity, RuleNode> implements RuleNodeDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeStateDao.java

@@ -27,11 +27,13 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.RuleNodeStateEntity;
 import org.thingsboard.server.dao.rule.RuleNodeStateDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
 @Slf4j
 @Component
+@SqlDao
 public class JpaRuleNodeStateDao extends JpaAbstractDao<RuleNodeStateEntity, RuleNodeState> implements RuleNodeStateDao {
 
     @Autowired

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

@@ -26,10 +26,12 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.AdminSettingsEntity;
 import org.thingsboard.server.dao.settings.AdminSettingsDao;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
 @Component
+@SqlDao
 @Slf4j
 public class JpaAdminSettingsDao extends JpaAbstractDao<AdminSettingsEntity, AdminSettings> implements AdminSettingsDao {
 

dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java

@@ -30,6 +30,7 @@ import org.thingsboard.server.dao.model.sql.TenantEntity;
 import org.thingsboard.server.dao.model.sql.TenantInfoEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 import org.thingsboard.server.dao.tenant.TenantDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.Objects;
@@ -41,6 +42,7 @@ import java.util.stream.Collectors;
  * Created by Valerii Sosliuk on 4/30/2017.
  */
 @Component
+@SqlDao
 public class JpaTenantDao extends JpaAbstractSearchTextDao<TenantEntity, Tenant> implements TenantDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantProfileDao.java

@@ -27,11 +27,13 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.TenantProfileEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 import org.thingsboard.server.dao.tenant.TenantProfileDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Objects;
 import java.util.UUID;
 
 @Component
+@SqlDao
 public class JpaTenantProfileDao extends JpaAbstractSearchTextDao<TenantProfileEntity, TenantProfile> implements TenantProfileDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/usagerecord/JpaApiUsageStateDao.java

@@ -25,6 +25,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.ApiUsageStateEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
@@ -32,6 +33,7 @@ import java.util.UUID;
  * @author Andrii Shvaika
  */
 @Component
+@SqlDao
 public class JpaApiUsageStateDao extends JpaAbstractDao<ApiUsageStateEntity, ApiUsageState> implements ApiUsageStateDao {
 
     private final ApiUsageStateRepository apiUsageStateRepository;

dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserAuthSettingsDao.java

@@ -24,11 +24,13 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.UserAuthSettingsEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.user.UserAuthSettingsDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
 @Component
 @RequiredArgsConstructor
+@SqlDao
 public class JpaUserAuthSettingsDao extends JpaAbstractDao<UserAuthSettingsEntity, UserAuthSettings> implements UserAuthSettingsDao {
 
     private final UserAuthSettingsRepository repository;

dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java

@@ -24,6 +24,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.UserCredentialsEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
 import org.thingsboard.server.dao.user.UserCredentialsDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.UUID;
 
@@ -31,6 +32,7 @@ import java.util.UUID;
  * Created by Valerii Sosliuk on 4/22/2017.
  */
 @Component
+@SqlDao
 public class JpaUserCredentialsDao extends JpaAbstractDao<UserCredentialsEntity, UserCredentials> implements UserCredentialsDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java

@@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.UserEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 import org.thingsboard.server.dao.user.UserDao;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.Objects;
 import java.util.UUID;
@@ -38,6 +39,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
  * @author Valerii Sosliuk
  */
 @Component
+@SqlDao
 public class JpaUserDao extends JpaAbstractSearchTextDao<UserEntity, User> implements UserDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java

@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.widget.WidgetTypeInfo;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.WidgetTypeDetailsEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractDao;
+import org.thingsboard.server.dao.util.SqlDao;
 import org.thingsboard.server.dao.widget.WidgetTypeDao;
 
 import java.util.List;
@@ -35,6 +36,7 @@ import java.util.UUID;
  * Created by Valerii Sosliuk on 4/29/2017.
  */
 @Component
+@SqlDao
 public class JpaWidgetTypeDao extends JpaAbstractDao<WidgetTypeDetailsEntity, WidgetTypeDetails> implements WidgetTypeDao {
 
     @Autowired

dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java

@@ -28,6 +28,7 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.model.sql.WidgetsBundleEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
+import org.thingsboard.server.dao.util.SqlDao;
 import org.thingsboard.server.dao.widget.WidgetsBundleDao;
 
 import java.util.Objects;
@@ -40,6 +41,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
  * Created by Valerii Sosliuk on 4/23/2017.
  */
 @Component
+@SqlDao
 public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao<WidgetsBundleEntity, WidgetsBundle> implements WidgetsBundleDao {
 
     @Autowired