From 376d9cbab6134843a42811eae910271139219d6f Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 28 Oct 2019 13:41:34 +0100 Subject: Remove unnecessary refreshPackages methods --- container-core/src/main/java/com/yahoo/osgi/MockOsgi.java | 8 -------- container-core/src/main/java/com/yahoo/osgi/Osgi.java | 6 ------ container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java | 14 -------------- .../java/com/yahoo/jdisc/application/OsgiFramework.java | 2 ++ .../src/main/java/com/yahoo/jdisc/core/FelixFramework.java | 3 +++ 5 files changed, 5 insertions(+), 28 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 5cfcde7a8a3..d809c493565 100644 --- a/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java +++ b/container-core/src/main/java/com/yahoo/osgi/MockOsgi.java @@ -40,12 +40,4 @@ public class MockOsgi extends NonWorkingOsgiFramework implements Osgi { return Collections.emptyList(); } - @Override - public void uninstall(Bundle bundle) { - } - - @Override - public void refreshPackages() { - } - } 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 fa7e88dbfe6..8f0acf41f30 100644 --- a/container-core/src/main/java/com/yahoo/osgi/Osgi.java +++ b/container-core/src/main/java/com/yahoo/osgi/Osgi.java @@ -25,10 +25,4 @@ public interface Osgi { void allowDuplicateBundles(Collection bundles); - // TODO: remove - void uninstall(Bundle bundle); - - // TODO: remove - void refreshPackages(); - } 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 9a74aeda8cf..dcea9e55e63 100644 --- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java +++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java @@ -159,20 +159,6 @@ public class OsgiImpl implements Osgi { jdiscOsgi.allowDuplicateBundles(bundles); } - @Override - public void uninstall(Bundle bundle) { - try { - bundle.uninstall(); - } catch (BundleException e) { - throw new RuntimeException(e); - } - } - - @Override - public void refreshPackages() { - jdiscOsgi.refreshPackages(); - } - private static Bundle firstNonFrameworkBundle(List bundles) { for (Bundle b : bundles) { if (! (b instanceof Framework)) 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 4dc59accee4..b1aceb81bc6 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 @@ -60,6 +60,8 @@ 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(); 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 8b226a0fe3e..eb829d3b273 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,6 +117,9 @@ 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); -- cgit v1.2.3