Make it clear that we operate over repositories

Make it clear by naming that we are recursively collecting
feature repositories (Features) which each one contains a list
of features (Feature).

JIRA: ODLPARENT-309
Change-Id: Ie029be1c3d73e5d7c03a2fa41a983ab31b58c204
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java b/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
index d3c888bd7b0fc8b9f4b21b09cb016348e3a331bf..9e4b5cd9722af1bfae4aef8fdfffb4f041b0515c 100644 (file)
--- a/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
+++ b/karaf-plugin/src/main/java/org/opendaylight/odlparent/PopulateLocalRepoMojo.java
@@ -110,23 +110,26 @@ public class PopulateLocalRepoMojo extends AbstractMojo {
             Set<Artifact> startupArtifacts = readStartupProperties(aetherUtil);
             aetherUtil.installArtifacts(startupArtifacts);
             Set<Artifact> featureArtifacts = new LinkedHashSet<>();
-            Set<Features> features = new LinkedHashSet<>();
-            readFeatureCfg(aetherUtil, featureUtil, featureArtifacts, features);
+            final Set<Features> featureRepos = new LinkedHashSet<>();
+            readFeatureCfg(aetherUtil, featureUtil, featureArtifacts, featureRepos);
             featureArtifacts.addAll(
                 aetherUtil.resolveDependencies(MvnToAetherMapper.toAether(project.getDependencies()),
                     new KarafFeaturesDependencyFilter()));
-            features.addAll(featureUtil.readFeatures(featureArtifacts));
+            featureRepos.addAll(featureUtil.readFeatures(featureArtifacts));
             // Do not provide FeatureUtil.featuresRepositoryToCoords(features)) as existingCoords
             // to findAllFeaturesRecursively, as those coords are not resolved yet, and it would lead to Bug 6187.
-            features.addAll(featureUtil.findAllFeaturesRecursively(features));
-            for (Features feature : features) {
-                LOG.info("Feature repository discovered recursively: {}", feature.getName());
+            featureRepos.addAll(featureUtil.findAllFeaturesRecursively(featureRepos));
+            for (final Features featureRepo : featureRepos) {
+                LOG.info("Feature repository discovered recursively: {}", featureRepo.getName());
             }
             final var includeJar = getIncludeJar();
+            final Set<Features> cleanedRepos;
             if (includeJar != null && !includeJar.isEmpty()) {
-                features = removeExcludedFeatures(features, includeJar);
+                cleanedRepos = removeExcludedFeatures(featureRepos, includeJar);
+            } else {
+                cleanedRepos = featureRepos;
             }
-            Set<Artifact> artifacts = aetherUtil.resolveArtifacts(FeatureUtil.featuresToCoords(features));
+            Set<Artifact> artifacts = aetherUtil.resolveArtifacts(FeatureUtil.featuresToCoords(cleanedRepos));
             artifacts.addAll(featureArtifacts);
             featureUtil.removeLocalArtifacts(artifacts);