Less use of Container

7 files changed, 20 insertions, 18 deletions

diff --git a/application/src/main/java/com/yahoo/application/container/JDisc.java b/application/src/main/java/com/yahoo/application/container/JDisc.java
index 5554ae6a159..45c7b66ac5e 100644
--- a/application/src/main/java/com/yahoo/application/container/JDisc.java
+++ b/application/src/main/java/com/yahoo/application/container/JDisc.java
@@ -37,6 +37,8 @@ public final class JDisc implements AutoCloseable {
     private final ClassLoaderOsgiFramework osgiFramework = new ClassLoaderOsgiFramework();
 
     private final TestDriver testDriver;
+
+    @SuppressWarnings("unused")
     private final StandaloneContainerApplication application;
 
     private final Container container = Container.get();  // TODO: This is indeed temporary ... *3 years later* Indeed.
@@ -136,8 +138,7 @@ public final class JDisc implements AutoCloseable {
                 .getComponent(ProcessingHandler.class.getName());
 
         if (processingHandler == null) {
-            throw new UnsupportedOperationException("This JDisc does not have 'processing' " +
-                    "configured.");
+            throw new UnsupportedOperationException("This JDisc does not have 'processing' configured.");
         }
 
         return new Processing(processingHandler);
@@ -156,8 +157,7 @@ public final class JDisc implements AutoCloseable {
                 .getComponent(DocumentProcessingHandler.class.getName());
 
         if (docprocHandler == null) {
-            throw new UnsupportedOperationException("This JDisc does not have 'document-processing' " +
-                    "configured.");
+            throw new UnsupportedOperationException("This JDisc does not have 'document-processing' configured.");
         }
         return new DocumentProcessing(docprocHandler);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
index 5373d603227..d9cb43c1850 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/AccessLogComponent.java
@@ -13,7 +13,6 @@ import static com.yahoo.container.core.AccessLogConfig.FileHandler.RotateScheme;
 /**
  * @author Tony Vaagenes
  * @author gjoranv
- * @since 5.1.4
  */
 public final class AccessLogComponent extends SimpleComponent implements AccessLogConfig.Producer {
 
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 c83dd2199ea..bb4b57e8983 100755
--- a/container-core/src/main/java/com/yahoo/container/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/Container.java
@@ -41,6 +41,8 @@ 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);
     }
@@ -55,6 +57,8 @@ public class Container {
         return fileAcquirer;
     }
 
+    /** @deprecated do not use */
+    @Deprecated // TODO: Remove
     public BundleLoader getBundleLoader() {
         if (bundleLoader == null)
             bundleLoader = new BundleLoader(null);
@@ -65,7 +69,7 @@ public class Container {
      * Hack. For internal use only, will be removed later
      *
      * Used by Application to be able to repeatedly set up containers.
-     **/
+     */
     public static void resetInstance() {
         instance = new Container();
     }
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 7f6e7f08e3d..f7a3f49538e 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -83,7 +83,7 @@ public class HandlersConfigurerDi {
                                 OsgiFramework osgiFramework) {
 
         this.vespaContainer = vespaContainer;
-        osgiWrapper = new OsgiWrapper(osgiFramework, vespaContainer.getBundleLoader());
+        osgiWrapper = new OsgiWrapper(osgiFramework, new BundleLoader(new OsgiImpl(osgiFramework)));
 
         container = new Container(subscriberFactory, configId, deconstructor, osgiWrapper);
         getNewComponentGraph(discInjector, false);
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index ad99218b860..1c3b9088a95 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -90,7 +90,6 @@ public class HandlersConfigurerTestWrapper {
     public HandlersConfigurerTestWrapper(Container container, String configId) {
         createFiles(configId);
         MockOsgi mockOsgi = new MockOsgi();
-        container.setOsgi(mockOsgi);
         ComponentDeconstructor testDeconstructor = getTestDeconstructor();
         configurer = new HandlersConfigurerDi(
                 new CloudSubscriberFactory(configSources),
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 3af7dcce3e0..f4fae683877 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
@@ -115,6 +115,7 @@ public final class ConfiguredApplication implements Application {
 
     }
 
+    @SuppressWarnings("deprecation") // TODO: Remove when the Container line below is removed
     @Inject
     public ConfiguredApplication(ContainerActivator activator,
                                  OsgiFramework osgiFramework,
@@ -126,7 +127,7 @@ 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));
+        Container.get().setOsgi(new OsgiImpl(osgiFramework)); // TODO: Remove, not necessary
 
         applicationWithLegacySetup = new ContainerDiscApplication(configId);
     }
@@ -140,7 +141,7 @@ public final class ConfiguredApplication implements Application {
         hackToInitializeServer(qrConfig);
 
         ContainerBuilder builder = createBuilderWithGuiceBindings();
-        configureComponents(builder.guiceModules().activate());
+        configurer = createConfigurer(builder.guiceModules().activate());
 
         intitializeAndActivateContainer(builder);
         startReconfigurerThread();
@@ -308,13 +309,13 @@ public final class ConfiguredApplication implements Application {
         startedServers.remove(server);
     }
 
-    private void configureComponents(Injector discInjector) {
-        configurer = new HandlersConfigurerDi(subscriberFactory,
-                                              Container.get(),
-                                              configId,
-                                              new Deconstructor(true),
-                                              discInjector,
-                                              osgiFramework);
+    private HandlersConfigurerDi createConfigurer(Injector discInjector) {
+        return new HandlersConfigurerDi(subscriberFactory,
+                                        Container.get(),
+                                        configId,
+                                        new Deconstructor(true),
+                                        discInjector,
+                                        osgiFramework);
     }
 
     private void setupGuiceBindings(GuiceRepository modules) {
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 6ab5f798d92..85d745d7aaf 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
@@ -68,7 +68,6 @@ public interface OsgiFramework {
      *
      * @return A <tt>BundleContext</tt> for the system bundle, or <tt>null</tt>.
      * @throws SecurityException If the caller does not have the appropriate permissions.
-     * @since 2.0
      */
     BundleContext bundleContext();