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

Always generate public resource key if missing

Browse Source
This commit is contained in:
ViacheslavKlimov 2023-12-21 13:08:46 +02:00
parent 927479095f
commit 04fea1e2db
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
View File

@ -150,7 +150,6 @@ public class BaseImageService extends BaseResourceService implements ImageServic
image.setDescriptorValue(descriptor); image.setDescriptorValue(descriptor);
image.setPreview(result.getRight()); image.setPreview(result.getRight());
if (image.getId() == null) {
if (StringUtils.isEmpty(image.getPublicResourceKey())) { if (StringUtils.isEmpty(image.getPublicResourceKey())) {
image.setPublicResourceKey(generatePublicResourceKey()); image.setPublicResourceKey(generatePublicResourceKey());
} else { } else {
@ -158,7 +157,6 @@ public class BaseImageService extends BaseResourceService implements ImageServic
image.setPublicResourceKey(generatePublicResourceKey()); image.setPublicResourceKey(generatePublicResourceKey());
} }
} }
}
log.debug("[{}] Creating image {} ('{}')", image.getTenantId(), image.getResourceKey(), image.getName()); log.debug("[{}] Creating image {} ('{}')", image.getTenantId(), image.getResourceKey(), image.getName());
return new TbResourceInfo(doSaveResource(image)); return new TbResourceInfo(doSaveResource(image));
} }
@ -292,7 +290,8 @@ public class BaseImageService extends BaseResourceService implements ImageServic
return resourceInfoDao.findSystemOrTenantImageByEtag(tenantId, ResourceType.IMAGE, etag); return resourceInfoDao.findSystemOrTenantImageByEtag(tenantId, ResourceType.IMAGE, etag);
} }
@Transactional(noRollbackFor = Exception.class) // we don't want transaction to rollback in case of an image processing failure @Transactional(noRollbackFor = Exception.class)
// we don't want transaction to rollback in case of an image processing failure
@Override @Override
public boolean replaceBase64WithImageUrl(HasImage entity, String type) { public boolean replaceBase64WithImageUrl(HasImage entity, String type) {
log.trace("Executing replaceBase64WithImageUrl [{}] [{}] [{}]", entity.getTenantId(), type, entity.getName()); log.trace("Executing replaceBase64WithImageUrl [{}] [{}] [{}]", entity.getTenantId(), type, entity.getName());
@ -307,7 +306,8 @@ public class BaseImageService extends BaseResourceService implements ImageServic
return result.isUpdated(); return result.isUpdated();
} }
@Transactional(noRollbackFor = Exception.class) // we don't want transaction to rollback in case of an image processing failure @Transactional(noRollbackFor = Exception.class)
// we don't want transaction to rollback in case of an image processing failure
@Override @Override
public boolean replaceBase64WithImageUrl(WidgetTypeDetails entity) { public boolean replaceBase64WithImageUrl(WidgetTypeDetails entity) {
log.trace("Executing replaceBase64WithImageUrl [{}] [WidgetTypeDetails] [{}]", entity.getTenantId(), entity.getId()); log.trace("Executing replaceBase64WithImageUrl [{}] [WidgetTypeDetails] [{}]", entity.getTenantId(), entity.getId());
@ -333,7 +333,8 @@ public class BaseImageService extends BaseResourceService implements ImageServic
return updated; return updated;
} }
@Transactional(noRollbackFor = Exception.class) // we don't want transaction to rollback in case of an image processing failure @Transactional(noRollbackFor = Exception.class)
// we don't want transaction to rollback in case of an image processing failure
@Override @Override
public boolean replaceBase64WithImageUrl(Dashboard entity) { public boolean replaceBase64WithImageUrl(Dashboard entity) {
log.trace("Executing replaceBase64WithImageUrl [{}] [Dashboard] [{}]", entity.getTenantId(), entity.getId()); log.trace("Executing replaceBase64WithImageUrl [{}] [Dashboard] [{}]", entity.getTenantId(), entity.getId());