add test RavenDB-11552 + code cleanup

gregolsky · gregolsky · commit 3a0eeb078131 · 2018-11-21T13:14:57.000+01:00
diff --git a/src/Constants.ts b/src/Constants.ts
@@ -1,3 +1,5 @@
+import { MetadataObject } from "./Documents/Session/MetadataObject";
+
 export const CONSTANTS = {
     Documents: {
         Indexing: {
@@ -15,23 +17,23 @@ export const CONSTANTS = {
             SIDE_BY_SIDE_INDEX_NAME_PREFIX: "ReplacementOf/",
         },
         Metadata: {
-            COLLECTION: "@collection",
-            PROJECTION: "@projection",
-            KEY: "@metadata",
-            ID: "@id",
+            COLLECTION: "@collection" as keyof MetadataObject,
+            PROJECTION: "@projection" as keyof MetadataObject,
+            KEY: "@metadata" as keyof MetadataObject,
+            ID: "@id" as keyof MetadataObject,
             CONFLICT: "@conflict",
             ID_PROPERTY: "id",
-            FLAGS: "@flags",
-            ATTACHMENTS: "@attachments",
-            INDEX_SCORE: "@index-score",
-            LAST_MODIFIED: "@last-modified",
-            RAVEN_JS_TYPE: "Raven-Node-Type",
-            CHANGE_VECTOR: "@change-vector",
-            EXPIRES: "@expires",
+            FLAGS: "@flags" as keyof MetadataObject,
+            ATTACHMENTS: "@attachments" as keyof MetadataObject,
+            INDEX_SCORE: "@index-score" as keyof MetadataObject,
+            LAST_MODIFIED: "@last-modified" as keyof MetadataObject,
+            RAVEN_JS_TYPE: "Raven-Node-Type" as keyof MetadataObject,
+            CHANGE_VECTOR: "@change-vector" as keyof MetadataObject,
+            EXPIRES: "@expires" as keyof MetadataObject,
             ALL_DOCUMENTS_COLLECTION: "@all_docs",
             EMPTY_COLLECTION: "@empty",
-            NESTED_OBJECT_TYPES: "@nested-object-types",
-            COUNTERS: "@counters",
+            NESTED_OBJECT_TYPES: "@nested-object-types" as keyof MetadataObject,
+            COUNTERS: "@counters" as keyof MetadataObject,
             REVISION_COUNTERS: "@counters-snapshot",
             IGNORE_CASE_TRANSFORM_REGEX:
             // tslint:disable-next-line:max-line-length
diff --git a/src/Documents/Attachments/index.ts b/src/Documents/Attachments/index.ts
@@ -13,7 +13,7 @@ export interface AttachmentName {
 
 export interface AttachmentDetails extends AttachmentName {
     changeVector: string;
-    documentId: string;
+    documentId?: string;
 }
 
 export class AttachmentResult {
diff --git a/src/Documents/BulkInsertOperation.ts b/src/Documents/BulkInsertOperation.ts
@@ -21,6 +21,7 @@ import { ServerNode } from "../Http/ServerNode";
 import { AbstractCallback } from "../Types/Callbacks";
 import { passResultToCallback } from "../Utility/PromiseUtil";
 import { BatchOperation } from "./Session/Operations/BatchOperation";
+import { MetadataObject } from "./Session/MetadataObject";
 
 export class BulkInsertOperation {
     private readonly _generateEntityIdOnTheClient: GenerateEntityIdOnTheClient;
@@ -162,18 +163,18 @@ export class BulkInsertOperation {
             });
         }
 
-        if (!(CONSTANTS.Documents.Metadata.COLLECTION in metadata)) {
+        if (!(("@collection" as keyof MetadataObject) in metadata)) {
             const collection = this._requestExecutor.conventions.getCollectionNameForEntity(entity);
             if (collection) {
-                metadata[CONSTANTS.Documents.Metadata.COLLECTION] = collection;
+                metadata["@collection"] = collection;
             }
         }
 
-        if (!(CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE in metadata)) {
+        if (!("Raven-Node-Type" as keyof MetadataObject in metadata)) {
             const descriptor = this._conventions.getEntityTypeDescriptor(entity);
             const jsType = this._requestExecutor.conventions.getJsTypeName(descriptor);
             if (jsType) {
-                metadata[CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE] = jsType;
+                metadata["Raven-Node-Type"] = jsType;
             }
         }
 
diff --git a/src/Documents/Commands/Batches/BatchPatchCommandData.ts b/src/Documents/Commands/Batches/BatchPatchCommandData.ts
@@ -108,4 +108,4 @@ export class BatchPatchCommandData implements ICommandData {
                 : undefined
         };
    }
-}
+}
diff --git a/src/Documents/Commands/Batches/DeleteAttachmentCommandData.ts b/src/Documents/Commands/Batches/DeleteAttachmentCommandData.ts
@@ -11,11 +11,11 @@ export class DeleteAttachmentCommandData implements ICommandData {
     public type: CommandType = "AttachmentDELETE";
 
     public constructor(documentId: string, name: string, changeVector: string) {
-        if (StringUtil.isWhitespace(documentId)) {
+        if (StringUtil.isNullOrWhitespace(documentId)) {
             throwError("InvalidArgumentException", "DocumentId cannot be null");
         }
 
-        if (StringUtil.isWhitespace(name)) {
+        if (StringUtil.isNullOrWhitespace(name)) {
             throwError("InvalidArgumentException", "Name cannot be null");
         }
 
diff --git a/src/Documents/Commands/Batches/PutAttachmentCommandData.ts b/src/Documents/Commands/Batches/PutAttachmentCommandData.ts
@@ -19,12 +19,12 @@ export class PutAttachmentCommandData implements ICommandData {
         contentType: string,
         changeVector: string) {
 
-        if (StringUtil.isWhitespace(documentId)) {
-            throwError("InvalidArgumentException", "DocumentId cannot be null");
+        if (StringUtil.isNullOrWhitespace(documentId)) {
+            throwError("InvalidArgumentException", "DocumentId cannot be null.");
         }
 
-        if (StringUtil.isWhitespace(name)) {
-            throwError("InvalidArgumentException", "Name cannot be null");
+        if (StringUtil.isNullOrWhitespace(name)) {
+            throwError("InvalidArgumentException", "Name cannot be null.");
         }
 
         this.id = documentId;
diff --git a/src/Documents/Commands/HeadAttachmentCommand.ts b/src/Documents/Commands/HeadAttachmentCommand.ts
@@ -21,11 +21,11 @@ export class HeadAttachmentCommand extends RavenCommand<string> {
     public constructor(documentId: string, name: string, changeVector: string) {
         super();
 
-        if (StringUtil.isWhitespace(documentId)) {
+        if (StringUtil.isNullOrWhitespace(documentId)) {
             throwError("InvalidArgumentException", "DocumentId cannot be null or empty");
         }
 
-        if (StringUtil.isWhitespace(name)) {
+        if (StringUtil.isNullOrWhitespace(name)) {
             throwError("InvalidArgumentException", "Name cannot be null or empty");
         }
 
diff --git a/src/Documents/Operations/Attachments/DeleteAttachmentOperation.ts b/src/Documents/Operations/Attachments/DeleteAttachmentOperation.ts
@@ -33,10 +33,10 @@ export class DeleteAttachmentCommand extends RavenCommand<void> {
 
     public constructor(documentId: string, name: string, changeVector: string) {
         super();
-        if (StringUtil.isWhitespace(documentId)) {
+        if (StringUtil.isNullOrWhitespace(documentId)) {
             throwError("InvalidArgumentException", "DocumentId cannot be null or empty");
         }
-        if (StringUtil.isWhitespace(name)) {
+        if (StringUtil.isNullOrWhitespace(name)) {
             throwError("InvalidArgumentException", "Name cannot be null or empty");
         }
 
diff --git a/src/Documents/Operations/Attachments/GetAttachmentOperation.ts b/src/Documents/Operations/Attachments/GetAttachmentOperation.ts
@@ -46,10 +46,10 @@ export class GetAttachmentCommand extends RavenCommand<AttachmentResult> {
     public constructor(documentId: string, name: string, type: AttachmentType, changeVector: string) {
         super();
 
-        if (StringUtil.isWhitespace(documentId)) {
+        if (StringUtil.isNullOrWhitespace(documentId)) {
             throwError("InvalidArgumentException", "DocumentId cannot be null or empty");
         }
-        if (StringUtil.isWhitespace(name)) {
+        if (StringUtil.isNullOrWhitespace(name)) {
             throwError("InvalidArgumentException", "Name cannot be null or empty");
         }
         if (type !== "Document" && !changeVector) {
diff --git a/src/Documents/Operations/Attachments/PutAttachmentOperation.ts b/src/Documents/Operations/Attachments/PutAttachmentOperation.ts
@@ -50,10 +50,10 @@ export class PutAttachmentCommand extends RavenCommand<AttachmentDetails> {
                        stream: AttachmentData, contentType: string, changeVector: string) {
         super();
 
-        if (StringUtil.isWhitespace(documentId)) {
+        if (StringUtil.isNullOrWhitespace(documentId)) {
             throwError("InvalidArgumentException", "DocumentId cannot be null or empty");
         }
-        if (StringUtil.isWhitespace(name)) {
+        if (StringUtil.isNullOrWhitespace(name)) {
             throwError("InvalidArgumentException", "Name cannot be null or empty");
         }
 
diff --git a/src/Documents/Session/DocumentInfo.ts b/src/Documents/Session/DocumentInfo.ts
@@ -4,6 +4,7 @@ import { IRavenObject } from "../../Types/IRavenObject";
 import { CONSTANTS } from "../../Constants";
 import { throwError } from "../../Exceptions";
 import { TypeUtil } from "../../Utility/TypeUtil";
+import { MetadataObject } from "./MetadataObject";
 
 export class DocumentInfo {
 
@@ -15,7 +16,7 @@ export class DocumentInfo {
 
     public ignoreChanges: boolean;
 
-    public metadata: IRavenObject;
+    public metadata: MetadataObject;
     public document: IRavenObject;
 
     public metadataInstance: IMetadataDictionary;
diff --git a/src/Documents/Session/DocumentSession.ts b/src/Documents/Session/DocumentSession.ts
@@ -439,7 +439,7 @@ export class DocumentSession extends InMemoryDocumentSessionOperations
             id = entityOrId;
         } else {
             const metadata = this.getMetadataFor(entityOrId as T);
-            id = metadata[CONSTANTS.Documents.Metadata.ID];
+            id = metadata["@id"];
         }
 
         const patchRequest = new PatchRequest();
@@ -476,7 +476,7 @@ export class DocumentSession extends InMemoryDocumentSessionOperations
             id = entityOrId;
         } else {
             const metadata = this.getMetadataFor(entityOrId as TEntity);
-            id = metadata[CONSTANTS.Documents.Metadata.ID];
+            id = metadata["@id"];
         }
 
         let patchRequest: PatchRequest;
diff --git a/src/Documents/Session/DocumentSessionAttachmentsBase.ts b/src/Documents/Session/DocumentSessionAttachmentsBase.ts
@@ -114,11 +114,11 @@ export abstract class DocumentSessionAttachmentsBase extends AdvancedSessionExte
             return this._deleteAttachmentByEntity(entityOrId, name);
         }
 
-        if (StringUtil.isWhitespace(entityOrId)) {
+        if (StringUtil.isNullOrWhitespace(entityOrId)) {
             throwError("InvalidArgumentException", "DocumentId cannot be null");
         }
 
-        if (StringUtil.isWhitespace(name)) {
+        if (StringUtil.isNullOrWhitespace(name)) {
             throwError("InvalidArgumentException", "Name cannot be null");
         }
 
diff --git a/src/Documents/Session/EntityToJson.ts b/src/Documents/Session/EntityToJson.ts
@@ -9,6 +9,7 @@ import { Mapping } from "../../Mapping";
 import { ObjectTypeDescriptor } from "../..";
 import { throwError } from "../../Exceptions";
 import { SetupDocumentBase } from "../SetupDocumentBase";
+import { MetadataObject } from "./MetadataObject";
 
 export class EntityToJson {
 
@@ -85,8 +86,8 @@ export class EntityToJson {
         }
 
         if (documentInfo.metadata) {
-            documentInfo.metadata[CONSTANTS.Documents.Metadata.NESTED_OBJECT_TYPES] = typeInfo.nestedTypes;
-            documentInfo.metadata[CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE] = typeInfo.typeName;
+            documentInfo.metadata["@nested-object-types" as keyof MetadataObject] = typeInfo.nestedTypes;
+            documentInfo.metadata["Raven-Node-Type" as keyof MetadataObject] = typeInfo.typeName;
         }
 
         if (documentInfo.metadataInstance) {
@@ -95,7 +96,7 @@ export class EntityToJson {
         }
 
         let setMetadata: boolean = false;
-        const metadataNode: object = {};
+        const metadataNode: MetadataObject = {};
 
         if (documentInfo.metadata && Object.keys(documentInfo.metadata).length > 0) {
             setMetadata = true;
@@ -116,7 +117,7 @@ export class EntityToJson {
 
         if (documentInfo.collection) {
             setMetadata = true;
-            metadataNode[CONSTANTS.Documents.Metadata.COLLECTION] = documentInfo.collection;
+            metadataNode["@collection"] = documentInfo.collection;
         }
 
         if (setMetadata) {
diff --git a/src/Documents/Session/IMetadataDictionary.ts b/src/Documents/Session/IMetadataDictionary.ts
@@ -1,4 +1,6 @@
-export interface IRawMetadataDictionary {
+import { MetadataObject } from "./MetadataObject";
+
+export interface IRawMetadataDictionary extends MetadataObject {
     [key: string]: any;
 }
 
diff --git a/src/Documents/Session/InMemoryDocumentSessionOperations.ts b/src/Documents/Session/InMemoryDocumentSessionOperations.ts
@@ -352,7 +352,7 @@ export abstract class InMemoryDocumentSessionOperations
         }
 
         const documentInfo = this._getDocumentInfo(instance);
-        const lastModified = documentInfo.metadata[CONSTANTS.Documents.Metadata.LAST_MODIFIED];
+        const lastModified = documentInfo.metadata["@last-modified"];
         return DateUtil.default.parse(lastModified);
     }
 
diff --git a/src/Documents/Session/MetadataObject.ts b/src/Documents/Session/MetadataObject.ts
@@ -0,0 +1,14 @@
+import { AttachmentDetails } from "../Attachments";
+
+export interface MetadataObject {
+    "@attachments"?: AttachmentDetails[];
+    "@collection"?: string;
+    "@id"?: string;
+    "@last-modified"?: string;
+    "@flags"?: string;
+    "@counters"?: string[];
+    "@expires"?: string;
+    "@change-vector"?: string;
+    "Raven-Node-Type"?: string;
+    "@nested-object-types"?: { [key: string]: string };
+}
diff --git a/src/Documents/Session/Operations/BatchOperation.ts b/src/Documents/Session/Operations/BatchOperation.ts
@@ -12,6 +12,7 @@ import { PatchStatus } from "../../Operations/PatchStatus";
 import { CounterTracking } from "../CounterInternalTypes";
 import { TypeUtil } from "../../../Utility/TypeUtil";
 import { BatchCommandResult } from "./BatchCommandResult";
+import { AttachmentDetails, AttachmentName } from "../../Attachments";
 
 export class BatchOperation {
 
@@ -196,16 +197,15 @@ export class BatchOperation {
         }
 
         const documentInfo = this._getOrAddModifications(id, sessionDocumentInfo, true);
-        const attachmentsJson = documentInfo.metadata[CONSTANTS.Documents.Metadata.ATTACHMENTS];
+        const attachmentsJson = documentInfo.metadata["@attachments"];
         if (!attachmentsJson || !Object.keys(attachmentsJson).length) {
             return;
         }
 
         const name = BatchOperation._getStringField(batchResult, type, attachmentNameFieldName);
         const attachments = [];
-        documentInfo.metadata[CONSTANTS.Documents.Metadata.ATTACHMENTS] = attachments;
-        for (let i = 0; i < Object.keys(attachmentsJson).length; i++) {
-            const attachment = attachmentsJson[i];
+        documentInfo.metadata["@attachments"] = attachments;
+        for (const attachment of attachmentsJson) {
             const attachmentName = BatchOperation._getStringField(attachment, type, "name");
             if (attachmentName === name) {
                 continue;
@@ -229,18 +229,18 @@ export class BatchOperation {
         }
 
         const documentInfo = this._getOrAddModifications(id, sessionDocumentInfo, false);
-        let attachments = documentInfo.metadata[CONSTANTS.Documents.Metadata.ATTACHMENTS];
+        let attachments = documentInfo.metadata["@attachments"];
         if (!attachments) {
             attachments = [];
-            documentInfo.metadata[CONSTANTS.Documents.Metadata.ATTACHMENTS] = attachments;
+            documentInfo.metadata["@attachments"] = attachments;
         }
 
         attachments.push({
-            ChangeVector: BatchOperation._getStringField(batchResult, type, "changeVector"),
-            ContentType: BatchOperation._getStringField(batchResult, type, "contentType"),
-            Hash: BatchOperation._getStringField(batchResult, type, "hash"),
-            Name: BatchOperation._getStringField(batchResult, type, "name"),
-            Size: BatchOperation._getNumberField(batchResult, type, "size")
+            changeVector: BatchOperation._getStringField(batchResult, type, "changeVector"),
+            contentType: BatchOperation._getStringField(batchResult, type, "contentType"),
+            hash: BatchOperation._getStringField(batchResult, type, "hash"),
+            name: BatchOperation._getStringField(batchResult, type, "name"),
+            size: BatchOperation._getNumberField(batchResult, type, "size")
         });
     }
 
diff --git a/src/Documents/Session/SessionDocumentCounters.ts b/src/Documents/Session/SessionDocumentCounters.ts
@@ -84,7 +84,7 @@ export class SessionDocumentCounters extends SessionCountersBase implements ISes
         const document = this._session.documentsById.getValue(this._docId);
         let metadataHasCounterName = false;
         if (document) {
-            const metadataCounters = document.metadata[CONSTANTS.Documents.Metadata.COUNTERS];
+            const metadataCounters = document.metadata["@counters"];
             if (metadataCounters) {
                 metadataHasCounterName = metadataCounters.some(x => x === counter);
             }
diff --git a/src/Primitives/CaseInsensitiveKeysMap.ts b/src/Primitives/CaseInsensitiveKeysMap.ts
@@ -65,7 +65,6 @@ export class CaseInsensitiveKeysMap {
                 }, [])[Symbol.iterator]();
         };
             
-
         return result;
     }
 }
diff --git a/src/Primitives/CaseInsensitiveStringSet.ts b/src/Primitives/CaseInsensitiveStringSet.ts
@@ -1,6 +1,5 @@
 import { CaseInsensitiveKeysStore } from "./CaseInsensitiveKeysStore";
 
-
 function validateKey(key) {
     if (!(key && key.toLowerCase)) {
         throw Error("Key must be a string.");
diff --git a/test/Documents/SessionApiTests.ts b/test/Documents/SessionApiTests.ts
@@ -330,8 +330,4 @@ describe("Session API dev experience tests", function () {
         assert.ok(entity["id"]);
     });
 
-    describe("when using pipe-suffixed id", async function () {
-        
-    })
-
 });
diff --git a/test/Ported/Attachments/AttachmentsRevisionsTest.ts b/test/Ported/Attachments/AttachmentsRevisionsTest.ts
@@ -228,12 +228,12 @@ describe("AttachmentsRevisions", function () {
         (names: string[], expectedCount: number, revision: User, session: IDocumentSession) => {
             const metadata = session.advanced.getMetadataFor(revision);
 
-            const flags = metadata[CONSTANTS.Documents.Metadata.FLAGS] as string;
+            const flags = metadata["@flags"];
             assert.ok(flags.includes("HasRevisions"));
             assert.ok(flags.includes("Revision"));
             assert.ok(flags.includes("HasAttachments"));
 
-            const attachments: IMetadataDictionary[] = metadata[CONSTANTS.Documents.Metadata.ATTACHMENTS];
+            const attachments = metadata["@attachments"];
             assert.strictEqual(attachments.length, expectedCount);
 
             const orderedNames = names.slice(0);
diff --git a/test/Ported/Attachments/AttachmentsSessionTest.ts b/test/Ported/Attachments/AttachmentsSessionTest.ts
diff --git a/test/Ported/Counters/CountersSingleNodeTest.ts b/test/Ported/Counters/CountersSingleNodeTest.ts
diff --git a/test/Ported/Counters/SessionCountersTest.ts b/test/Ported/Counters/SessionCountersTest.ts
diff --git a/test/Ported/Issues/RavenDB_10038.ts b/test/Ported/Issues/RavenDB_10038.ts
diff --git a/test/Ported/Issues/RavenDB_11552.ts b/test/Ported/Issues/RavenDB_11552.ts
diff --git a/test/Ported/Issues/RavenDB_12169.ts b/test/Ported/Issues/RavenDB_12169.ts
diff --git a/test/Ported/RevisionsTest.ts b/test/Ported/RevisionsTest.ts
diff --git a/test/Ported/Server/Replication/DocumentReplicationTest.ts b/test/Ported/Server/Replication/DocumentReplicationTest.ts

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export interface AttachmentName {`
`13`	`13`
`14`	`14`	`export interface AttachmentDetails extends AttachmentName {`
`15`	`15`	`changeVector: string;`
`16`		`- documentId: string;`
	`16`	`+ documentId?: string;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`export class AttachmentResult {`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import { ServerNode } from "../Http/ServerNode";`
`21`	`21`	`import { AbstractCallback } from "../Types/Callbacks";`
`22`	`22`	`import { passResultToCallback } from "../Utility/PromiseUtil";`
`23`	`23`	`import { BatchOperation } from "./Session/Operations/BatchOperation";`
	`24`	`+import { MetadataObject } from "./Session/MetadataObject";`
`24`	`25`
`25`	`26`	`export class BulkInsertOperation {`
`26`	`27`	`private readonly _generateEntityIdOnTheClient: GenerateEntityIdOnTheClient;`
`@@ -162,18 +163,18 @@ export class BulkInsertOperation {`
`162`	`163`	`});`
`163`	`164`	`}`
`164`	`165`
`165`		`- if (!(CONSTANTS.Documents.Metadata.COLLECTION in metadata)) {`
	`166`	`+ if (!(("@collection" as keyof MetadataObject) in metadata)) {`
`166`	`167`	`const collection = this._requestExecutor.conventions.getCollectionNameForEntity(entity);`
`167`	`168`	`if (collection) {`
`168`		`- metadata[CONSTANTS.Documents.Metadata.COLLECTION] = collection;`
	`169`	`+ metadata["@collection"] = collection;`
`169`	`170`	`}`
`170`	`171`	`}`
`171`	`172`
`172`		`- if (!(CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE in metadata)) {`
	`173`	`+ if (!("Raven-Node-Type" as keyof MetadataObject in metadata)) {`
`173`	`174`	`const descriptor = this._conventions.getEntityTypeDescriptor(entity);`
`174`	`175`	`const jsType = this._requestExecutor.conventions.getJsTypeName(descriptor);`
`175`	`176`	`if (jsType) {`
`176`		`- metadata[CONSTANTS.Documents.Metadata.RAVEN_JS_TYPE] = jsType;`
	`177`	`+ metadata["Raven-Node-Type"] = jsType;`
`177`	`178`	`}`
`178`	`179`	`}`
`179`	`180`
Original file line number	Diff line number	Diff line change
`@@ -108,4 +108,4 @@ export class BatchPatchCommandData implements ICommandData {`
`108`	`108`	`: undefined`
`109`	`109`	`};`
`110`	`110`	`}`
`111`		`-}`
	`111`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ export class DeleteAttachmentCommandData implements ICommandData {`
`11`	`11`	`public type: CommandType = "AttachmentDELETE";`
`12`	`12`
`13`	`13`	`public constructor(documentId: string, name: string, changeVector: string) {`
`14`		`- if (StringUtil.isWhitespace(documentId)) {`
	`14`	`+ if (StringUtil.isNullOrWhitespace(documentId)) {`
`15`	`15`	`throwError("InvalidArgumentException", "DocumentId cannot be null");`
`16`	`16`	`}`
`17`	`17`
`18`		`- if (StringUtil.isWhitespace(name)) {`
	`18`	`+ if (StringUtil.isNullOrWhitespace(name)) {`
`19`	`19`	`throwError("InvalidArgumentException", "Name cannot be null");`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ export class PutAttachmentCommandData implements ICommandData {`
`19`	`19`	`contentType: string,`
`20`	`20`	`changeVector: string) {`
`21`	`21`
`22`		`- if (StringUtil.isWhitespace(documentId)) {`
`23`		`- throwError("InvalidArgumentException", "DocumentId cannot be null");`
	`22`	`+ if (StringUtil.isNullOrWhitespace(documentId)) {`
	`23`	`+ throwError("InvalidArgumentException", "DocumentId cannot be null.");`
`24`	`24`	`}`
`25`	`25`
`26`		`- if (StringUtil.isWhitespace(name)) {`
`27`		`- throwError("InvalidArgumentException", "Name cannot be null");`
	`26`	`+ if (StringUtil.isNullOrWhitespace(name)) {`
	`27`	`+ throwError("InvalidArgumentException", "Name cannot be null.");`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`this.id = documentId;`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ export class HeadAttachmentCommand extends RavenCommand<string> {`
`21`	`21`	`public constructor(documentId: string, name: string, changeVector: string) {`
`22`	`22`	`super();`
`23`	`23`
`24`		`- if (StringUtil.isWhitespace(documentId)) {`
	`24`	`+ if (StringUtil.isNullOrWhitespace(documentId)) {`
`25`	`25`	`throwError("InvalidArgumentException", "DocumentId cannot be null or empty");`
`26`	`26`	`}`
`27`	`27`
`28`		`- if (StringUtil.isWhitespace(name)) {`
	`28`	`+ if (StringUtil.isNullOrWhitespace(name)) {`
`29`	`29`	`throwError("InvalidArgumentException", "Name cannot be null or empty");`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ export class DeleteAttachmentCommand extends RavenCommand<void> {`
`33`	`33`
`34`	`34`	`public constructor(documentId: string, name: string, changeVector: string) {`
`35`	`35`	`super();`
`36`		`- if (StringUtil.isWhitespace(documentId)) {`
	`36`	`+ if (StringUtil.isNullOrWhitespace(documentId)) {`
`37`	`37`	`throwError("InvalidArgumentException", "DocumentId cannot be null or empty");`
`38`	`38`	`}`
`39`		`- if (StringUtil.isWhitespace(name)) {`
	`39`	`+ if (StringUtil.isNullOrWhitespace(name)) {`
`40`	`40`	`throwError("InvalidArgumentException", "Name cannot be null or empty");`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,10 @@ export class GetAttachmentCommand extends RavenCommand<AttachmentResult> {`
`46`	`46`	`public constructor(documentId: string, name: string, type: AttachmentType, changeVector: string) {`
`47`	`47`	`super();`
`48`	`48`
`49`		`- if (StringUtil.isWhitespace(documentId)) {`
	`49`	`+ if (StringUtil.isNullOrWhitespace(documentId)) {`
`50`	`50`	`throwError("InvalidArgumentException", "DocumentId cannot be null or empty");`
`51`	`51`	`}`
`52`		`- if (StringUtil.isWhitespace(name)) {`
	`52`	`+ if (StringUtil.isNullOrWhitespace(name)) {`
`53`	`53`	`throwError("InvalidArgumentException", "Name cannot be null or empty");`
`54`	`54`	`}`
`55`	`55`	`if (type !== "Document" && !changeVector) {`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,10 @@ export class PutAttachmentCommand extends RavenCommand<AttachmentDetails> {`
`50`	`50`	`stream: AttachmentData, contentType: string, changeVector: string) {`
`51`	`51`	`super();`
`52`	`52`
`53`		`- if (StringUtil.isWhitespace(documentId)) {`
	`53`	`+ if (StringUtil.isNullOrWhitespace(documentId)) {`
`54`	`54`	`throwError("InvalidArgumentException", "DocumentId cannot be null or empty");`
`55`	`55`	`}`
`56`		`- if (StringUtil.isWhitespace(name)) {`
	`56`	`+ if (StringUtil.isNullOrWhitespace(name)) {`
`57`	`57`	`throwError("InvalidArgumentException", "Name cannot be null or empty");`
`58`	`58`	`}`
`59`	`59`