fixed potential NPE, code cleanup

application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java

@@ -228,7 +228,9 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
                 links.forEach(link -> removedLinkEntityIds.add(link.getEntityId()));
             }
             calculatedFieldsCtx.remove(cfId);
-            removedCfEntityIds.add(cf.getEntityId());
+            if (cf != null) {
+                removedCfEntityIds.add(cf.getEntityId());
+            }
         });
         removedCfEntityIds.forEach(entityId -> {
             entityIdCalculatedFields.compute(entityId, (k, cfs) -> {

application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java

@@ -302,25 +302,6 @@ public class DefaultCalculatedFieldCacheTest {
         assertThat(cache.getCalculatedField(cf.getId())).isEqualTo(updatedCf);
     }
 
-    // --- Helpers ---
-
-    private void stubDeviceOwner(TenantId tenantId, DeviceId deviceId, EntityId ownerId) {
-        Device device = new Device();
-        device.setId(deviceId);
-        device.setTenantId(tenantId);
-        if (ownerId instanceof CustomerId customerId) {
-            device.setCustomerId(customerId);
-        }
-        // If ownerId is a TenantId, leaving customerId null means getOwnerId() returns tenantId
-        when(deviceService.findDeviceById(tenantId, deviceId)).thenReturn(device);
-        // Stubs for getOwnedEntities iteration (empty pages — device is added explicitly)
-        when(deviceService.findDeviceInfosByFilter(any(), any())).thenReturn(PageData.emptyPageData());
-        when(assetService.findAssetsByTenantIdAndCustomerId(any(), any(), any())).thenReturn(PageData.emptyPageData());
-        if (ownerId instanceof TenantId) {
-            when(customerService.findCustomersByTenantId(any(), any())).thenReturn(PageData.emptyPageData());
-        }
-    }
-
     private CalculatedField addCfToCache(TenantId tenantId, EntityId entityId) {
         CalculatedFieldId cfId = new CalculatedFieldId(UUID.randomUUID());
         CalculatedField cf = buildCalculatedField(cfId, tenantId, entityId, simpleCfConfig());

application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java

@@ -70,7 +70,6 @@ public class DefaultTbAssetProfileCacheTest {
         // After deletion tenant1 profile should be reloaded from service on next get
         when(assetProfileService.findAssetProfileById(any(), any())).thenReturn(null);
         assertThat(cache.get(tenant1, profileId1)).isNull();
-        // tenant2 profile should still be served from cache (no extra service call)
         verify(assetProfileService, times(1)).findAssetProfileById(tenant2, profileId2);
     }