SLING-10467 : Converted content package referres to paths moved to repo-init
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
index b44bf6e..8dd24fc 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -472,7 +472,7 @@
}
entryHandler.handle(entryPath, archive, entry, this);
if (useMainPackageAssembler) {
- mainPackageAssembler.addPath(entryPath);
+ mainPackageAssembler.recordEntryPath(entryPath);
}
return true;
}
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssembler.java b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssembler.java
index 50def7d..e8be6e1 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssembler.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssembler.java
@@ -273,9 +273,18 @@
return new File(storingDirectory, path);
}
-
- public boolean addPath(@NotNull String path) {
- return allPaths.add(path);
+
+ /**
+ * Records an entry path as it is processed by the {@link ContentPackage2FeatureModelConverter}. The path of all
+ * original entries that got processed will later be compared to the paths of those entries written back
+ * to this assembler to build the converted content package and generate an updated {@code WorkspaceFilter} that no
+ * longer refers to paths that got moved out to the feature model (see also https://issues.apache.org/jira/browse/SLING-10467)
+ *
+ * @param entryPath The path of a content package entry processed by the converter.
+ * @return {@code true} if the given path was successfully added to the internal set, {@code false} otherwise.
+ */
+ public boolean recordEntryPath(@NotNull String entryPath) {
+ return allPaths.add(entryPath);
}
public void updateDependencies(@NotNull Map<PackageId, Set<Dependency>> mutableContentsIds) {
