Merge pull request #528 from WillGunn/AllowWriteOpenApiStringAsRaw

Allow OpenApiString's raw value to be written by the OpenApiWriter

Author: darrelmiller

src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs

@@ -70,7 +70,10 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
 
                 case PrimitiveType.String:
                     var stringValue = (OpenApiString)(IOpenApiPrimitive)this;
-                    writer.WriteValue(stringValue.Value);
+                    if (stringValue.IsRawString())
+                        writer.WriteRaw(stringValue.Value);
+                    else
+                        writer.WriteValue(stringValue.Value);
                     break;
 
                 case PrimitiveType.Byte:

src/Microsoft.OpenApi/Any/OpenApiString.cs

@@ -9,6 +9,7 @@ namespace Microsoft.OpenApi.Any
     public class OpenApiString : OpenApiPrimitive<string>
     {
         private bool isExplicit;
+        private bool isRawString;
 
         /// <summary>
         /// Initializes the <see cref="OpenApiString"/> class.
@@ -30,6 +31,19 @@ public OpenApiString(string value, bool isExplicit)
             this.isExplicit = isExplicit;
         }
 
+        /// <summary>
+        /// Initializes the <see cref="OpenApiString"/> class.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="isExplicit">Used to indicate if a string is quoted.</param>
+        /// <param name="isRawString">Used to indicate to the writer that the value should be written without encoding.</param>
+        public OpenApiString(string value, bool isExplicit, bool isRawString)
+            : base(value)
+        {
+            this.isExplicit = isExplicit;
+            this.isRawString = isRawString;
+        }
+
         /// <summary>
         /// The primitive class this object represents.
         /// </summary>
@@ -42,5 +56,13 @@ public bool IsExplicit()
         {
             return this.isExplicit;
         }
+
+        /// <summary>
+        /// True if the writer should process the value as supplied without encoding.
+        /// </summary>
+        public bool IsRawString()
+        {
+            return this.isRawString;
+        }
     }
 }

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

@@ -99,8 +99,10 @@ namespace Microsoft.OpenApi.Any
     {
         public OpenApiString(string value) { }
         public OpenApiString(string value, bool isExplicit) { }
+        public OpenApiString(string value, bool isExplicit, bool isRawString) { }
         public override Microsoft.OpenApi.Any.PrimitiveType PrimitiveType { get; }
         public bool IsExplicit() { }
+        public bool IsRawString() { }
     }
     public enum PrimitiveType
     {