delete internal http and rest client

Author: bryanmacfarlane

api/ClientApiBases.ts

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import restm = require('./RestClient');
-import httpm = require('./HttpClient');
 import vsom = require('./VsoClient');
 import VsoBaseInterfaces = require('./interfaces/common/VsoBaseInterfaces');
 import serm = require('./Serialization');
@@ -15,11 +13,6 @@ export class ClientApiBase {
     http: hm.HttpClient;
     rest: rm.RestClient;
 
-    // TODO: delete these three after regen
-    httpClient: httpm.HttpCallbackClient;
-    restCallbackClient: restm.RestCallbackClient;
-    restClient: restm.RestClient;
-
     vsoClient: vsom.VsoClient;
 
     constructor(baseUrl: string, handlers: VsoBaseInterfaces.IRequestHandler[], userAgent?: string);
@@ -30,36 +23,12 @@ export class ClientApiBase {
         this.http = new hm.HttpClient(userAgent, handlers);
         this.rest = new rm.RestClient(userAgent, null, handlers);
 
-        // TODO: delete these three after regen
-        this.httpClient = new httpm.HttpCallbackClient(userAgent, handlers);
-        this.restCallbackClient = new restm.RestCallbackClient(this.httpClient);
-        this.restClient = new restm.RestClient(userAgent, handlers);
-
-        this.vsoClient = new vsom.VsoClient(baseUrl, this.restCallbackClient);
-        this.userAgent = userAgent;
-    }
-
-    setUserAgent(userAgent: string) {
+        this.vsoClient = new vsom.VsoClient(baseUrl, this.rest);
         this.userAgent = userAgent;
-        this.httpClient.userAgent = userAgent;
-    }
-    
-    public connect(): Promise<any> {
-        return new Promise((resolve, reject) => {
-            this.restCallbackClient.get(this.vsoClient.resolveUrl('/_apis/connectionData'), "", (err: any, statusCode: number, obj: any) => {
-                if (err) {
-                    err.statusCode = statusCode;
-                    reject(err);
-                }
-                else {
-                    resolve(obj);
-                }
-            }, null);
-        });
     }
 
     public createAcceptHeader(type: string, apiVersion?: string): string {
-        return this.restCallbackClient.createAcceptHeader(type, apiVersion);
+        return type + (apiVersion ? (';api-version=' + apiVersion) : '');
     }
 
     public createRequestOptions(type: string, apiVersion?: string) {

api/FileContainerApi.ts

@@ -11,6 +11,7 @@
 // Licensed under the MIT license.  See LICENSE file in the project root for full license information.
 
 import stream = require("stream");
+import * as restm from 'typed-rest-client/RestClient';
 import VsoBaseInterfaces = require('./interfaces/common/VsoBaseInterfaces');
 import FileContainerApiBase = require("./FileContainerApiBase");
 import FileContainerInterfaces = require("./interfaces/FileContainerInterfaces");
@@ -37,6 +38,7 @@ export class FileContainerApi extends FileContainerApiBase.FileContainerApiBase
         });
     }
 
+    // used by ChunkStream
     public _createItem(
         customHeaders: VsoBaseInterfaces.IHeaders,
         contentStream: NodeJS.ReadableStream,
@@ -56,15 +58,27 @@ export class FileContainerApi extends FileContainerApiBase.FileContainerApiBase
         };
 
         customHeaders = customHeaders || {};
-        customHeaders["Content-Type"] = "application/octet-stream";
+        customHeaders["Content-Type"] = "";
+        
 
         this.vsoClient.getVersioningData("2.2-preview.3", "Container", "e4f5c81e-e250-447b-9fef-bd48471bea5e", routeValues, queryValues)
             .then((versioningData: vsom.ClientVersioningData) => {
                 var url: string = versioningData.requestUrl;
-                var apiVersion: string = versioningData.apiVersion;
                 var serializationData = {  responseTypeMetadata: FileContainerInterfaces.TypeInfo.FileContainerItem, responseIsCollection: false };
 
-                this.restCallbackClient.uploadStream('PUT', url, apiVersion, contentStream, customHeaders, onResult, serializationData);
+                let options: restm.IRequestOptions = this.createRequestOptions('application/octet-stream',
+                                                                                versioningData.apiVersion);
+                options.additionalHeaders = customHeaders;
+                this.rest.uploadStream<FileContainerInterfaces.FileContainerItem>('PUT', url, contentStream, options)
+                .then((res: restm.IRestResponse<FileContainerInterfaces.FileContainerItem>) => {
+                    let ret = this.formatResponse(res.result, 
+                                                  FileContainerInterfaces.TypeInfo.FileContainerItem, 
+                                                  false);
+                    onResult(null, res.statusCode, ret);
+                })
+                .catch((err) => {
+                    onResult(err, err.statusCode, null);    
+                });
             }, (error) => {
                 onResult(error, error.statusCode, null);
             });