Reflecting PR reviews

apache · Sep 29, 2024 · bd701ac · bd701ac
1 parent 0f394e3
commit bd701ac
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -142,8 +142,6 @@ public class ZeppelinServer implements AutoCloseable {
   private final Server jettyWebServer;
   private final ServiceLocator sharedServiceLocator;
   private final ConfigStorage storage;
-  private final String classicUiWebAppContextPath;
-  private final String newUiWebAppContextPath;
 
   public ZeppelinServer(ZeppelinConfiguration zConf) throws IOException {
     this(zConf, DEFAULT_SERVICE_LOCATOR_NAME);
@@ -160,13 +158,7 @@ public ZeppelinServer(ZeppelinConfiguration zConf, String serviceLocatorName) th
     jettyWebServer = setupJettyServer();
     sharedServiceLocator = ServiceLocatorFactory.getInstance().create(serviceLocatorName);
     storage = ConfigStorage.createConfigStorage(zConf);
-    if (isNewUiDefault(zConf)) {
-      classicUiWebAppContextPath = NON_DEFAULT_CLASSIC_UI_WEB_APP_CONTEXT_PATH;
-      newUiWebAppContextPath = zConf.getServerContextPath();
-    } else {
-      classicUiWebAppContextPath = zConf.getServerContextPath();
-      newUiWebAppContextPath = NON_DEFAULT_NEW_UI_WEB_APP_CONTEXT_PATH;
-    }
+
   }
 
   public void startZeppelin() {
@@ -236,6 +228,15 @@ protected void configure() {
         });
 
     // Multiple Web UI
+    String classicUiWebAppContextPath;
+    String newUiWebAppContextPath;
+    if (isNewUiDefault(zConf)) {
+      classicUiWebAppContextPath = NON_DEFAULT_CLASSIC_UI_WEB_APP_CONTEXT_PATH;
+      newUiWebAppContextPath = zConf.getServerContextPath();
+    } else {
+      classicUiWebAppContextPath = zConf.getServerContextPath();
+      newUiWebAppContextPath = NON_DEFAULT_NEW_UI_WEB_APP_CONTEXT_PATH;
+    }
     final WebAppContext newUiWebApp = setupWebAppContext(contexts, zConf, zConf.getString(ConfVars.ZEPPELIN_ANGULAR_WAR),
         newUiWebAppContextPath);
     final WebAppContext classicUiWebApp = setupWebAppContext(contexts, zConf, zConf.getString(ConfVars.ZEPPELIN_WAR),
@@ -345,7 +346,6 @@ private void initJMX() {
       }
     }
   }
-
   private void initMetrics() {
     if (zConf.isJMXEnabled()) {
       Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM));