Merge branch 'v4.0.0-branch' into add-promise-support

dpopp07 · dpopp07 · commit a9228756d5dc · 2019-02-11T10:08:46.000-06:00
diff --git a/assistant/v1.ts b/assistant/v1.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -3256,7 +3256,7 @@ namespace AssistantV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/assistant/v2.ts b/assistant/v2.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -273,7 +273,7 @@ namespace AssistantV2 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/compare-comply/v1.ts b/compare-comply/v1.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -915,7 +915,7 @@ namespace CompareComplyV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/discovery/v1-generated.ts b/discovery/v1-generated.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -4199,7 +4199,7 @@ namespace DiscoveryV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/index.ts b/index.ts
@@ -34,7 +34,7 @@ export import NaturalLanguageClassifierV1 = require('./natural-language-classifi
 
 export import NaturalLanguageUnderstandingV1 = require('./natural-language-understanding/v1-generated');
 
-export import PersonalityInsightsV3 = require('./personality-insights/v3');
+export import PersonalityInsightsV3 = require('./personality-insights/v3-generated');
 
 export import SpeechToTextV1 = require('./speech-to-text/v1');
 
diff --git a/language-translator/v3.ts b/language-translator/v3.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -494,7 +494,7 @@ namespace LanguageTranslatorV3 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/lib/base_service.ts b/lib/base_service.ts
@@ -18,7 +18,6 @@
 // `buffer-from` uses the new api when possible but falls back to the old one otherwise
 import bufferFrom = require('buffer-from');
 import extend = require('extend');
-import request = require('request');
 import semver = require('semver');
 import vcapServices = require('vcap_services');
 import { IamTokenManagerV1 } from '../iam-token-manager/v1';
@@ -50,7 +49,6 @@ export interface UserOptions {
 export interface BaseServiceOptions extends UserOptions {
   headers: HeaderOptions;
   url: string;
-  jar?: request.CookieJar;
   qs: any;
   rejectUnauthorized?: boolean;
 }
@@ -289,7 +287,6 @@ export class BaseService {
       _options = extend(_options, options);
       return _options;
     }
-    _options.jar = request.jar();
     // Get credentials from environment properties or Bluemix,
     // but prefer credentials provided programatically
     _options = extend(
diff --git a/natural-language-classifier/v1-generated.ts b/natural-language-classifier/v1-generated.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -418,7 +418,7 @@ namespace NaturalLanguageClassifierV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/natural-language-understanding/v1-generated.ts b/natural-language-understanding/v1-generated.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -276,7 +276,7 @@ namespace NaturalLanguageUnderstandingV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -78,7 +78,6 @@
     "@types/file-type": "~5.2.1",
     "@types/is-stream": "~1.1.0",
     "@types/node": "~10.3.5",
-    "@types/request": "~2.47.1",
     "async": "~2.6.1",
     "axios": "^0.18.0",
     "buffer-from": "~1.1.0",
diff --git a/personality-insights/v3-generated.ts b/personality-insights/v3-generated.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -319,7 +319,7 @@ namespace PersonalityInsightsV3 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/speech-to-text/v1-generated.ts b/speech-to-text/v1-generated.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -3417,7 +3417,7 @@ namespace SpeechToTextV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/text-to-speech/v1-generated.ts b/text-to-speech/v1-generated.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -1155,7 +1155,7 @@ namespace TextToSpeechV1 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/tone-analyzer/v3-generated.ts b/tone-analyzer/v3-generated.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -256,7 +256,7 @@ namespace ToneAnalyzerV3 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
diff --git a/tsconfig.json b/tsconfig.json
@@ -41,7 +41,7 @@
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    "types": ["node", "request", "extend", "is-stream"]    /* Type declaration files to be included in compilation. */
+    "types": ["node", "extend", "is-stream"]    /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
diff --git a/visual-recognition/v3-generated.ts b/visual-recognition/v3-generated.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
+import { AxiosResponse } from 'axios';
 import * as extend from 'extend';
-import { RequestResponse } from 'request';
 import { BaseService } from '../lib/base_service';
 import { getDefaultHeaders } from '../lib/common';
 import { getMissingParams } from '../lib/helper';
@@ -741,7 +741,7 @@ namespace VisualRecognitionV3 {
   }
 
   /** The callback for a service request. */
-  export type Callback<T> = (error: any, body?: T, response?: RequestResponse) => void;
+  export type Callback<T> = (error: any, body?: T, response?: AxiosResponse<T>) => void;
 
   /** The body of a service request that returns no response data. */
   export interface Empty { }
