From 7169d752f5444e7d94ea6ec0bdeae65cdc693427 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Wed, 19 Dec 2018 15:50:30 +0100
Subject: Remove deprecated methods

---
 .../src/main/java/com/yahoo/container/Container.java   | 18 ------------------
 .../yahoo/container/jdisc/ConfiguredApplication.java   |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/container-core/src/main/java/com/yahoo/container/Container.java b/container-core/src/main/java/com/yahoo/container/Container.java
index e84c8b340a4..031d4a26d05 100755
--- a/container-core/src/main/java/com/yahoo/container/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/Container.java
@@ -3,13 +3,11 @@ package com.yahoo.container;
 
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.component.provider.ComponentRegistry;
-import com.yahoo.container.core.config.BundleLoader;
 import com.yahoo.filedistribution.fileacquirer.FileAcquirer;
 import com.yahoo.filedistribution.fileacquirer.FileAcquirerFactory;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.service.ClientProvider;
 import com.yahoo.jdisc.service.ServerProvider;
-import com.yahoo.osgi.Osgi;
 import com.yahoo.vespa.config.ConfigTransformer;
 import com.yahoo.vespa.config.UrlDownloader;
 
@@ -34,8 +32,6 @@ public class Container {
     private volatile FileAcquirer fileAcquirer;
     private volatile UrlDownloader urlDownloader;
 
-    private volatile BundleLoader bundleLoader;
-
     private static Logger logger = Logger.getLogger(Container.class.getName());
 
     // TODO: Make this final again.
@@ -43,12 +39,6 @@ public class Container {
 
     public static Container get() { return instance; }
 
-    /** @deprecated do not use */
-    @Deprecated // TODO: Remove
-    public void setOsgi(Osgi osgi) {
-        bundleLoader = new BundleLoader(osgi);
-    }
-
     public void shutdown() {
         if (fileAcquirer != null)
             fileAcquirer.shutdown();
@@ -61,14 +51,6 @@ public class Container {
         return fileAcquirer;
     }
 
-    /** @deprecated do not use */
-    @Deprecated // TODO: Remove
-    public BundleLoader getBundleLoader() {
-        if (bundleLoader == null)
-            bundleLoader = new BundleLoader(null);
-        return bundleLoader;
-    }
-
     /**
      * Hack. For internal use only, will be removed later
      *
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index 57b8e61a339..eae121604e4 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -39,7 +39,6 @@ import com.yahoo.jrt.slobrok.api.SlobrokList;
 import com.yahoo.log.LogLevel;
 import com.yahoo.log.LogSetup;
 import com.yahoo.net.HostName;
-import com.yahoo.osgi.OsgiImpl;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.yolean.Exceptions;
 
@@ -115,7 +114,6 @@ public final class ConfiguredApplication implements Application {
 
     }
 
-    @SuppressWarnings("deprecation") // TODO: Remove when the Container line below is removed
     @Inject
     public ConfiguredApplication(ContainerActivator activator,
                                  OsgiFramework osgiFramework,
@@ -127,7 +125,6 @@ public final class ConfiguredApplication implements Application {
         this.subscriberFactory = subscriberFactory;
         this.configId = System.getProperty("config.id");
         this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext()));
-        Container.get().setOsgi(new OsgiImpl(osgiFramework)); // TODO: Remove, not necessary
 
         applicationWithLegacySetup = new ContainerDiscApplication(configId);
     }
-- 
cgit v1.2.3