fix: added DELETE entries to final sorted bundle

hhund · hhund · commit 5a74bd658c23 · 2025-05-27T17:03:20.000+02:00
diff --git a/dsf-maven/dsf-maven-plugin/src/main/java/dev/dsf/maven/bundle/BundleGenerator.java b/dsf-maven/dsf-maven-plugin/src/main/java/dev/dsf/maven/bundle/BundleGenerator.java
@@ -222,7 +222,10 @@ private void sortBundleEntries(Bundle bundle)
 
 		resources.stream().map(EntryAndLabel::label).forEach(l -> logger.debug(l));
 
-		bundle.setEntry(resources.stream().map(EntryAndLabel::entry).toList());
+		List<BundleEntryComponent> finalEntries = new ArrayList<>(
+				bundle.getEntry().stream().filter(Predicate.not(BundleEntryComponent::hasResource)).toList());
+		finalEntries.addAll(resources.stream().map(EntryAndLabel::entry).toList());
+		bundle.setEntry(finalEntries);
 	}
 
 	private static record EntryAndLabel(BundleEntryComponent entry, String label)

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,10 @@ private void sortBundleEntries(Bundle bundle)`
`222`	`222`
`223`	`223`	`resources.stream().map(EntryAndLabel::label).forEach(l -> logger.debug(l));`
`224`	`224`
`225`		`- bundle.setEntry(resources.stream().map(EntryAndLabel::entry).toList());`
	`225`	`+ List<BundleEntryComponent> finalEntries = new ArrayList<>(`
	`226`	`+ bundle.getEntry().stream().filter(Predicate.not(BundleEntryComponent::hasResource)).toList());`
	`227`	`+ finalEntries.addAll(resources.stream().map(EntryAndLabel::entry).toList());`
	`228`	`+ bundle.setEntry(finalEntries);`
`226`	`229`	`}`
`227`	`230`
`228`	`231`	`private static record EntryAndLabel(BundleEntryComponent entry, String label)`