This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new bc08b3c SLING-10805 : Add ContentPackageDescriptor to public API
bc08b3c is described below
commit bc08b3cc396ba684073e9264fb2f090381508421
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Mon Sep 13 07:02:16 2021 +0200
SLING-10805 : Add ContentPackageDescriptor to public API
---
.../task/impl/CheckContentPackageForInstallables.java | 2 +-
.../sling/feature/scanner/ContentPackageDescriptor.java | 2 +-
.../feature/scanner/impl/ContentPackageDescriptorImpl.java | 12 ++++++------
.../sling/feature/scanner/impl/ContentPackageScanner.java | 2 +-
.../task/impl/CheckContentPackagesForInstallablesTest.java | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackageForInstallables.java
b/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackageForInstallables.java
index 03385fe..69e2e99 100644
---
a/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackageForInstallables.java
+++
b/src/main/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackageForInstallables.java
@@ -48,7 +48,7 @@ public class CheckContentPackageForInstallables implements
AnalyserTask {
continue;
}
if ( checkPcks && cp.isEmbeddedInContentPackage() ) {
- ctx.reportArtifactError(cp.getParentContentPackage().getId(),
"Content package " + cp.getParentContentPackage().getId() +
+
ctx.reportArtifactError(cp.getParentContentPackage().getArtifact().getId(),
"Content package " + cp.getParentContentPackage().getArtifact().getId() +
" embedds content package " + cp.getName());
}
if (!cp.hasEmbeddedArtifacts() || cp.isEmbeddedInContentPackage())
{
diff --git
a/src/main/java/org/apache/sling/feature/scanner/ContentPackageDescriptor.java
b/src/main/java/org/apache/sling/feature/scanner/ContentPackageDescriptor.java
index 43f8021..3157917 100644
---
a/src/main/java/org/apache/sling/feature/scanner/ContentPackageDescriptor.java
+++
b/src/main/java/org/apache/sling/feature/scanner/ContentPackageDescriptor.java
@@ -59,7 +59,7 @@ public abstract class ContentPackageDescriptor extends
ArtifactDescriptor {
* Get the parent content package
* @return The parent content package or {@code null}
*/
- public abstract Artifact getParentContentPackage();
+ public abstract ContentPackageDescriptor getParentContentPackage();
/**
* Get the parent content path
diff --git
a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageDescriptorImpl.java
b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageDescriptorImpl.java
index c1dfa7e..7533a3b 100644
---
a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageDescriptorImpl.java
+++
b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageDescriptorImpl.java
@@ -52,8 +52,8 @@ public class ContentPackageDescriptorImpl extends
ContentPackageDescriptor {
/** Paths in the content package. */
private final List<String> paths;
- /** Optional: the artifact of the parent content package. */
- private Artifact parentContentPackage;
+ /** Optional: the descriptor of the parent content package. */
+ private ContentPackageDescriptor parentContentPackage;
/** Optional: the path inside of the parent content package. */
private String parentContentPath;
@@ -132,7 +132,7 @@ public class ContentPackageDescriptorImpl extends
ContentPackageDescriptor {
}
@Override
- public Artifact getParentContentPackage() {
+ public ContentPackageDescriptor getParentContentPackage() {
return parentContentPackage;
}
@@ -143,12 +143,12 @@ public class ContentPackageDescriptorImpl extends
ContentPackageDescriptor {
/**
* Set the information about the parent content package containing this
artifact
- * @param artifact The package
+ * @param desc The package
* @param path The path inside the package
*/
- public void setParentContentPackageInfo(final Artifact artifact, final
String path) {
+ public void setParentContentPackageInfo(final ContentPackageDescriptor
desc, final String path) {
checkLocked();
- this.parentContentPackage = artifact;
+ this.parentContentPackage = desc;
this.parentContentPath = path;
}
diff --git
a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
index bd4ef22..14fac64 100644
---
a/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
+++
b/src/main/java/org/apache/sling/feature/scanner/impl/ContentPackageScanner.java
@@ -245,7 +245,7 @@ public class ContentPackageScanner {
final ContentPackageDescriptorImpl desc = new
ContentPackageDescriptorImpl(name, packageArtifact, archiveUrl, manifest,
bundles, contentPaths, configs, packageProps);
if ( parentPackage != null ) {
-
desc.setParentContentPackageInfo(parentPackage.getArtifact(),
parentContentPath);
+ desc.setParentContentPackageInfo(parentPackage,
parentContentPath);
}
for (final File f : toProcess) {
diff --git
a/src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesForInstallablesTest.java
b/src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesForInstallablesTest.java
index 37e3c44..a0c2b16 100644
---
a/src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesForInstallablesTest.java
+++
b/src/test/java/org/apache/sling/feature/analyser/task/impl/CheckContentPackagesForInstallablesTest.java
@@ -74,7 +74,7 @@ public class CheckContentPackagesForInstallablesTest {
final ContentPackageDescriptorImpl embedded = new
ContentPackageDescriptorImpl("embedded", new
Artifact(ArtifactId.parse("g:e:1")),
new URL("file:/foo"), null, null, null, null, new Properties());
- embedded.setParentContentPackageInfo(cpd.getArtifact(), "/path");
+ embedded.setParentContentPackageInfo(cpd, "/path");
fd.getArtifactDescriptors().add(embedded);
analyser.execute(ctx);
