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

Minor refactoring

Browse Source
This commit is contained in:
ViacheslavKlimov 2024-04-26 13:05:06 +03:00
parent 3ddda71e14
commit 1ae1e90f86
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java
View File

@ -117,7 +117,6 @@ public class HousekeeperService {
throw new IllegalArgumentException("Unsupported task type " + taskType); throw new IllegalArgumentException("Unsupported task type " + taskType);
} }
try { try {
long startTs = System.currentTimeMillis(); long startTs = System.currentTimeMillis();
Future<Object> future = taskExecutor.submit(() -> { Future<Object> future = taskExecutor.submit(() -> {

9
application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
View File

@ -69,7 +69,6 @@ import org.thingsboard.server.actors.device.DeviceActorMessageProcessor;
import org.thingsboard.server.actors.device.SessionInfo; import org.thingsboard.server.actors.device.SessionInfo;
import org.thingsboard.server.actors.device.ToDeviceRpcRequestMetadata; import org.thingsboard.server.actors.device.ToDeviceRpcRequestMetadata;
import org.thingsboard.server.actors.service.DefaultActorService; import org.thingsboard.server.actors.service.DefaultActorService;
import org.thingsboard.server.common.data.AttributeScope;
import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.DeviceProfile; import org.thingsboard.server.common.data.DeviceProfile;
@ -102,8 +101,6 @@ import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.id.TenantProfileId; import org.thingsboard.server.common.data.id.TenantProfileId;
import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.id.UUIDBased;
import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
import org.thingsboard.server.common.data.kv.StringDataEntry;
import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.common.data.page.TimePageLink;
@ -441,11 +438,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
} }
protected Tenant saveTenant(Tenant tenant) throws Exception { protected Tenant saveTenant(Tenant tenant) throws Exception {
tenant = doPost("/api/tenant", tenant, Tenant.class); return doPost("/api/tenant", tenant, Tenant.class);
if (tenant.getId() == null) {
attributesService.save(TenantId.SYS_TENANT_ID, tenant.getId(), AttributeScope.SERVER_SCOPE, new BaseAttributeKvEntry(System.currentTimeMillis(), new StringDataEntry("test", "test"))).get(); // creating marker attr to later know when Housekeeper finishes tenant cleanup
}
return tenant;
} }
protected void loginDifferentCustomer() throws Exception { protected void loginDifferentCustomer() throws Exception {