THRIFT-2398:Improve Node Server Library
CLIENT: node
Patch: Randy Abernethy
Update node hello web example and line ending clean up.
diff --git a/lib/js/test/server_http.js b/lib/js/test/server_http.js
index ce09afc..e195e80 100644
--- a/lib/js/test/server_http.js
+++ b/lib/js/test/server_http.js
@@ -1,53 +1,49 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//This HTTP server is designed to server the test.html browser
-// based JavaScript test page (which must be in the current directory).
-// This server also supplies the Thrift based test service, which depends
-// on the standard ThriftTest.thrift IDL service (which must be compiled
-// for Node and browser based JavaScript in ./gen-nodejs and ./gen-js
-// respectively). The current directory must also include the browser
-// support libraries for test.html (jquery.js, qunit.js and qunit.css
-// in ./build/js/lib).
-
-var thrift = require('../../nodejs/lib/thrift');
-var TBufferedTransport = require('../../nodejs/lib/thrift/transport').TBufferedTransport;
-var TJSONProtocol = require('../../nodejs/lib/thrift/protocol').TJSONProtocol;
-var ThriftTestSvc = require('./gen-nodejs/ThriftTest.js');
-var ThriftTestHandler = require('./test_handler').ThriftTestHandler;
-
-var ThriftTestSvcOpt = {
- transport: TBufferedTransport,
- protocol: TJSONProtocol,
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//This HTTP server is designed to serve the test.html browser
+// based JavaScript test page (which must be in the current directory).
+// This server also supplies the Thrift based test service, which depends
+// on the standard ThriftTest.thrift IDL service (which must be compiled
+// for Node and browser based JavaScript in ./gen-nodejs and ./gen-js
+// respectively).
+
+var thrift = require('../../nodejs/lib/thrift');
+var ThriftTestSvc = require('./gen-nodejs/ThriftTest.js');
+var ThriftTestHandler = require('./test_handler').ThriftTestHandler;
+
+var ThriftTestSvcOpt = {
+ transport: thrift.TBufferedTransport,
+ protocol: thrift.TJSONProtocol,
processor: ThriftTestSvc,
- handler: ThriftTestHandler
-};
-
-var ThriftWebServerOptions = {
+ handler: ThriftTestHandler
+};
+
+var ThriftWebServerOptions = {
files: ".",
- services: {
- "/service": ThriftTestSvcOpt
- }
-};
-
-var server = thrift.createWebServer(ThriftWebServerOptions);
-var port = 8088;
-server.listen(port);
-console.log("Serving files from: " + __dirname);
-console.log("Http/Thrift Server running on port: " + port);
+ services: {
+ "/service": ThriftTestSvcOpt
+ }
+};
+
+var server = thrift.createWebServer(ThriftWebServerOptions);
+var port = 8088;
+server.listen(port);
+console.log("Serving files from: " + __dirname);
+console.log("Http/Thrift Server running on port: " + port);
diff --git a/lib/js/test/server_https.js b/lib/js/test/server_https.js
index 69d7e89..af1745b 100644
--- a/lib/js/test/server_https.js
+++ b/lib/js/test/server_https.js
@@ -1,47 +1,45 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-//This HTTP server is designed to server the test.html browser
-// based JavaScript test page (which must be in the current directory).
-// This server also supplies the Thrift based test service, which depends
-// on the standard ThriftTest.thrift IDL service (which must be compiled
-// for Node and browser based JavaScript in ./gen-nodejs and ./gen-js
-// respectively). The current directory must also include the browser
-// support libraries for test.html (jquery.js, qunit.js and qunit.css
-// in ./build/js/lib).
-
-var fs = require("fs");
-var thrift = require('../../nodejs/lib/thrift');
-var TBufferedTransport = require('../../nodejs/lib/thrift/transport').TBufferedTransport;
-var TJSONProtocol = require('../../nodejs/lib/thrift/protocol').TJSONProtocol;
-var ThriftTestSvc = require('./gen-nodejs/ThriftTest.js');
-var ThriftTestHandler = require('./test_handler').ThriftTestHandler;
-
-//Setup the I/O stack options for the ThriftTest service
-var ThriftTestSvcOpt = {
- transport: TBufferedTransport,
- protocol: TJSONProtocol,
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//This HTTP server is designed to server the test.html browser
+// based JavaScript test page (which must be in the current directory).
+// This server also supplies the Thrift based test service, which depends
+// on the standard ThriftTest.thrift IDL service (which must be compiled
+// for Node and browser based JavaScript in ./gen-nodejs and ./gen-js
+// respectively). The current directory must also include the browser
+// support libraries for test.html (jquery.js, qunit.js and qunit.css
+// in ./build/js/lib).
+
+var fs = require("fs");
+var thrift = require('../../nodejs/lib/thrift');
+var ThriftTestSvc = require('./gen-nodejs/ThriftTest.js');
+var ThriftTestHandler = require('./test_handler').ThriftTestHandler;
+
+//Setup the I/O stack options for the ThriftTest service
+var ThriftTestSvcOpt = {
+ transport: thrift.TBufferedTransport,
+ protocol: thrift.TJSONProtocol,
processor: ThriftTestSvc,
handler: ThriftTestHandler
-};
-
-var ThriftWebServerOptions = {
+};
+
+var ThriftWebServerOptions = {
files: ".",
tls: {
key: fs.readFileSync("../../../test/keys/server.key"),
@@ -50,10 +48,10 @@
services: {
"/service": ThriftTestSvcOpt
}
-};
-
-var server = thrift.createWebServer(ThriftWebServerOptions);
-var port = 8089;
-server.listen(port);
-console.log("Serving files from: " + __dirname);
-console.log("Http/Thrift Server running on port: " + port);
+};
+
+var server = thrift.createWebServer(ThriftWebServerOptions);
+var port = 8089;
+server.listen(port);
+console.log("Serving files from: " + __dirname);
+console.log("Http/Thrift Server running on port: " + port);