From 7914f3d1d05296ff0288ba7c56dc61978da2a10b Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Thu, 24 Nov 2022 11:21:28 +1100 Subject: [PATCH] minor refactoring code to get OTA package id --- .../ota/DefaultOtaPackageStateService.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java b/application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java index 31b7da5fdf..3cc23cb695 100644 --- a/application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java +++ b/application/src/main/java/org/thingsboard/server/service/ota/DefaultOtaPackageStateService.java @@ -181,22 +181,11 @@ public class DefaultOtaPackageStateService implements OtaPackageStateService { private void update(TenantId tenantId, DeviceProfile deviceProfile, OtaPackageType otaPackageType) { Consumer updateConsumer; - OtaPackageId packageId = null; - if (otaPackageType.equals(FIRMWARE)) { - if (deviceProfile.getFirmwareId() != null) { - packageId = deviceProfile.getFirmwareId(); - } - } - else if (otaPackageType.equals(SOFTWARE)) { - if (deviceProfile.getSoftwareId() != null) { - packageId = deviceProfile.getSoftwareId(); - } - } + OtaPackageId packageId = otaPackageType.equals(FIRMWARE)? deviceProfile.getFirmwareId() : deviceProfile.getSoftwareId(); if (packageId != null) { long ts = System.currentTimeMillis(); - OtaPackageId finalPackageId = packageId; - updateConsumer = d -> send(d.getTenantId(), d.getId(), finalPackageId, ts, otaPackageType); + updateConsumer = d -> send(d.getTenantId(), d.getId(), packageId, ts, otaPackageType); } else { updateConsumer = d -> remove(d, otaPackageType); }