From 3682533b4bf83c3fc09f012be1aea3232694debc Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Wed, 3 Jan 2024 16:21:24 +0200
Subject: [PATCH] Renaming to match the correct type

---
 .../server/service/transport/DefaultTransportApiService.java  | 4 ++--
 .../org/thingsboard/server/dao/resource/ResourceService.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
index 23de57ae74..6e594ce5f3 100644
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
+++ b/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(
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java
index fe39b86f07..b4cda2d733 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java
+++ b/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);