This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch fix-data-export-selection in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit ae66720e2debcd0739ed372cab5ee1c5c1726e32 Author: Dominik Riemer <[email protected]> AuthorDate: Thu Apr 24 08:16:32 2025 +0200 fix: Ignore export items that are not explicitly selected --- .../export/generator/ExportPackageGenerator.java | 28 ++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/streampipes-data-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java b/streampipes-data-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java index a5b6b1e926..c1672f6d17 100644 --- a/streampipes-data-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java +++ b/streampipes-data-export/src/main/java/org/apache/streampipes/export/generator/ExportPackageGenerator.java @@ -114,13 +114,15 @@ public class ExportPackageGenerator { }); config.getFiles().forEach(item -> { - var fileResolver = new FileResolver(); - String filename = fileResolver.findDocument(item.getResourceId()).getFilename(); - addDoc(builder, item, new FileResolver(), manifest::addFile); - try { - builder.addBinary(filename, Files.readAllBytes(new FileManager().getFile(filename).toPath())); - } catch (IOException e) { - e.printStackTrace(); + if (item.isSelected()) { + var fileResolver = new FileResolver(); + String filename = fileResolver.findDocument(item.getResourceId()).getFilename(); + addDoc(builder, item, new FileResolver(), manifest::addFile); + try { + builder.addBinary(filename, Files.readAllBytes(new FileManager().getFile(filename).toPath())); + } catch (IOException e) { + LOG.warn("Could not add binary file to export package: {}", e.getMessage()); + } } }); }); @@ -143,10 +145,12 @@ public class ExportPackageGenerator { AbstractResolver<?> resolver, Consumer<String> function) { try { - var resourceId = exportItem.getResourceId(); - var sanitizedResourceId = sanitize(resourceId); - builder.addText(sanitizedResourceId, resolver.getSerializedDocument(resourceId)); - function.accept(sanitizedResourceId); + if (exportItem.isSelected()) { + var resourceId = exportItem.getResourceId(); + var sanitizedResourceId = sanitize(resourceId); + builder.addText(sanitizedResourceId, resolver.getSerializedDocument(resourceId)); + function.accept(sanitizedResourceId); + } } catch (JsonProcessingException | ElementNotFoundException e) { LOG.warn( "Could not find document with resource id {} with resolver {}", @@ -170,7 +174,7 @@ public class ExportPackageGenerator { builder.addText(String.valueOf(asset.get("_id")), this.defaultMapper.writeValueAsString(asset)); manifest.addAsset(String.valueOf(asset.get("_id"))); } catch (IOException e) { - e.printStackTrace(); + LOG.warn("Could not add asset to export package: {}", e.getMessage()); } }); }
