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

Non-null check for updateResourcesUsage

Browse Source
This commit is contained in:
ViacheslavKlimov 2024-12-05 12:44:50 +02:00
parent f50789ebf3
commit a2ae5b06c0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetType.java
View File

@ -50,7 +50,8 @@ public class WidgetType extends BaseWidgetType {
@JsonIgnore @JsonIgnore
public JsonNode getDefaultConfig() { public JsonNode getDefaultConfig() {
return Optional.ofNullable(descriptor.get("defaultConfig")) return Optional.ofNullable(descriptor)
.map(descriptor -> descriptor.get("defaultConfig"))
.filter(JsonNode::isTextual).map(JsonNode::asText) .filter(JsonNode::isTextual).map(JsonNode::asText)
.map(json -> { .map(json -> {
try { try {

9
dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
View File

@ -403,6 +403,9 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
@Override @Override
public boolean updateResourcesUsage(TenantId tenantId, Dashboard dashboard) { public boolean updateResourcesUsage(TenantId tenantId, Dashboard dashboard) {
if (dashboard.getConfiguration() == null) {
return false;
}
Map<String, String> links = getResourcesLinks(dashboard.getResources()); Map<String, String> links = getResourcesLinks(dashboard.getResources());
return updateResourcesUsage(tenantId, List.of(dashboard.getConfiguration()), List.of(DASHBOARD_RESOURCES_MAPPING), links); return updateResourcesUsage(tenantId, List.of(dashboard.getConfiguration()), List.of(DASHBOARD_RESOURCES_MAPPING), links);
} }
@ -413,8 +416,10 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
List<JsonNode> jsonNodes = new ArrayList<>(2); List<JsonNode> jsonNodes = new ArrayList<>(2);
List<Map<String, String>> mappings = new ArrayList<>(2); List<Map<String, String>> mappings = new ArrayList<>(2);
jsonNodes.add(widgetTypeDetails.getDescriptor()); if (widgetTypeDetails.getDescriptor() != null) {
mappings.add(WIDGET_RESOURCES_MAPPING); jsonNodes.add(widgetTypeDetails.getDescriptor());
mappings.add(WIDGET_RESOURCES_MAPPING);
}
JsonNode defaultConfig = widgetTypeDetails.getDefaultConfig(); JsonNode defaultConfig = widgetTypeDetails.getDefaultConfig();
if (defaultConfig != null) { if (defaultConfig != null) {