diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-03 18:14:06 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-12-03 18:14:06 -0800 |
commit | 230233bbc4c92ffddfe9cf1d7b40af7e8f98b1e1 (patch) | |
tree | a49a94d149c0c8d9130b9ba58e238c3d1db16cf1 /container-disc | |
parent | 97f154211d3784bbe3467f18e6475c2c548693eb (diff) |
Less use of Container
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 19 |
1 files changed, 10 insertions, 9 deletions
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) { |