Browse Source

Renaming to match the correct type

pull/9083/head
Andrii Landiak 3 years ago
parent
commit
3682533b4b
  1. 4
      application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
  2. 4
      common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java

4
application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java

@ -382,7 +382,7 @@ public class DefaultTransportApiService implements TransportApiService {
|| !gatewayId.toString().equals(deviceAdditionalInfo.get(DataConstants.LAST_CONNECTED_GATEWAY).asText()))) {
ObjectNode newDeviceAdditionalInfo = (ObjectNode) deviceAdditionalInfo;
newDeviceAdditionalInfo.put(DataConstants.LAST_CONNECTED_GATEWAY, gatewayId.toString());
Device savedDevice = deviceService.saveDevice(device);
deviceService.saveDevice(device);
}
}
GetOrCreateDeviceFromGatewayResponseMsg.Builder builder = GetOrCreateDeviceFromGatewayResponseMsg.newBuilder()
@ -412,7 +412,7 @@ public class DefaultTransportApiService implements TransportApiService {
}
private ListenableFuture<TransportApiResponseMsg> handle(ProvisionDeviceRequestMsg requestMsg) {
ListenableFuture<ProvisionResponse> provisionResponseFuture = null;
ListenableFuture<ProvisionResponse> provisionResponseFuture;
try {
provisionResponseFuture = Futures.immediateFuture(deviceProvisionService.provisionDevice(
new ProvisionRequest(

4
common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java

@ -54,9 +54,9 @@ public interface ResourceService extends EntityDaoService {
PageData<TbResource> findTenantResourcesByResourceTypeAndPageLink(TenantId tenantId, ResourceType lwm2mModel, PageLink pageLink);
void deleteResource(TenantId tenantId, TbResourceId resource);
void deleteResource(TenantId tenantId, TbResourceId resourceId);
void deleteResource(TenantId tenantId, TbResourceId resource, boolean force);
void deleteResource(TenantId tenantId, TbResourceId resourceId, boolean force);
void deleteResourcesByTenantId(TenantId tenantId);

Loading…
Cancel
Save