diff options
author | gjoranv <gv@verizonmedia.com> | 2019-07-17 12:26:23 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-07-17 12:26:23 +0200 |
commit | 95614b2af858429434a4a1d0c3b4629873e5a4f1 (patch) | |
tree | c7c16751a848b83521b8f86d6403cb22586657be /bundle-plugin | |
parent | aaa3d1dc83084691741e06313b68135a2923ff86 (diff) |
Extract method for debug logging package sets.
Diffstat (limited to 'bundle-plugin')
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java | 16 |
1 files changed, 10 insertions, 6 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 e32326868d1..c53c7f49b4a 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 @@ -111,12 +111,7 @@ public class GenerateOsgiManifestMojo extends AbstractMojo { warnIfPackagesDefinedOverlapsGlobalPackages(includedPackages.definedPackages(), publicPackagesFromProvidedJars.globals); - if (getLog().isDebugEnabled()) { - getLog().debug("Referenced packages = " + includedPackages.referencedPackages()); - getLog().debug("Defined packages = " + includedPackages.definedPackages()); - getLog().debug("Exported packages of dependencies = " + publicPackagesFromProvidedJars.exports.stream() - .map(e -> "(" + e.getPackageNames().toString() + ", " + e.version().orElse("")).collect(Collectors.joining(", "))); - } + logDebugPackageSets(publicPackagesFromProvidedJars, includedPackages); if (hasJdiscCoreProvided(artifactSet.getJarArtifactsProvided())) { // If jdisc_core is not provided, log output may contain packages that _are_ available runtime. @@ -143,6 +138,15 @@ public class GenerateOsgiManifestMojo extends AbstractMojo { } } + private void logDebugPackageSets(AnalyzeBundle.PublicPackages publicPackagesFromProvidedJars, PackageTally includedPackages) { + if (getLog().isDebugEnabled()) { + getLog().debug("Referenced packages = " + includedPackages.referencedPackages()); + getLog().debug("Defined packages = " + includedPackages.definedPackages()); + getLog().debug("Exported packages of dependencies = " + publicPackagesFromProvidedJars.exports.stream() + .map(e -> "(" + e.getPackageNames().toString() + ", " + e.version().orElse("")).collect(Collectors.joining(", "))); + } + } + private boolean hasJdiscCoreProvided(List<Artifact> providedArtifacts) { return providedArtifacts.stream().anyMatch(artifact -> artifact.getArtifactId().equals("jdisc_core")); } |