[core-http] support x-ms-text via the new xmlIsMsText flag (Azure…

…#23631)
azure-sdk · Oct 28, 2022 · 48deccf · 48deccf
1 parent 0b91e87
commit 48deccf
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 3 deletions.
diff --git a/sdk/core/core-http/CHANGELOG.md b/sdk/core/core-http/CHANGELOG.md
@@ -1,9 +1,11 @@
 # Release History
 
-## 2.2.8 (Unreleased)
+## 2.3.0 (Unreleased)
 
 ### Features Added
 
+- add support for `x-ms-text`
+
 ### Breaking Changes
 
 ### Bugs Fixed

diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json
@@ -2,7 +2,7 @@
   "name": "@azure/core-http",
   "sdk-type": "client",
   "author": "Microsoft Corporation",
-  "version": "2.2.8",
+  "version": "2.3.0",
   "description": "Isomorphic client Runtime for Typescript/node.js/browser javascript client libraries generated using AutoRest",
   "tags": [
     "isomorphic",

diff --git a/sdk/core/core-http/review/core-http.api.md b/sdk/core/core-http/review/core-http.api.md
@@ -69,6 +69,7 @@ export interface BaseMapper {
     type: MapperType;
     xmlElementName?: string;
     xmlIsAttribute?: boolean;
+    xmlIsMsText?: boolean;
     xmlIsWrapped?: boolean;
     xmlName?: string;
     xmlNamespace?: string;

diff --git a/sdk/core/core-http/src/serializer.ts b/sdk/core/core-http/src/serializer.ts
@@ -885,6 +885,8 @@ function deserializeCompositeType(
           propertyObjectName,
           options
         );
+      } else if (propertyMapper.xmlIsMsText && responseBody[XML_CHARKEY] !== undefined) {
+        instance[key] = responseBody[XML_CHARKEY];
       } else {
         const propertyName = xmlElementName || xmlName || serializedName;
         if (propertyMapper.xmlIsWrapped) {
@@ -1302,6 +1304,10 @@ export interface BaseMapper {
    * Determines if the current property should be serialized as an attribute of the parent xml element
    */
   xmlIsAttribute?: boolean;
+  /**
+   * Determines if the current property should be serialized as the inner content of the xml element
+   */
+  xmlIsMsText?: boolean;
   /**
    * Name for the xml elements when serializing an array
    */

diff --git a/sdk/core/core-http/src/util/constants.ts b/sdk/core/core-http/src/util/constants.ts
@@ -7,7 +7,7 @@ export const Constants = {
   /**
    * The core-http version
    */
-  coreHttpVersion: "2.2.8",
+  coreHttpVersion: "2.3.0",
 
   /**
    * Specifies HTTP.

diff --git a/sdk/core/core-http/test/serializationTests.ts b/sdk/core/core-http/test/serializationTests.ts
@@ -1683,6 +1683,46 @@ describe("msrest", function () {
 
         assert.deepEqual(result, { cors: [] });
       });
+
+      it("should handle xmlIsMsText flag", function () {
+        const stringEncoded: msRest.CompositeMapper = {
+          serializedName: "StringEncoded",
+          type: {
+            name: "Composite",
+            className: "StringEncoded",
+            modelProperties: {
+              encoded: {
+                serializedName: "Encoded",
+                xmlName: "Encoded",
+                xmlIsAttribute: true,
+                type: {
+                  name: "Boolean",
+                },
+              },
+              content: {
+                serializedName: "content",
+                xmlName: "content",
+                xmlIsMsText: true,
+                type: {
+                  name: "String",
+                },
+              },
+            },
+          },
+        };
+
+        const mappers = {
+          StringEncoded: stringEncoded,
+        };
+        const serializer = new msRest.Serializer(mappers, true);
+        const result: any = serializer.deserialize(
+          stringEncoded,
+          { $: { Encoded: true }, _: "dir%EF%BF%BE0166562954291707607" },
+          "mockedStringEncoded"
+        );
+
+        assert.deepEqual(result, { encoded: true, content: "dir%EF%BF%BE0166562954291707607" });
+      });
     });
 
     describe("polymorphic composite type array", () => {