Browse Source

Added config parameter for tests to enable cassandra

pull/158/head
volodymyr-babak 9 years ago
parent
commit
d1dad3c09a
  1. 4
      dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
  2. 4
      dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
  3. 4
      dao/src/test/resources/application-test.properties

4
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; private RelationDao relationDao;
@Override @Override
protected Class getEntityClass() { protected Class<AlarmEntity> getEntityClass() {
return AlarmEntity.class; return AlarmEntity.class;
} }
@Override @Override
protected CrudRepository getCrudRepository() { protected CrudRepository<AlarmEntity, UUID> getCrudRepository() {
return alarmRepository; return alarmRepository;
} }

4
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; private AssetRepository assetRepository;
@Override @Override
protected Class getEntityClass() { protected Class<AssetEntity> getEntityClass() {
return AssetEntity.class; return AssetEntity.class;
} }
@Override @Override
protected CrudRepository getCrudRepository() { protected CrudRepository<AssetEntity, UUID> getCrudRepository() {
return assetRepository; return assetRepository;
} }

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

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