Browse Source

added rocksdb path

pull/12038/head
IrynaMatveieva 2 years ago
parent
commit
f75eaf8226
  1. 7
      application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java
  2. 2
      application/src/main/java/org/thingsboard/server/utils/RocksDBConfig.java
  3. 2
      application/src/main/resources/thingsboard.yml
  4. 21
      application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
  5. 21
      application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java

7
application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java

@ -89,25 +89,18 @@ public abstract class AbstractTbEntityService {
@Lazy @Lazy
private EntitiesVersionControlService vcService; private EntitiesVersionControlService vcService;
@Autowired @Autowired
@Lazy
protected AccessControlService accessControlService; protected AccessControlService accessControlService;
@Autowired @Autowired
@Lazy
protected TenantService tenantService; protected TenantService tenantService;
@Autowired @Autowired
@Lazy
protected AssetService assetService; protected AssetService assetService;
@Autowired @Autowired
@Lazy
protected DeviceService deviceService; protected DeviceService deviceService;
@Autowired @Autowired
@Lazy
protected AssetProfileService assetProfileService; protected AssetProfileService assetProfileService;
@Autowired @Autowired
@Lazy
protected DeviceProfileService deviceProfileService; protected DeviceProfileService deviceProfileService;
@Autowired @Autowired
@Lazy
protected EntityService entityService; protected EntityService entityService;
protected boolean isTestProfile() { protected boolean isTestProfile() {

2
application/src/main/java/org/thingsboard/server/utils/RocksDBConfig.java

@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class RocksDBConfig { public class RocksDBConfig {
@Value("${rocksdb.db_path}") @Value("${rocksdb.db_path:${java.io.tmpdir}/rocksdb}")
private String dbPath; private String dbPath;
private RocksDB db; private RocksDB db;

2
application/src/main/resources/thingsboard.yml

@ -426,7 +426,7 @@ sql:
rocksdb: rocksdb:
# Rocksdb path # Rocksdb path
db_path: "${ROCKS_DB_PATH:}" db_path: "${ROCKS_DB_PATH:${java.io.tmpdir}/rocksdb}"
# Actor system parameters # Actor system parameters
actors: actors:

21
application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java

@ -38,10 +38,17 @@ import org.thingsboard.server.common.data.id.AlarmId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.dao.alarm.AlarmService; import org.thingsboard.server.dao.alarm.AlarmService;
import org.thingsboard.server.dao.asset.AssetProfileService;
import org.thingsboard.server.dao.asset.AssetService;
import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.customer.CustomerService;
import org.thingsboard.server.dao.device.DeviceProfileService;
import org.thingsboard.server.dao.device.DeviceService;
import org.thingsboard.server.dao.edge.EdgeService; import org.thingsboard.server.dao.edge.EdgeService;
import org.thingsboard.server.dao.entity.EntityService;
import org.thingsboard.server.dao.tenant.TenantService;
import org.thingsboard.server.service.entitiy.TbLogEntityActionService; import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
import org.thingsboard.server.service.executors.DbCallbackExecutorService; import org.thingsboard.server.service.executors.DbCallbackExecutorService;
import org.thingsboard.server.service.security.permission.AccessControlService;
import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService; import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
import org.thingsboard.server.service.telemetry.AlarmSubscriptionService; import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
@ -81,6 +88,20 @@ public class DefaultTbAlarmServiceTest {
protected TbClusterService tbClusterService; protected TbClusterService tbClusterService;
@MockBean @MockBean
private EntitiesVersionControlService vcService; private EntitiesVersionControlService vcService;
@MockBean
private AccessControlService accessControlService;
@MockBean
private TenantService tenantService;
@MockBean
private AssetService assetService;
@MockBean
private DeviceService deviceService;
@MockBean
private AssetProfileService assetProfileService;
@MockBean
private DeviceProfileService deviceProfileService;
@MockBean
private EntityService entityService;
@SpyBean @SpyBean
DefaultTbAlarmService service; DefaultTbAlarmService service;

21
application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java

@ -35,10 +35,17 @@ import org.thingsboard.server.common.data.id.AlarmId;
import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.dao.alarm.AlarmCommentService; import org.thingsboard.server.dao.alarm.AlarmCommentService;
import org.thingsboard.server.dao.alarm.AlarmService; import org.thingsboard.server.dao.alarm.AlarmService;
import org.thingsboard.server.dao.asset.AssetProfileService;
import org.thingsboard.server.dao.asset.AssetService;
import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.customer.CustomerService;
import org.thingsboard.server.dao.device.DeviceProfileService;
import org.thingsboard.server.dao.device.DeviceService;
import org.thingsboard.server.dao.entity.EntityService;
import org.thingsboard.server.dao.tenant.TenantService;
import org.thingsboard.server.service.entitiy.TbLogEntityActionService; import org.thingsboard.server.service.entitiy.TbLogEntityActionService;
import org.thingsboard.server.service.entitiy.alarm.DefaultTbAlarmCommentService; import org.thingsboard.server.service.entitiy.alarm.DefaultTbAlarmCommentService;
import org.thingsboard.server.service.executors.DbCallbackExecutorService; import org.thingsboard.server.service.executors.DbCallbackExecutorService;
import org.thingsboard.server.service.security.permission.AccessControlService;
import org.thingsboard.server.service.telemetry.AlarmSubscriptionService; import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
import java.util.UUID; import java.util.UUID;
@ -72,6 +79,20 @@ public class DefaultTbAlarmCommentServiceTest {
protected CustomerService customerService; protected CustomerService customerService;
@MockBean @MockBean
protected TbClusterService tbClusterService; protected TbClusterService tbClusterService;
@MockBean
private AccessControlService accessControlService;
@MockBean
private TenantService tenantService;
@MockBean
private AssetService assetService;
@MockBean
private DeviceService deviceService;
@MockBean
private AssetProfileService assetProfileService;
@MockBean
private DeviceProfileService deviceProfileService;
@MockBean
private EntityService entityService;
@SpyBean @SpyBean
DefaultTbAlarmCommentService service; DefaultTbAlarmCommentService service;

Loading…
Cancel
Save