Regenerate language service API (#1824)

Author: jmuk

packages/google-cloud-language/src/index.js

@@ -64,7 +64,7 @@ function Language(options) {
   }
 
   this.api = {
-    Language: v1(options).languageServiceApi(options)
+    Language: v1(options).languageServiceClient(options)
   };
 }
 

packages/google-cloud-language/src/v1/index.js

@@ -15,7 +15,7 @@
  */
 'use strict';
 
-var languageServiceApi = require('./language_service_api');
+var languageServiceClient = require('./language_service_client');
 var extend = require('extend');
 var gax = require('google-gax');
 
@@ -24,9 +24,9 @@ function v1(options) {
     scopes: v1.ALL_SCOPES
   }, options);
   var gaxGrpc = gax.grpc(options);
-  return languageServiceApi(gaxGrpc);
+  return languageServiceClient(gaxGrpc);
 }
 
-v1.SERVICE_ADDRESS = languageServiceApi.SERVICE_ADDRESS;
-v1.ALL_SCOPES = languageServiceApi.ALL_SCOPES;
+v1.SERVICE_ADDRESS = languageServiceClient.SERVICE_ADDRESS;
+v1.ALL_SCOPES = languageServiceClient.ALL_SCOPES;
 module.exports = v1;

…-language/src/v1/language_service_api.js …nguage/src/v1/language_service_client.jspackages/google-cloud-language/src/v1/language_service_api.js renamed to packages/google-cloud-language/src/v1/language_service_client.js packages/google-cloud-language/src/v1/language_service_api.js renamed to packages/google-cloud-language/src/v1/language_service_client.js

@@ -51,17 +51,17 @@ var ALL_SCOPES = [
  *
  * This will be created through a builder function which can be obtained by the module.
  * See the following example of how to initialize the module and how to access to the builder.
- * @see {@link languageServiceApi}
+ * @see {@link languageServiceClient}
  *
  * @example
  * var languageV1 = require('@google-cloud/language').v1({
  *   // optional auth parameters.
  * });
- * var api = languageV1.languageServiceApi();
+ * var client = languageV1.languageServiceClient();
  *
  * @class
  */
-function LanguageServiceApi(gaxGrpc, grpcClients, opts) {
+function LanguageServiceClient(gaxGrpc, grpcClients, opts) {
   opts = opts || {};
   var servicePath = opts.servicePath || SERVICE_ADDRESS;
   var port = opts.port || DEFAULT_SERVICE_PORT;
@@ -126,27 +126,30 @@ function LanguageServiceApi(gaxGrpc, grpcClients, opts) {
  *   The function which will be called with the result of the API call.
  *
  *   The second parameter to the callback is an object representing [AnalyzeSentimentResponse]{@link AnalyzeSentimentResponse}.
- * @returns {Promise} - The promise which resolves to the response object.
+ * @return {Promise} - The promise which resolves to an array.
+ *   The first element of the array is an object representing [AnalyzeSentimentResponse]{@link AnalyzeSentimentResponse}.
  *   The promise has a method named "cancel" which cancels the ongoing API call.
  *
  * @example
  *
- * var api = languageV1.languageServiceApi();
+ * var client = languageV1.languageServiceClient();
  * var document = {};
- * api.analyzeSentiment({document: document}).then(function(response) {
+ * client.analyzeSentiment({document: document}).then(function(responses) {
+ *     var response = responses[0];
  *     // doThingsWith(response)
  * }).catch(function(err) {
  *     console.error(err);
  * });
  */
-LanguageServiceApi.prototype.analyzeSentiment = function(request, options, callback) {
+LanguageServiceClient.prototype.analyzeSentiment = function(request, options, callback) {
   if (options instanceof Function && callback === undefined) {
     callback = options;
     options = {};
   }
   if (options === undefined) {
     options = {};
   }
+
   return this._analyzeSentiment(request, options, callback);
 };
 
@@ -171,32 +174,35 @@ LanguageServiceApi.prototype.analyzeSentiment = function(request, options, callb
  *   The function which will be called with the result of the API call.
  *
  *   The second parameter to the callback is an object representing [AnalyzeEntitiesResponse]{@link AnalyzeEntitiesResponse}.
- * @returns {Promise} - The promise which resolves to the response object.
+ * @return {Promise} - The promise which resolves to an array.
+ *   The first element of the array is an object representing [AnalyzeEntitiesResponse]{@link AnalyzeEntitiesResponse}.
  *   The promise has a method named "cancel" which cancels the ongoing API call.
  *
  * @example
  *
- * var api = languageV1.languageServiceApi();
+ * var client = languageV1.languageServiceClient();
  * var document = {};
- * var encodingType = EncodingType.NONE;
+ * var encodingType = languageV1.EncodingType.NONE;
  * var request = {
  *     document: document,
  *     encodingType: encodingType
  * };
- * api.analyzeEntities(request).then(function(response) {
+ * client.analyzeEntities(request).then(function(responses) {
+ *     var response = responses[0];
  *     // doThingsWith(response)
  * }).catch(function(err) {
  *     console.error(err);
  * });
  */
-LanguageServiceApi.prototype.analyzeEntities = function(request, options, callback) {
+LanguageServiceClient.prototype.analyzeEntities = function(request, options, callback) {
   if (options instanceof Function && callback === undefined) {
     callback = options;
     options = {};
   }
   if (options === undefined) {
     options = {};
   }
+
   return this._analyzeEntities(request, options, callback);
 };
 
@@ -222,32 +228,35 @@ LanguageServiceApi.prototype.analyzeEntities = function(request, options, callba
  *   The function which will be called with the result of the API call.
  *
  *   The second parameter to the callback is an object representing [AnalyzeSyntaxResponse]{@link AnalyzeSyntaxResponse}.
- * @returns {Promise} - The promise which resolves to the response object.
+ * @return {Promise} - The promise which resolves to an array.
+ *   The first element of the array is an object representing [AnalyzeSyntaxResponse]{@link AnalyzeSyntaxResponse}.
  *   The promise has a method named "cancel" which cancels the ongoing API call.
  *
  * @example
  *
- * var api = languageV1.languageServiceApi();
+ * var client = languageV1.languageServiceClient();
  * var document = {};
- * var encodingType = EncodingType.NONE;
+ * var encodingType = languageV1.EncodingType.NONE;
  * var request = {
  *     document: document,
  *     encodingType: encodingType
  * };
- * api.analyzeSyntax(request).then(function(response) {
+ * client.analyzeSyntax(request).then(function(responses) {
+ *     var response = responses[0];
  *     // doThingsWith(response)
  * }).catch(function(err) {
  *     console.error(err);
  * });
  */
-LanguageServiceApi.prototype.analyzeSyntax = function(request, options, callback) {
+LanguageServiceClient.prototype.analyzeSyntax = function(request, options, callback) {
   if (options instanceof Function && callback === undefined) {
     callback = options;
     options = {};
   }
   if (options === undefined) {
     options = {};
   }
+
   return this._analyzeSyntax(request, options, callback);
 };
 
@@ -276,40 +285,43 @@ LanguageServiceApi.prototype.analyzeSyntax = function(request, options, callback
  *   The function which will be called with the result of the API call.
  *
  *   The second parameter to the callback is an object representing [AnnotateTextResponse]{@link AnnotateTextResponse}.
- * @returns {Promise} - The promise which resolves to the response object.
+ * @return {Promise} - The promise which resolves to an array.
+ *   The first element of the array is an object representing [AnnotateTextResponse]{@link AnnotateTextResponse}.
  *   The promise has a method named "cancel" which cancels the ongoing API call.
  *
  * @example
  *
- * var api = languageV1.languageServiceApi();
+ * var client = languageV1.languageServiceClient();
  * var document = {};
  * var features = {};
- * var encodingType = EncodingType.NONE;
+ * var encodingType = languageV1.EncodingType.NONE;
  * var request = {
  *     document: document,
  *     features: features,
  *     encodingType: encodingType
  * };
- * api.annotateText(request).then(function(response) {
+ * client.annotateText(request).then(function(responses) {
+ *     var response = responses[0];
  *     // doThingsWith(response)
  * }).catch(function(err) {
  *     console.error(err);
  * });
  */
-LanguageServiceApi.prototype.annotateText = function(request, options, callback) {
+LanguageServiceClient.prototype.annotateText = function(request, options, callback) {
   if (options instanceof Function && callback === undefined) {
     callback = options;
     options = {};
   }
   if (options === undefined) {
     options = {};
   }
+
   return this._annotateText(request, options, callback);
 };
 
-function LanguageServiceApiBuilder(gaxGrpc) {
-  if (!(this instanceof LanguageServiceApiBuilder)) {
-    return new LanguageServiceApiBuilder(gaxGrpc);
+function LanguageServiceClientBuilder(gaxGrpc) {
+  if (!(this instanceof LanguageServiceClientBuilder)) {
+    return new LanguageServiceClientBuilder(gaxGrpc);
   }
 
   var languageServiceClient = gaxGrpc.load([{
@@ -323,7 +335,7 @@ function LanguageServiceApiBuilder(gaxGrpc) {
   };
 
   /**
-   * Build a new instance of {@link LanguageServiceApi}.
+   * Build a new instance of {@link LanguageServiceClient}.
    *
    * @param {Object=} opts - The optional parameters.
    * @param {String=} opts.servicePath
@@ -340,11 +352,11 @@ function LanguageServiceApiBuilder(gaxGrpc) {
    * @param {String=} opts.appVersion
    *   The version of the calling service.
    */
-  this.languageServiceApi = function(opts) {
-    return new LanguageServiceApi(gaxGrpc, grpcClients, opts);
+  this.languageServiceClient = function(opts) {
+    return new LanguageServiceClient(gaxGrpc, grpcClients, opts);
   };
-  extend(this.languageServiceApi, LanguageServiceApi);
+  extend(this.languageServiceClient, LanguageServiceClient);
 }
-module.exports = LanguageServiceApiBuilder;
+module.exports = LanguageServiceClientBuilder;
 module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
 module.exports.ALL_SCOPES = ALL_SCOPES;

packages/google-cloud-language/test/index.js

@@ -44,7 +44,7 @@ function fakeV1() {
   }
 
   return {
-    languageServiceApi: util.noop
+    languageServiceClient: util.noop
   };
 }
 
@@ -106,7 +106,7 @@ describe('Language', function() {
         assert.strictEqual(options, OPTIONS);
 
         return {
-          languageServiceApi: function(options) {
+          languageServiceClient: function(options) {
             assert.strictEqual(options, OPTIONS);
             return expectedLanguageService;
           }