Details
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
index cd0df63..a452fed 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
@@ -58,12 +58,12 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
private RelationDao relationDao;
@Override
- protected Class getEntityClass() {
+ protected Class<AlarmEntity> getEntityClass() {
return AlarmEntity.class;
}
@Override
- protected CrudRepository getCrudRepository() {
+ protected CrudRepository<AlarmEntity, UUID> getCrudRepository() {
return alarmRepository;
}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
index 49f8d44..47b2ab1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
@@ -46,12 +46,12 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> im
private AssetRepository assetRepository;
@Override
- protected Class getEntityClass() {
+ protected Class<AssetEntity> getEntityClass() {
return AssetEntity.class;
}
@Override
- protected CrudRepository getCrudRepository() {
+ protected CrudRepository<AssetEntity, UUID> getCrudRepository() {
return assetRepository;
}
diff --git a/dao/src/test/resources/application-test.properties b/dao/src/test/resources/application-test.properties
index 1430eb4..cc41cc7 100644
--- a/dao/src/test/resources/application-test.properties
+++ b/dao/src/test/resources/application-test.properties
@@ -7,4 +7,6 @@ zk.enabled=false
zk.url=localhost:2181
zk.zk_dir=/thingsboard
-sql.enabled=false
\ No newline at end of file
+sql.enabled=false
+
+cassandra.enabled=true
\ No newline at end of file