Move static method to where it's used.

+ Add TODO to clean up the unnecessary ContainerDiscApplication.

2 files changed, 13 insertions, 23 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 bf696771b20..d8a1a26f850 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
@@ -11,6 +11,7 @@ import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.subscription.ConfigInterruptedException;
 import com.yahoo.container.Container;
 import com.yahoo.container.QrConfig;
+import com.yahoo.container.Server;
 import com.yahoo.container.core.ChainsConfig;
 import com.yahoo.container.core.config.HandlersConfigurerDi;
 import com.yahoo.container.di.config.Subscriber;
@@ -121,7 +122,7 @@ public final class ConfiguredApplication implements Application {
     @Override
     public void start() {
         qrConfig = getConfig(QrConfig.class);
-        ContainerDiscApplication.hackToInitializeServer(qrConfig);
+        hackToInitializeServer(qrConfig);
 
         ContainerBuilder builder = createBuilderWithGuiceBindings();
         configureComponents(builder.guiceModules().activate());
@@ -133,6 +134,16 @@ public final class ConfiguredApplication implements Application {
         portWatcher.start();
     }
 
+
+    private static void hackToInitializeServer(QrConfig config) {
+        try {
+            Server.get().initialize(config);
+        } catch (Exception e) {
+            log.log(LogLevel.ERROR, "Caught exception when initializing server. Exiting.", e);
+            Runtime.getRuntime().halt(1);
+        }
+    }
+
     private <T extends ConfigInstance> T getConfig(Class<T> configClass) {
         Subscriber subscriber = subscriberFactory.getSubscriber(
                 Collections.singleton(new ConfigKey<>(configClass, configId)));
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
index f6ffb0c2ff6..0d2224f8c1c 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerDiscApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ContainerDiscApplication.java
@@ -1,30 +1,18 @@
 // 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.QrConfig;
-import com.yahoo.container.Server;
 import com.yahoo.container.jdisc.messagebus.SessionCache;
 import com.yahoo.jrt.ListenFailedException;
-import com.yahoo.log.LogLevel;
-
-import java.util.logging.Logger;
-
 
 /**
- * The application which sets up the jDisc container
- *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * TODO: The contents of this class can probably be moved into ConfiguredApplication
  */
 public class ContainerDiscApplication {
 
-    private static final Logger log = Logger.getLogger(ContainerDiscApplication.class.getName());
-
     private SessionCache sessionCache;
 
-
     @Inject
     public ContainerDiscApplication(String configId) throws ListenFailedException {
         sessionCache = new SessionCache(configId);
@@ -39,13 +27,4 @@ public class ContainerDiscApplication {
         };
     }
 
-    public static void hackToInitializeServer(QrConfig config) {
-        try {
-            Server.get().initialize(config);
-        } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Caught exception when initializing server. Exiting.", e);
-            Runtime.getRuntime().halt(1);
-        }
-    }
-
 }