moved check to higher level

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

@@ -72,8 +72,10 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
     public void init() {
         PageDataIterable<CalculatedField> cfs = new PageDataIterable<>(calculatedFieldService::findAllCalculatedFields, initFetchPackSize);
         cfs.forEach(cf -> {
-            calculatedFields.putIfAbsent(cf.getId(), cf);
-            actorSystemContext.tell(new CalculatedFieldInitMsg(cf.getTenantId(), cf));
+            if (cf != null) {
+                calculatedFields.putIfAbsent(cf.getId(), cf);
+                actorSystemContext.tell(new CalculatedFieldInitMsg(cf.getTenantId(), cf));
+            }
         });
         calculatedFields.values().forEach(cf -> {
             entityIdCalculatedFields.computeIfAbsent(cf.getEntityId(), id -> new CopyOnWriteArrayList<>()).add(cf);

dao/src/main/java/org/thingsboard/server/dao/sql/cf/DefaultNativeCalculatedFieldRepository.java

@@ -38,7 +38,6 @@ import org.thingsboard.server.common.data.page.PageData;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -99,7 +98,7 @@ public class DefaultNativeCalculatedFieldRepository implements NativeCalculatedF
                 calculatedField.setDebugSettings(JacksonUtil.fromString(debugSettings, DebugSettings.class));
 
                 return calculatedField;
-            }).filter(Objects::nonNull).collect(Collectors.toList());
+            }).collect(Collectors.toList());
             return new PageData<>(data, totalPages, totalElements, hasNext);
         });
     }