diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-07-17 12:04:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-17 12:04:07 +0200 |
commit | 1c69b4e72b3212e3ce989a8675db08ac51b7f79d (patch) | |
tree | 3714c4ea91a3e68826e5ddbb73f71daa93105aec /container-core/src/main/java/com/yahoo/osgi | |
parent | 174910488e7793d9962775c0325764ed265ea2ce (diff) |
Revert "Load platform bundles separately 3"
Diffstat (limited to 'container-core/src/main/java/com/yahoo/osgi')
3 files changed, 12 insertions, 11 deletions
diff --git a/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java b/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java index 6a700a65a03..d809c493565 100644 --- a/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java +++ b/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java @@ -12,11 +12,15 @@ import java.util.List; /** * @author Tony Vaagenes - * @author gjoranv */ public class MockOsgi extends NonWorkingOsgiFramework implements Osgi { @Override + public List<Bundle> getInitialBundles() { + return Collections.emptyList(); + } + + @Override public Bundle[] getBundles() { return new Bundle[0]; } diff --git a/container-core/src/main/java/com/yahoo/osgi/Osgi.java b/container-core/src/main/java/com/yahoo/osgi/Osgi.java index 513e7883594..8f0acf41f30 100644 --- a/container-core/src/main/java/com/yahoo/osgi/Osgi.java +++ b/container-core/src/main/java/com/yahoo/osgi/Osgi.java @@ -9,10 +9,11 @@ import java.util.List; /** * @author Tony Vaagenes - * @author gjoranv */ public interface Osgi { + List<Bundle> getInitialBundles(); + Bundle[] getBundles(); /** Returns all bundles that have not been scheduled for uninstall. */ @@ -24,7 +25,4 @@ public interface Osgi { void allowDuplicateBundles(Collection<Bundle> bundles); - default boolean hasFelixFramework() { - return false; - } } diff --git a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java index b34442d50a9..ed93d15c975 100644 --- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java +++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java @@ -16,7 +16,6 @@ import java.util.logging.Logger; /** * @author Tony Vaagenes * @author bratseth - * @author gjoranv */ public class OsgiImpl implements Osgi { private static final Logger log = Logger.getLogger(OsgiImpl.class.getName()); @@ -43,6 +42,11 @@ public class OsgiImpl implements Osgi { } @Override + public List<Bundle> getInitialBundles() { + return initialBundles; + } + + @Override public Bundle[] getBundles() { List<Bundle> bundles = jdiscOsgi.bundles(); return bundles.toArray(new Bundle[bundles.size()]); @@ -151,11 +155,6 @@ public class OsgiImpl implements Osgi { jdiscOsgi.allowDuplicateBundles(bundles); } - @Override - public boolean hasFelixFramework() { - return jdiscOsgi.isFelixFramework(); - } - private static Bundle firstNonFrameworkBundle(List<Bundle> bundles) { for (Bundle b : bundles) { if (! (b instanceof Framework)) |