dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added config parameter for tests to enable cassandra

Browse Source
This commit is contained in:
volodymyr-babak 2017-05-30 11:54:59 +03:00
parent 1b36cfb4fe
commit d1dad3c09a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

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

@ -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;
}

4
dao/src/test/resources/application-test.properties
View File

@ -7,4 +7,6 @@ zk.enabled=false
zk.url=localhost:2181
zk.zk_dir=/thingsboard
sql.enabled=false
sql.enabled=false
cassandra.enabled=true