dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check user's additionalInfo for nullity

Browse Source
This commit is contained in:
ViacheslavKlimov 2023-08-07 16:50:10 +03:00
parent b25fd961d4
commit d3710b411f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotificationSettingsService.java
View File

@ -54,8 +54,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import static java.util.function.Predicate.not;
@Service
@RequiredArgsConstructor
public class DefaultNotificationSettingsService implements NotificationSettingsService {
@ -107,8 +105,8 @@ public class DefaultNotificationSettingsService implements NotificationSettingsS
@Override
public UserNotificationSettings getUserNotificationSettings(TenantId tenantId, User user, boolean format) {
UserNotificationSettings settings = Optional.ofNullable(user.getAdditionalInfo().get(USER_SETTINGS_KEY))
.filter(not(JsonNode::isNull))
UserNotificationSettings settings = Optional.ofNullable(user.getAdditionalInfo())
.filter(JsonNode::isObject).map(info -> info.get(USER_SETTINGS_KEY)).filter(JsonNode::isObject)
.map(json -> JacksonUtil.treeToValue(json, UserNotificationSettings.class))
.orElse(UserNotificationSettings.DEFAULT);
if (format) {