Browse Source

added test

pull/12905/head
dashevchenko 2 years ago
parent
commit
29e9a3d122
  1. 6
      application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/ResourceImportService.java
  2. 44
      application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java

6
application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/ResourceImportService.java

@ -73,7 +73,11 @@ public class ResourceImportService extends BaseEntityImportService<TbResourceId,
if (resource.getResourceType() == ResourceType.IMAGE) {
return new TbResource(imageService.saveImage(resource));
} else {
resource = resourceService.saveResource(resource);
if (compareResult.isExternalIdChangedOnly()) {
resource = resourceService.saveResource(resource, false);
} else {
resource = resourceService.saveResource(resource);
}
resource.setData(null);
resource.setPreview(null);
return resource;

44
application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save