[sling-whiteboard] branch master updated: Bundle collision resolution

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a94e72  Bundle collision resolution
4a94e72 is described below

commit 4a94e72838ac624268f81747e0701819d9c33864
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Tue Dec 17 08:16:53 2019 +0000

    Bundle collision resolution
---
 osgi-featuremodel/src/main/java/org/osgi/feature/Feature.java      | 7 +++++++
 .../src/main/java/org/osgi/feature/impl/FeatureServiceImpl.java    | 1 +
 .../test/java/org/osgi/feature/impl/FeatureServiceImplTest.java    | 3 +--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/Feature.java b/osgi-featuremodel/src/main/java/org/osgi/feature/Feature.java
index 35f3086..e59f074 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/Feature.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/feature/Feature.java
@@ -100,6 +100,13 @@ public class Feature extends Artifact {
         return variables;
     }
 
+    @Override
+    public String toString() {
+        return "Feature [title=" + title + ", description=" + description + ", vendor=" + vendor + ", license=" + license
+                + ", location=" + location + ", complete=" + complete + ", isFinal=" + isFinal + ", bundles=" + bundles
+                + ", configurations=" + configurations + ", variables=" + variables + ", getID()=" + getID() + "]";
+    }
+
     // Not Thread Safe
     public static class Builder {
         private final ArtifactID id;
diff --git a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureServiceImpl.java b/osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureServiceImpl.java
index 859fdac..2c3e551 100644
--- a/osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureServiceImpl.java
+++ b/osgi-featuremodel/src/main/java/org/osgi/feature/impl/FeatureServiceImpl.java
@@ -139,6 +139,7 @@ public class FeatureServiceImpl implements FeatureService {
                 }
             }
         }
+        bundles.addAll(addedBundles);
         return bundles;
     }
 
diff --git a/osgi-featuremodel/src/test/java/org/osgi/feature/impl/FeatureServiceImplTest.java b/osgi-featuremodel/src/test/java/org/osgi/feature/impl/FeatureServiceImplTest.java
index f416a05..ef024c3 100644
--- a/osgi-featuremodel/src/test/java/org/osgi/feature/impl/FeatureServiceImplTest.java
+++ b/osgi-featuremodel/src/test/java/org/osgi/feature/impl/FeatureServiceImplTest.java
@@ -23,7 +23,6 @@ import org.osgi.feature.Feature;
 import org.osgi.feature.FeatureService;
 import org.osgi.feature.MergeContext;
 import org.osgi.feature.builder.MergeContextBuilder;
-import org.osgi.feature.impl.FeatureServiceImpl;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -75,7 +74,7 @@ public class FeatureServiceImplTest {
             f1 = fs.readFeature(r);
         }
 
-        URL res2 = getClass().getResource("/features/test-feature.json");
+        URL res2 = getClass().getResource("/features/test-feature2.json");
         Feature f2;
         try (Reader r = new InputStreamReader(res2.openStream())) {
             f2 = fs.readFeature(r);