RDBC-622 parse cmp exchange in sync way - vol 2

ml054 · ml054 · commit 20619a48e720 · 2023-08-08T14:23:42.000+02:00
diff --git a/src/Documents/Operations/CompareExchange/CompareExchangeResult.ts b/src/Documents/Operations/CompareExchange/CompareExchangeResult.ts
@@ -1,9 +1,10 @@
 import { DocumentConventions } from "../../Conventions/DocumentConventions";
 import { throwError } from "../../../Exceptions";
 import { TypeUtil } from "../../../Utility/TypeUtil";
-import { CompareExchangeResultClass } from "../../../Types";
+import { CompareExchangeResultClass, ServerCasing, ServerResponse } from "../../../Types";
 import { COMPARE_EXCHANGE } from "../../../Constants";
 import { DocumentType } from "../../DocumentAbstractions";
+import { ObjectUtil } from "../../../Utility/ObjectUtil";
 
 export interface CompareExchangeResultResponse {
     index: number;
@@ -20,39 +21,15 @@ export class CompareExchangeResult<T> {
     public successful: boolean;
 
     public static parseFromObject<T>(
-        { index, value, successful }: CompareExchangeResultResponse,
+        response: ServerCasing<ServerResponse<CompareExchangeResultResponse>>,
         conventions: DocumentConventions,
         clazz?: CompareExchangeResultClass<T>): CompareExchangeResult<T> {
-        if (!index) {
+        if (!response.Index) {
             throwError("InvalidOperationException", "Response is invalid. Index is missing");
         }
 
-        const val = value.object || null;
-        return CompareExchangeResult._create(val, index, successful, conventions, clazz);
-    }
-
-    public static parseFromString<T>(
-        responseString: string,
-        conventions: DocumentConventions,
-        clazz?: CompareExchangeResultClass<T>): CompareExchangeResult<T> {
-
-        const response = JSON.parse(responseString);
-
-        const index = response["Index"];
-        if (!index) {
-            throwError("InvalidOperationException", "Response is invalid. Index is missing");
-        }
-
-        const successful = response["Successful"];
-        const raw = response["Value"];
-
-        let val = null;
-
-        if (raw) {
-            val = raw[COMPARE_EXCHANGE.OBJECT_FIELD_NAME];
-        }
-
-        return CompareExchangeResult._create(val, index, successful, conventions, clazz);
+        const val = response.Value.Object || null;
+        return CompareExchangeResult._create(val, response.Index, response.Successful, conventions, clazz);
     }
 
     private static _create<T>(
@@ -74,13 +51,22 @@ export class CompareExchangeResult<T> {
             return emptyExchangeResult;
         }
 
-        let result: T;
+        let result: any = null;
         if (TypeUtil.isPrimitive(val)) {
             result = val as any as T;
         } else {
+            let rawValue = val;
             // val comes here with proper key case already
             const entityType = conventions.getJsTypeByDocumentType(clazz as DocumentType);
-            result = conventions.deserializeEntityFromJson(entityType, val) as any as T;
+            if (conventions.entityFieldNameConvention) {
+                rawValue = ObjectUtil.transformObjectKeys(
+                    rawValue, {
+                        defaultTransform: conventions.entityFieldNameConvention,
+                        recursive: true,
+                        arrayRecursive: true
+                    });
+            }
+            result = conventions.deserializeEntityFromJson(entityType, rawValue) as any as T;
         }
 
         const exchangeResult = new CompareExchangeResult<T>();
diff --git a/src/Documents/Operations/CompareExchange/DeleteCompareExchangeValueOperation.ts b/src/Documents/Operations/CompareExchange/DeleteCompareExchangeValueOperation.ts
@@ -1,7 +1,7 @@
 import { HttpRequestParameters } from "../../../Primitives/Http";
 import { IOperation, OperationResultType } from "../OperationAbstractions";
 import { CompareExchangeResult, CompareExchangeResultResponse } from "./CompareExchangeResult";
-import { CompareExchangeResultClass } from "../../../Types";
+import { CompareExchangeResultClass, ServerCasing, ServerResponse } from "../../../Types";
 import { IDocumentStore } from "../../IDocumentStore";
 import { DocumentConventions } from "../../Conventions/DocumentConventions";
 import { HttpCache } from "../../../Http/HttpCache";
@@ -59,7 +59,7 @@ export class RemoveCompareExchangeCommand<T> extends RavenCommand<CompareExchang
     }
 
     public createRequest(node: ServerNode): HttpRequestParameters {
-        const uri = node.url + "/databases/" + node.database + "/cmpxchg?key=" + encodeURIComponent(this._key) 
+        const uri = node.url + "/databases/" + node.database + "/cmpxchg?key=" + encodeURIComponent(this._key)
             + "&index=" + this._index;
         return {
             method: "DELETE",
@@ -69,11 +69,11 @@ export class RemoveCompareExchangeCommand<T> extends RavenCommand<CompareExchang
 
     public async setResponseAsync(bodyStream: stream.Stream, fromCache: boolean): Promise<string> {
         let body: string = null;
-        const resObj = await this._pipeline<CompareExchangeResultResponse>()
+        const resObj = await this._pipeline<ServerCasing<ServerResponse<CompareExchangeResultResponse>>>()
             .collectBody(_ => body = _)
-            .parseJsonAsync()
-            .jsonKeysTransform("CompareExchangeValue", this._conventions)
+            .parseJsonSync()
             .process(bodyStream);
+
         this.result = CompareExchangeResult.parseFromObject(resObj, this._conventions, this._clazz);
         return body;
     }
diff --git a/src/Documents/Operations/CompareExchange/PutCompareExchangeValueOperation.ts b/src/Documents/Operations/CompareExchange/PutCompareExchangeValueOperation.ts
@@ -10,7 +10,7 @@ import { ServerNode } from "../../../Http/ServerNode";
 import { JsonSerializer } from "../../../Mapping/Json/Serializer";
 import { TypeUtil } from "../../../Utility/TypeUtil";
 import * as stream from "readable-stream";
-import { ObjectTypeDescriptor, CompareExchangeResultClass } from "../../../Types";
+import { ObjectTypeDescriptor, CompareExchangeResultClass, ServerResponse, ServerCasing } from "../../../Types";
 import { IRaftCommand } from "../../../Http/IRaftCommand";
 import { RaftIdGenerator } from "../../../Utility/RaftIdGenerator";
 import { COMPARE_EXCHANGE, CONSTANTS } from "../../../Constants";
@@ -103,10 +103,9 @@ export class PutCompareExchangeValueCommand<T> extends RavenCommand<CompareExcha
     public async setResponseAsync(bodyStream: stream.Stream, fromCache: boolean): Promise<string> {
         let body: string = null;
 
-        const resObj = await this._pipeline<CompareExchangeResultResponse>()
+        const resObj = await this._pipeline<ServerCasing<ServerResponse<CompareExchangeResultResponse>>>()
             .collectBody(_ => body = _)
-            .parseJsonAsync()
-            .jsonKeysTransform("CompareExchangeValue", this._conventions)
+            .parseJsonSync()
             .process(bodyStream);
 
         const type = !TypeUtil.isPrimitive(this._value)
diff --git a/src/Mapping/Json/Streams/TransformJsonKeysProfiles.ts b/src/Mapping/Json/Streams/TransformJsonKeysProfiles.ts
@@ -5,7 +5,6 @@ import { throwError } from "../../../Exceptions";
 export type TransformJsonKeysProfile =
     "DocumentLoad"
     | "Patch"
-    | "CompareExchangeValue"
     | "SubscriptionResponsePayload"
     | "SubscriptionRevisionsResponsePayload";
 
@@ -33,17 +32,6 @@ export function getTransformJsonKeysProfile(
             };
         }
 
-        if (profile === "CompareExchangeValue") {
-            if (!conventions) {
-                throwError("InvalidArgumentException", "Document conventions are required for this profile.");
-            }
-
-            return {
-                getCurrentTransform:
-                    buildEntityKeysTransformForPutCompareExchangeValue(conventions.entityFieldNameConvention)
-            };
-        }
-
         if (profile === "SubscriptionResponsePayload") {
             if (!conventions) {
                 throwError("InvalidArgumentException", "Document conventions are required for this profile.");
@@ -118,52 +106,6 @@ function buildEntityKeysTransformForPatch(entityCasingConvention) {
     };
 }
 
-function buildEntityKeysTransformForPutCompareExchangeValue(entityCasingConvention) {
-    return function compareExchangeValueTransform(key, stack) {
-        const len = stack.length;
-        if (len === 1 || len === 2) {
-            // Results, Includes
-            return "camel";
-        }
-
-        // len === 2 is array index
-
-        if (len === 3) {
-            // top document level
-            return key === "@metadata" ? null : entityCasingConvention;
-        }
-
-        if (len === 4) {
-            if (stack[2] === "@metadata") {
-                // handle @metadata object keys
-                if (key[0] === "@" || key === "Raven-Node-Type") {
-                    return null;
-                }
-            }
-        }
-
-        if (len === 5) {
-            // do not touch @nested-object-types keys
-            if (stack[len - 2] === "@nested-object-types") {
-                return null;
-            }
-        }
-
-        if (len === 6) {
-            // @metadata.@attachments.[].name
-            if (stack[2] === "@metadata") {
-                 if (stack[3] === "@attachments") {
-                     return "camel";
-                 }
-
-                 return null;
-            }
-        }
-
-        return entityCasingConvention;
-    };
-}
-
 function buildEntityKeysTransformForSubscriptionResponsePayload(entityCasingConvention) {
     return function entityKeysTransform(key, stack) {
         const len = stack.length;
