Cleanup of Javascript logic and Server code detecting the correct port

sjoerdmulder · sjoerdmulder · commit 7f8bc47686e7 · 2015-07-30T12:24:30.000+02:00
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/AppScriptServlet.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/AppScriptServlet.java
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
@@ -48,6 +48,7 @@
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
+import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -91,7 +92,7 @@ public static void main(String[] args) throws Exception {
      * But the rest of swagger is configured here
      */
     final ServletContextHandler swagger = setupSwaggerContextHandler(conf);
-    
+
     // Notebook server
     final ServletContextHandler notebook = setupNotebookServer(conf);
 
@@ -272,7 +273,7 @@ private static WebAppContext setupWebAppContext(
     }
     // Explicit bind to root
     webApp.addServlet(
-      new ServletHolder(new AppScriptServlet()),
+      new ServletHolder(new DefaultServlet()),
       "/*"
     );
     return webApp;
diff --git a/zeppelin-web/src/components/baseUrl/baseUrl.service.js b/zeppelin-web/src/components/baseUrl/baseUrl.service.js
@@ -15,50 +15,30 @@
 
 angular.module('zeppelinWebApp').service('baseUrlSrv', function() {
 
-  /** Get the current port of the websocket
-  *
-  * When running Zeppelin, the body of this function will be dynamically
-  * overridden with the AppScriptServlet from zeppelin-site.xml config value.
-  *
-  * If the config value is not defined, it defaults to the HTTP port + 1
-  *
-  * In the case of running "grunt serve", this function will appear
-  * as is.
-  */
-  
-  /* @preserve AppScriptServlet - getPort */
   this.getPort = function() {
-    var port = Number(location.port);
-    if (location.protocol !== 'https:' && !port) {
-      port = 80;
-    } else if (location.protocol === 'https:' && !port) {
-      port = 443;
-    } else if (port === 3333 || port === 9000) {
-      port = 8080;
-    }
-    return port;
-  };
-  /* @preserve AppScriptServlet - close */
-
-  this.getWebsocketProtocol = function() {
-    return location.protocol === 'https:' ? 'wss' : 'ws';
-  };
-
-  this.getRestApiBase = function() {
     var port = Number(location.port);
     if (!port) {
       port = 80;
       if (location.protocol === 'https:') {
         port = 443;
       }
     }
-
+    //Exception for when running locally via grunt
     if (port === 3333 || port === 9000) {
       port = 8080;
     }
-    return location.protocol + '//' + location.hostname + ':' + port + skipTrailingSlash(location.pathname) + '/api';
+    return port;
+  };
+
+  this.getWebsocketUrl = function() {
+    var wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+    return wsProtocol + '//' + location.hostname + ':' + this.getPort() + '/ws';
   };
-  
+
+  this.getRestApiBase = function() {
+    return location.protocol + '//' + location.hostname + ':' + this.getPort() + skipTrailingSlash(location.pathname) + '/api';
+  };
+
   var skipTrailingSlash = function(path) {
     return path.replace(/\/$/, '');
   };
diff --git a/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js b/zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
@@ -16,7 +16,7 @@
 angular.module('zeppelinWebApp').factory('websocketEvents', function($rootScope, $websocket, baseUrlSrv) {
   var websocketCalls = {};
 
-  websocketCalls.ws = $websocket(baseUrlSrv.getWebsocketProtocol() + '://' + location.hostname + ':' + baseUrlSrv.getPort() + '/ws');
+  websocketCalls.ws = $websocket(baseUrlSrv.getWebsocketUrl());
 
   websocketCalls.ws.onOpen(function() {
     console.log('Websocket created');
