Merge pull request #371 from ml054/RDBC-432

RDBC-432 get rid of bluebird from node.js client - partial work

Author: ml054

src/Documents/Operations/OperationCompletionAwaiter.ts

@@ -1,11 +1,11 @@
-import * as BluebirdPromise from "bluebird";
 import { GetOperationStateCommand } from "./GetOperationStateOperation";
 import { RavenCommand, IRavenResponse } from "../../Http/RavenCommand";
 import { throwError } from "../../Exceptions";
 import { OperationExceptionResult } from "./OperationAbstractions";
 import { ExceptionDispatcher } from "../../Exceptions";
 import { DocumentConventions } from "../Conventions/DocumentConventions";
 import { RequestExecutor } from "../../Http/RequestExecutor";
+import { delay } from "../../Utility/PromiseUtil";
 
 type OperationStatus = "Completed" | "Canceled" | "Faulted";
 
@@ -47,7 +47,7 @@ export class OperationCompletionAwaiter {
 
     public waitForCompletion(): Promise<void> {
         const operationStatusPolling = () => {
-            return BluebirdPromise.resolve()
+            return Promise.resolve()
                 .then(() => this._fetchOperationStatus())
                 .then((operationStatusResult) => {
                     const operationStatus = operationStatusResult.status as OperationStatus;
@@ -65,7 +65,7 @@ export class OperationCompletionAwaiter {
                         }
                     }
 
-                    return BluebirdPromise.delay(500)
+                    return delay(500)
                         .then(() => operationStatusPolling());
                 });
         };

test/Ported/BulkInsert/BulkInsertsTest.ts

@@ -6,8 +6,8 @@ import DocumentStore, {
 } from "../../../src";
 import { createMetadataDictionary } from "../../../src/Mapping/MetadataAsDictionary";
 import { CONSTANTS } from "../../../src/Constants";
-import * as BluebirdPromise from "bluebird";
 import { DateUtil } from "../../../src/Utility/DateUtil";
+import { delay } from "../../../src/Utility/PromiseUtil";
 
 describe("bulk insert", function () {
 
@@ -99,7 +99,7 @@ describe("bulk insert", function () {
             await bulkInsert.store(new FooBar());
             await bulkInsert.store(new FooBar());
             await bulkInsert.store(new FooBar());
-            await BluebirdPromise.delay(500);
+            await delay(500);
             await bulkInsert.abort();
             await bulkInsert.store(new FooBar());
 

test/Ported/Indexing/IndexesFromClientTest.ts

@@ -1,4 +1,3 @@
-import * as BluebirdPromise from "bluebird";
 import * as assert from "assert";
 import {
     testContext,
@@ -29,6 +28,7 @@ import { DeleteIndexOperation } from "../../../src/Documents/Operations/Indexes/
 import { QueryStatistics } from "../../../src/Documents/Session/QueryStatistics";
 import { MoreLikeThisOptions } from "../../../src/Documents/Queries/MoreLikeThis/MoreLikeThisOptions";
 import { IndexCreation } from "../../../src/Documents/Indexes/IndexCreation";
+import { delay } from "../../../src/Utility/PromiseUtil";
 
 describe("Indexes from client", function () {
 
@@ -84,7 +84,7 @@ describe("Indexes from client", function () {
 
         const indexName = new UsersIndex().getIndexName();
 
-        await BluebirdPromise.delay(2000);
+        await delay(2000);
 
         await store.maintenance.send(new ResetIndexOperation(indexName));
         await testContext.waitForIndexing(store);
@@ -283,7 +283,7 @@ describe("Indexes from client", function () {
         }
 
         {
-            // make queries to create auto indexes 
+            // make queries to create auto indexes
             const session = store.openSession();
             let stats: QueryStatistics;
             let users = await session.query(User)

test/TestDriver/index.ts

@@ -532,7 +532,7 @@ class ReplicationTestBase2 {
                 const session = docStore.openSession();
                 await session.load(id);
 
-                await BluebirdPromise.delay(10);
+                await delay(10);
             } catch (e) {
                 if (e.name === "DocumentConflictException") {
                     return;