Add comments and a static import

1 files changed, 7 insertions, 1 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
index c9c4091d927..e26412483d5 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
@@ -41,6 +41,7 @@ import java.util.jar.Manifest;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.yahoo.container.plugin.bundle.AnalyzeBundle.publicPackagesAggregated;
 import static com.yahoo.container.plugin.util.Files.allDescendantFiles;
 import static com.yahoo.container.plugin.util.IO.withFileOutputStream;
 import static com.yahoo.container.plugin.util.JarFiles.withInputStream;
@@ -95,13 +96,18 @@ public class GenerateOsgiManifestMojo extends AbstractMojo {
             Artifacts.ArtifactSet artifactSet = Artifacts.getArtifacts(project);
             warnOnUnsupportedArtifacts(artifactSet.getNonJarArtifacts());
 
-            AnalyzeBundle.PublicPackages publicPackagesFromProvidedJars = AnalyzeBundle.publicPackagesAggregated(
+            // Packages from Export-Package and Global-Package headers in provided scoped jars
+            AnalyzeBundle.PublicPackages publicPackagesFromProvidedJars = publicPackagesAggregated(
                     artifactSet.getJarArtifactsProvided().stream().map(Artifact::getFile).collect(Collectors.toList()));
+
+            // Packages defined in compile scoped jars
             PackageTally includedJarPackageTally = definedPackages(artifactSet.getJarArtifactsToInclude());
 
             PackageTally projectPackageTally = analyzeProjectClasses();
+            // The union of packages in the bundle's project and its compile scoped jars.
             PackageTally pluginPackageTally = projectPackageTally.combine(includedJarPackageTally);
 
+            // TODO: isn't 'definedPackages' the same as pluginPackageTally.definedPackages()?
             Set<String> definedPackages = new HashSet<>(projectPackageTally.definedPackages());
             definedPackages.addAll(includedJarPackageTally.definedPackages());