Revert "Gjoranv/allow duplicate bundles"

4 files changed, 1 insertions, 39 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java
index b1aceb81bc6..f5346a21a4f 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/OsgiFramework.java
@@ -5,7 +5,6 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 
-import java.util.Collection;
 import java.util.List;
 
 /**
@@ -14,7 +13,6 @@ import java.util.List;
  * {@link BundleInstaller} since that provides common convenience methods.
  *
  * @author Simon Thoresen Hult
- * @author gjoranv
  */
 public interface OsgiFramework {
 
@@ -60,8 +58,6 @@ public interface OsgiFramework {
     /**
      * Synchronously refresh all bundles currently loaded. Once this method returns, the
      * class loaders of all bundles will reflect on the current set of loaded bundles.
-     *
-     * NOTE: This method is no longer used by the Jdisc container framework, but kept for completeness.
      */
     void refreshPackages();
 
@@ -85,20 +81,6 @@ public interface OsgiFramework {
     List<Bundle> bundles();
 
     /**
-     * Returns all installed bundles that are visible to the requesting bundle. Bundle visibility
-     * is controlled via implementations of {@link org.osgi.framework.hooks.bundle.FindHook};
-     */
-    List<Bundle> getBundles(Bundle requestingBundle);
-
-    /**
-     * Allows this framework to install duplicates of the given collection of bundles. Duplicate detection
-     * is handled by the {@link com.yahoo.jdisc.core.BundleCollisionHook}.
-     *
-     * @param bundles The bundles to allow duplicates of
-     */
-    void allowDuplicateBundles(Collection<Bundle> bundles);
-
-    /**
      * This method starts the framework instance. Before this method is called, any call to {@link
      * #installBundle(String)} or {@link #bundles()} will generate a {@link NullPointerException}.
      *
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java
index ae1c81195ce..58ad5df9b0d 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/BundleCollisionHook.java
@@ -15,7 +15,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.logging.Logger;
 
 /**
  * A bundle {@link CollisionHook} that contains a set of bundles that are allowed to collide with
@@ -27,7 +26,6 @@ import java.util.logging.Logger;
  * @author gjoranv
  */
 public class BundleCollisionHook implements CollisionHook, EventHook, FindHook {
-    private static Logger log = Logger.getLogger(BundleCollisionHook.class.getName());
 
     private ServiceRegistration<?> registration;
     private Map<Bundle, BsnVersion> allowedDuplicates = new HashMap<>(5);
@@ -107,7 +105,6 @@ public class BundleCollisionHook implements CollisionHook, EventHook, FindHook {
                 }
             }
         }
-        log.info("Hiding bundles from bundle '" + context.getBundle() + "': " + bundlesToHide);
         bundles.removeAll(bundlesToHide);
     }
 
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
index c14e513fb98..19a1707e97c 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/FelixFramework.java
@@ -117,9 +117,6 @@ public class FelixFramework implements OsgiFramework {
         return sb.toString();
     }
 
-    /**
-     * NOTE: This method is no longer used by the Jdisc container framework, but kept for completeness.
-     */
     @Override
     public void refreshPackages() {
         FrameworkWiring wiring = felix.adapt(FrameworkWiring.class);
@@ -156,13 +153,8 @@ public class FelixFramework implements OsgiFramework {
         return Arrays.asList(felix.getBundleContext().getBundles());
     }
 
-    @Override
     public List<Bundle> getBundles(Bundle requestingBundle) {
-        log.fine(() -> "All bundles: " + bundles());
-        log.fine(() -> "Getting visible bundles for bundle " + requestingBundle);
-        List<Bundle> visibleBundles = Arrays.asList(requestingBundle.getBundleContext().getBundles());
-        log.fine(() -> "Visible bundles: " + visibleBundles);
-        return visibleBundles;
+        return Arrays.asList(requestingBundle.getBundleContext().getBundles());
     }
 
     public void allowDuplicateBundles(Collection<Bundle> bundles) {
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/test/NonWorkingOsgiFramework.java b/jdisc_core/src/main/java/com/yahoo/jdisc/test/NonWorkingOsgiFramework.java
index 0f927aa97d3..6b129e82a45 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/test/NonWorkingOsgiFramework.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/test/NonWorkingOsgiFramework.java
@@ -5,7 +5,6 @@ import com.yahoo.jdisc.application.OsgiFramework;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -40,14 +39,6 @@ public class NonWorkingOsgiFramework implements OsgiFramework {
     }
 
     @Override
-    public List<Bundle> getBundles(Bundle requestingBundle) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public void allowDuplicateBundles(Collection<Bundle> bundles) { }
-
-    @Override
     public void start() {
 
     }