Reapply "Gjoranv/allow duplicate bundles"

This reverts commit 2ef1e922a1d845b3cd79e9fb329925e7e9896919.

2 files changed, 18 insertions, 10 deletions

diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
index 9c4891c7db2..90bda0ef8a8 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
+++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java
@@ -14,6 +14,8 @@ import com.yahoo.container.di.componentgraph.core.Node;
 import com.yahoo.container.di.config.RestApiContext;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
 
 import java.util.Collection;
 import java.util.concurrent.ExecutionException;
@@ -283,13 +285,16 @@ public class ContainerTest extends ContainerTestBase {
     public void providers_are_destructed() {
         writeBootstrapConfigs("id1", DestructableProvider.class);
 
-        ComponentDeconstructor deconstructor = components -> components.forEach(component -> {
-            if (component instanceof AbstractComponent) {
-                ((AbstractComponent) component).deconstruct();
-            } else if (component instanceof Provider) {
-                ((Provider<?>) component).deconstruct();
-            }
-        });
+        ComponentDeconstructor deconstructor = (components, bundles) -> {
+            components.forEach(component -> {
+                if (component instanceof AbstractComponent) {
+                    ((AbstractComponent) component).deconstruct();
+                } else if (component instanceof Provider) {
+                    ((Provider<?>) component).deconstruct();
+                }
+            });
+            if (! bundles.isEmpty()) throw new IllegalArgumentException("This test should not use bundles");
+        };
 
         Container container = newContainer(dirConfigSource, deconstructor);
 
@@ -373,13 +378,14 @@ public class ContainerTest extends ContainerTestBase {
 
     public static class TestDeconstructor implements ComponentDeconstructor {
         @Override
-        public void deconstruct(Collection<Object> components) {
+        public void deconstruct(Collection<Object> components, Collection<Bundle> bundles) {
             components.forEach(component -> {
                 if (component instanceof DestructableComponent) {
                     DestructableComponent vespaComponent = (DestructableComponent) component;
                     vespaComponent.deconstruct();
                 }
             });
+            if (! bundles.isEmpty()) throw new IllegalArgumentException("This test should not use bundles");
         }
     }
 
diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
index 79cb080dfa4..18236a6bde9 100644
--- a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
+++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java
@@ -5,7 +5,6 @@ import com.google.inject.Guice;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.config.FileReference;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
-import com.yahoo.container.di.CloudSubscriberFactory;
 import com.yahoo.container.di.ContainerTest.ComponentTakingConfig;
 import com.yahoo.container.di.componentgraph.core.ComponentGraph;
 import com.yahoo.container.di.osgi.BundleClasses;
@@ -16,6 +15,8 @@ import org.osgi.framework.Bundle;
 import java.util.Collection;
 import java.util.Set;
 
+import static java.util.Collections.emptySet;
+
 /**
  * @author Tony Vaagenes
  * @author gjoranv
@@ -60,7 +61,8 @@ public class ContainerTestBase {
                         }
 
                         @Override
-                        public void useBundles(Collection<FileReference> bundles) {
+                        public Set<Bundle> useBundles(Collection<FileReference> bundles) {
+                            return emptySet();
                         }
 
                         @Override