From 6091a2d01ec7af29b4df34c6a6609913f299d11b Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 29 Aug 2019 12:03:58 +0200 Subject: Remove unused code --- .../container/jdisc/ConfiguredApplication.java | 25 +++++------------- .../container/jdisc/ContainerDiscApplication.java | 30 ---------------------- 2 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 container-disc/src/main/java/com/yahoo/container/jdisc/ContainerDiscApplication.java (limited to 'container-disc/src') 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 c57149748e7..da4709a9ba3 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 @@ -76,7 +76,6 @@ public final class ConfiguredApplication implements Application { private final SubscriberFactory subscriberFactory; private final ContainerActivator activator; private final String configId; - private final ContainerDiscApplication applicationWithLegacySetup; private final OsgiFramework osgiFramework; private final com.yahoo.jdisc.Timer timerSingleton; @@ -118,15 +117,13 @@ public final class ConfiguredApplication implements Application { public ConfiguredApplication(ContainerActivator activator, OsgiFramework osgiFramework, com.yahoo.jdisc.Timer timer, - SubscriberFactory subscriberFactory) throws ListenFailedException { + SubscriberFactory subscriberFactory) { this.activator = activator; this.osgiFramework = osgiFramework; this.timerSingleton = timer; this.subscriberFactory = subscriberFactory; this.configId = System.getProperty("config.id"); this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext())); - - applicationWithLegacySetup = new ContainerDiscApplication(configId); } @Override @@ -139,7 +136,7 @@ public final class ConfiguredApplication implements Application { ContainerBuilder builder = createBuilderWithGuiceBindings(); configurer = createConfigurer(builder.guiceModules().activate()); - intitializeAndActivateContainer(builder); + initializeAndActivateContainer(builder); startReconfigurerThread(); portWatcher = new Thread(this::watchPortChange); portWatcher.setDaemon(true); @@ -183,7 +180,6 @@ public final class ConfiguredApplication implements Application { supervisor.transport().shutdown().join(); } - @SuppressWarnings("deprecation") private static void hackToInitializeServer(QrConfig config) { try { Container.get().setupFileAcquirer(config.filedistributor()); @@ -224,7 +220,7 @@ public final class ConfiguredApplication implements Application { } } - private void intitializeAndActivateContainer(ContainerBuilder builder) { + private void initializeAndActivateContainer(ContainerBuilder builder) { addHandlerBindings(builder, Container.get().getRequestHandlerRegistry(), configurer.getComponent(ApplicationContext.class).discBindingsConfig); installServerProviders(builder); @@ -252,7 +248,7 @@ public final class ConfiguredApplication implements Application { // Block until new config arrives, and it should be applied configurer.getNewComponentGraph(builder.guiceModules().activate(), qrConfig.restartOnDeploy()); - intitializeAndActivateContainer(builder); + initializeAndActivateContainer(builder); } catch (ConfigInterruptedException e) { break; } catch (Exception | LinkageError e) { // LinkageError: OSGi problems @@ -325,7 +321,6 @@ public final class ConfiguredApplication implements Application { bind(FilterChainRepository.class).toInstance(defaultFilterChainRepository); } }); - modules.install(applicationWithLegacySetup.getMbusBindings()); } @Override @@ -376,15 +371,9 @@ public final class ConfiguredApplication implements Application { shutdownDeadlineExecutor = new ScheduledThreadPoolExecutor(1, new DaemonThreadFactory("Shutdown deadline timer")); shutdownDeadlineExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); long delayMillis = 50 * 1000; - shutdownDeadlineExecutor.schedule(new Runnable() { - - @Override - public void run() { - com.yahoo.protect.Process.logAndDie( - "Timed out waiting for application shutdown. Please check that all your request handlers " + - "drain their request content channels.", true); - } - }, delayMillis, TimeUnit.MILLISECONDS); + shutdownDeadlineExecutor.schedule(() -> com.yahoo.protect.Process.logAndDie( + "Timed out waiting for application shutdown. Please check that all your request handlers " + + "drain their request content channels.", true), delayMillis, TimeUnit.MILLISECONDS); } private static void addHandlerBindings(ContainerBuilder builder, diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerDiscApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerDiscApplication.java deleted file mode 100644 index 0d2224f8c1c..00000000000 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerDiscApplication.java +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.container.jdisc; - -import com.google.inject.AbstractModule; -import com.google.inject.Inject; -import com.yahoo.container.jdisc.messagebus.SessionCache; -import com.yahoo.jrt.ListenFailedException; - -/** - * TODO: The contents of this class can probably be moved into ConfiguredApplication - */ -public class ContainerDiscApplication { - - private SessionCache sessionCache; - - @Inject - public ContainerDiscApplication(String configId) throws ListenFailedException { - sessionCache = new SessionCache(configId); - } - - AbstractModule getMbusBindings() { - return new AbstractModule() { - @Override - protected void configure() { - bind(SessionCache.class).toInstance(sessionCache); - } - }; - } - -} -- cgit v1.2.3 From 0866838bf22c7eb751a142712fd374dcf89e5dc9 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 29 Aug 2019 13:17:31 +0200 Subject: Need SessionCache --- .../main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'container-disc/src') 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 da4709a9ba3..aefdf49c0cb 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 @@ -17,6 +17,7 @@ import com.yahoo.container.di.config.Subscriber; import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.container.http.filter.FilterChainRepository; import com.yahoo.container.jdisc.component.Deconstructor; +import com.yahoo.container.jdisc.messagebus.SessionCache; import com.yahoo.container.jdisc.metric.DisableGuiceMetric; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.application.Application; @@ -78,6 +79,7 @@ public final class ConfiguredApplication implements Application { private final String configId; private final OsgiFramework osgiFramework; private final com.yahoo.jdisc.Timer timerSingleton; + private final SessionCache sessionCache; //TODO: FilterChainRepository should instead always be set up in the model. private final FilterChainRepository defaultFilterChainRepository = @@ -123,6 +125,7 @@ public final class ConfiguredApplication implements Application { this.timerSingleton = timer; this.subscriberFactory = subscriberFactory; this.configId = System.getProperty("config.id"); + this.sessionCache = new SessionCache(configId); this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext())); } @@ -319,6 +322,7 @@ public final class ConfiguredApplication implements Application { bind(OsgiFramework.class).toInstance(restrictedOsgiFramework); bind(com.yahoo.jdisc.Timer.class).toInstance(timerSingleton); bind(FilterChainRepository.class).toInstance(defaultFilterChainRepository); + bind(SessionCache.class).toInstance(sessionCache); // Needed by e.g. FeedHandler } }); } -- cgit v1.2.3