replace decimal.Parse with double.Parse to include support for parsing values exceeding range of decimal

Afsalmc · Afsalmc · commit 159271032f79 · 2022-12-13T22:19:34.000+05:30
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -57,7 +57,7 @@ internal static partial class OpenApiV2Deserializer
             {
                 "maximum", (o, n) =>
                 {
-                    GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                    GetOrCreateSchema(o).Maximum = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
                 }
             },
             {
@@ -69,7 +69,7 @@ internal static partial class OpenApiV2Deserializer
             {
                 "minimum", (o, n) =>
                 {
-                    GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                    GetOrCreateSchema(o).Minimum = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
                 }
             },
             {
@@ -117,7 +117,7 @@ internal static partial class OpenApiV2Deserializer
             {
                 "multipleOf", (o, n) =>
                 {
-                    GetOrCreateSchema(o).MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                    GetOrCreateSchema(o).MultipleOf = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
                 }
             },
             {
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs
@@ -82,13 +82,13 @@ internal static partial class OpenApiV2Deserializer
                 {
                     "minimum", (o, n) =>
                     {
-                        GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                        GetOrCreateSchema(o).Minimum = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
                     }
                 },
                 {
                     "maximum", (o, n) =>
                     {
-                        GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                        GetOrCreateSchema(o).Maximum = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
                     }
                 },
                 {
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs
@@ -26,13 +26,13 @@ internal static partial class OpenApiV2Deserializer
             {
                 "multipleOf", (o, n) =>
                 {
-                    o.MultipleOf = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
+                    o.MultipleOf = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
                 "maximum", (o, n) =>
                 {
-                    o.Maximum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
+                    o.Maximum = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
@@ -44,7 +44,7 @@ internal static partial class OpenApiV2Deserializer
             {
                 "minimum", (o, n) =>
                 {
-                    o.Minimum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
+                    o.Minimum = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs
@@ -27,13 +27,13 @@ internal static partial class OpenApiV3Deserializer
             {
                 "multipleOf", (o, n) =>
                 {
-                    o.MultipleOf = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture); 
+                    o.MultipleOf = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture); 
                 }
             },
             {
                 "maximum", (o, n) =>
                 {
-                    o.Maximum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
+                    o.Maximum = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
@@ -45,7 +45,7 @@ internal static partial class OpenApiV3Deserializer
             {
                 "minimum", (o, n) =>
                 {
-                    o.Minimum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
+                    o.Minimum = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -41,7 +41,7 @@ public class OpenApiSchema : IOpenApiSerializable, IOpenApiReferenceable, IEffec
         /// <summary>
         /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
         /// </summary>
-        public decimal? Maximum { get; set; }
+        public double? Maximum { get; set; }
 
         /// <summary>
         /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
@@ -51,7 +51,7 @@ public class OpenApiSchema : IOpenApiSerializable, IOpenApiReferenceable, IEffec
         /// <summary>
         /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
         /// </summary>
-        public decimal? Minimum { get; set; }
+        public double? Minimum { get; set; }
 
         /// <summary>
         /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
@@ -77,7 +77,7 @@ public class OpenApiSchema : IOpenApiSerializable, IOpenApiReferenceable, IEffec
         /// <summary>
         /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
         /// </summary>
-        public decimal? MultipleOf { get; set; }
+        public double? MultipleOf { get; set; }
 
         /// <summary>
         /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
diff --git a/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs b/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs
@@ -39,9 +39,9 @@ public interface IOpenApiWriter
         void WriteValue(string value);
 
         /// <summary>
-        /// Write the decimal value.
+        /// Write the double value.
         /// </summary>
-        void WriteValue(decimal value);
+        void WriteValue(double value);
 
         /// <summary>
         /// Write the int value.
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs
@@ -148,9 +148,11 @@ public virtual void WriteValue(double value)
         }
 
         /// <summary>
-        /// Write decimal value.
+        /// Write 
+        /// 
+        /// value.
         /// </summary>
-        /// <param name="value">The decimal value.</param>
+        /// <param name="value">The double value.</param>
         public virtual void WriteValue(decimal value)
         {
             WriteValueSeparator();
diff --git a/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs b/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs
@@ -187,10 +187,12 @@ internal static string GetYamlCompatibleString(this string input)
                 return $"'{input}'";
             }
 
-            // If string can be mistaken as a number, c-style hexadecimal notation, a boolean, or a timestamp,
-            // wrap it in quote to indicate that this is indeed a string, not a number, c-style hexadecimal notation, a boolean, or a timestamp
-            if (decimal.TryParse(input, NumberStyles.Float, CultureInfo.InvariantCulture, out var _) ||
-                IsHexadecimalNotation(input) ||
+            // If string can be mistaken as a number, c-style hexa
+            //
+            // notation, a boolean, or a timestamp,
+            // wrap it in quote to indicate that this is indeed a string, not a number, c-style hexadouble notation, a boolean, or a timestamp
+            if (double.TryParse(input, NumberStyles.Float, CultureInfo.InvariantCulture, out var _) ||
+                IsHexadoubleNotation(input) ||
                 bool.TryParse(input, out var _) ||
                 DateTime.TryParse(input, CultureInfo.InvariantCulture, DateTimeStyles.None, out var _))
             {
@@ -227,7 +229,7 @@ internal static string GetJsonCompatibleString(this string value)
             return $"\"{value}\"";
         }
 
-        internal static bool IsHexadecimalNotation(string input)
+        internal static bool IsHexadoubleNotation(string input)
         {
             return input.StartsWith("0x") && int.TryParse(input.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var _);
         }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
@@ -134,8 +134,8 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
                                     ["sampleProperty"] = new OpenApiSchema()
                                     {
                                         Type = "double",
-                                        Minimum = (decimal)100.54,
-                                        Maximum = (decimal)60000000.35,
+                                        Minimum = (double)100.54,
+                                        Maximum = (double)60000000.35,
                                         ExclusiveMaximum = true,
                                         ExclusiveMinimum = false
                                     }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
@@ -157,8 +157,8 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
                                     ["sampleProperty"] = new OpenApiSchema()
                                     {
                                         Type = "double",
-                                        Minimum = (decimal)100.54,
-                                        Maximum = (decimal)60000000.35,
+                                        Minimum = (double)100.54,
+                                        Maximum = (double)60000000.35,
                                         ExclusiveMaximum = true,
                                         ExclusiveMinimum = false
                                     }
diff --git a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt
@@ -853,12 +853,13 @@ namespace Microsoft.OpenApi.Models
         public int? MaxItems { get; set; }
         public int? MaxLength { get; set; }
         public int? MaxProperties { get; set; }
-        public decimal? Maximum { get; set; }
+        public 
+        ? Maximum { get; set; }
         public int? MinItems { get; set; }
         public int? MinLength { get; set; }
         public int? MinProperties { get; set; }
-        public decimal? Minimum { get; set; }
-        public decimal? MultipleOf { get; set; }
+        public double? Minimum { get; set; }
+        public double? MultipleOf { get; set; }
         public Microsoft.OpenApi.Models.OpenApiSchema Not { get; set; }
         public bool Nullable { get; set; }
         public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiSchema> OneOf { get; set; }
@@ -1404,7 +1405,7 @@ namespace Microsoft.OpenApi.Writers
         void WriteStartArray();
         void WriteStartObject();
         void WriteValue(bool value);
-        void WriteValue(decimal value);
+        void WriteValue(double value);
         void WriteValue(int value);
         void WriteValue(object value);
         void WriteValue(string value);
@@ -1467,7 +1468,7 @@ namespace Microsoft.OpenApi.Writers
         public virtual void WriteValue(bool value) { }
         public virtual void WriteValue(System.DateTime value) { }
         public virtual void WriteValue(System.DateTimeOffset value) { }
-        public virtual void WriteValue(decimal value) { }
+        public virtual void WriteValue(double value) { }
         public virtual void WriteValue(double value) { }
         public virtual void WriteValue(int value) { }
         public virtual void WriteValue(long value) { }
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs
@@ -188,7 +188,7 @@ private void WriteValueRecursive(OpenApiJsonWriter writer, object value)
         {
             if (value == null
                 || value.GetType().IsPrimitive
-                || value is decimal
+                || value is double
                 || value is string
                 || value is DateTimeOffset
                 || value is DateTime)
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs
@@ -256,7 +256,7 @@ private void WriteValueRecursive(OpenApiYamlWriter writer, object value)
         {
             if (value == null
                 || value.GetType().IsPrimitive
-                || value is decimal
+                || value is double
                 || value is string
                 || value is DateTimeOffset
                 || value is DateTime)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) Microsoft Corporation. All rights reserved.`
	`1`	`+// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT license.`
`3`	`3`
`4`	`4`	`using System;`
`@@ -57,7 +57,7 @@ internal static partial class OpenApiV2Deserializer`
`57`	`57`	`{`
`58`	`58`	`"maximum", (o, n) =>`
`59`	`59`	`{`
`60`		`- GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`60`	`+ GetOrCreateSchema(o).Maximum = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
`61`	`61`	`}`
`62`	`62`	`},`
`63`	`63`	`{`
`@@ -69,7 +69,7 @@ internal static partial class OpenApiV2Deserializer`
`69`	`69`	`{`
`70`	`70`	`"minimum", (o, n) =>`
`71`	`71`	`{`
`72`		`- GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`72`	`+ GetOrCreateSchema(o).Minimum = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
`73`	`73`	`}`
`74`	`74`	`},`
`75`	`75`	`{`
`@@ -117,7 +117,7 @@ internal static partial class OpenApiV2Deserializer`
`117`	`117`	`{`
`118`	`118`	`"multipleOf", (o, n) =>`
`119`	`119`	`{`
`120`		`- GetOrCreateSchema(o).MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`120`	`+ GetOrCreateSchema(o).MultipleOf = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
`121`	`121`	`}`
`122`	`122`	`},`
`123`	`123`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,13 +82,13 @@ internal static partial class OpenApiV2Deserializer`
`82`	`82`	`{`
`83`	`83`	`"minimum", (o, n) =>`
`84`	`84`	`{`
`85`		`- GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`85`	`+ GetOrCreateSchema(o).Minimum = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
`86`	`86`	`}`
`87`	`87`	`},`
`88`	`88`	`{`
`89`	`89`	`"maximum", (o, n) =>`
`90`	`90`	`{`
`91`		`- GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`91`	`+ GetOrCreateSchema(o).Maximum = double.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
`92`	`92`	`}`
`93`	`93`	`},`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ internal static partial class OpenApiV2Deserializer`
`26`	`26`	`{`
`27`	`27`	`"multipleOf", (o, n) =>`
`28`	`28`	`{`
`29`		`- o.MultipleOf = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
	`29`	`+ o.MultipleOf = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`30`	`30`	`}`
`31`	`31`	`},`
`32`	`32`	`{`
`33`	`33`	`"maximum", (o, n) =>`
`34`	`34`	`{`
`35`		`- o.Maximum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
	`35`	`+ o.Maximum = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`36`	`36`	`}`
`37`	`37`	`},`
`38`	`38`	`{`
`@@ -44,7 +44,7 @@ internal static partial class OpenApiV2Deserializer`
`44`	`44`	`{`
`45`	`45`	`"minimum", (o, n) =>`
`46`	`46`	`{`
`47`		`- o.Minimum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
	`47`	`+ o.Minimum = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`48`	`48`	`}`
`49`	`49`	`},`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ internal static partial class OpenApiV3Deserializer`
`27`	`27`	`{`
`28`	`28`	`"multipleOf", (o, n) =>`
`29`	`29`	`{`
`30`		`- o.MultipleOf = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
	`30`	`+ o.MultipleOf = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`31`	`31`	`}`
`32`	`32`	`},`
`33`	`33`	`{`
`34`	`34`	`"maximum", (o, n) =>`
`35`	`35`	`{`
`36`		`- o.Maximum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
	`36`	`+ o.Maximum = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`{`
`@@ -45,7 +45,7 @@ internal static partial class OpenApiV3Deserializer`
`45`	`45`	`{`
`46`	`46`	`"minimum", (o, n) =>`
`47`	`47`	`{`
`48`		`- o.Minimum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
	`48`	`+ o.Minimum = double.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`49`	`49`	`}`
`50`	`50`	`},`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -148,9 +148,11 @@ public virtual void WriteValue(double value)`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/// <summary>`
`151`		`- /// Write decimal value.`
	`151`	`+ /// Write`
	`152`	`+ ///`
	`153`	`+ /// value.`
`152`	`154`	`/// </summary>`
`153`		`- /// <param name="value">The decimal value.</param>`
	`155`	`+ /// <param name="value">The double value.</param>`
`154`	`156`	`public virtual void WriteValue(decimal value)`
`155`	`157`	`{`
`156`	`158`	`WriteValueSeparator();`
Original file line number	Diff line number	Diff line change
`@@ -187,10 +187,12 @@ internal static string GetYamlCompatibleString(this string input)`
`187`	`187`	`return $"'{input}'";`
`188`	`188`	`}`
`189`	`189`
`190`		`- // If string can be mistaken as a number, c-style hexadecimal notation, a boolean, or a timestamp,`
`191`		`- // wrap it in quote to indicate that this is indeed a string, not a number, c-style hexadecimal notation, a boolean, or a timestamp`
`192`		`- if (decimal.TryParse(input, NumberStyles.Float, CultureInfo.InvariantCulture, out var _) \|\|`
`193`		`- IsHexadecimalNotation(input) \|\|`
	`190`	`+ // If string can be mistaken as a number, c-style hexa`
	`191`	`+ //`
	`192`	`+ // notation, a boolean, or a timestamp,`
	`193`	`+ // wrap it in quote to indicate that this is indeed a string, not a number, c-style hexadouble notation, a boolean, or a timestamp`
	`194`	`+ if (double.TryParse(input, NumberStyles.Float, CultureInfo.InvariantCulture, out var _) \|\|`
	`195`	`+ IsHexadoubleNotation(input) \|\|`
`194`	`196`	`bool.TryParse(input, out var _) \|\|`
`195`	`197`	`DateTime.TryParse(input, CultureInfo.InvariantCulture, DateTimeStyles.None, out var _))`
`196`	`198`	`{`
`@@ -227,7 +229,7 @@ internal static string GetJsonCompatibleString(this string value)`
`227`	`229`	`return $"\"{value}\"";`
`228`	`230`	`}`
`229`	`231`
`230`		`- internal static bool IsHexadecimalNotation(string input)`
	`232`	`+ internal static bool IsHexadoubleNotation(string input)`
`231`	`233`	`{`
`232`	`234`	`return input.StartsWith("0x") && int.TryParse(input.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var _);`
`233`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)`
`134`	`134`	`["sampleProperty"] = new OpenApiSchema()`
`135`	`135`	`{`
`136`	`136`	`Type = "double",`
`137`		`- Minimum = (decimal)100.54,`
`138`		`- Maximum = (decimal)60000000.35,`
	`137`	`+ Minimum = (double)100.54,`
	`138`	`+ Maximum = (double)60000000.35,`
`139`	`139`	`ExclusiveMaximum = true,`
`140`	`140`	`ExclusiveMinimum = false`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,8 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)`
`157`	`157`	`["sampleProperty"] = new OpenApiSchema()`
`158`	`158`	`{`
`159`	`159`	`Type = "double",`
`160`		`- Minimum = (decimal)100.54,`
`161`		`- Maximum = (decimal)60000000.35,`
	`160`	`+ Minimum = (double)100.54,`
	`161`	`+ Maximum = (double)60000000.35,`
`162`	`162`	`ExclusiveMaximum = true,`
`163`	`163`	`ExclusiveMinimum = false`
`164`	`164`	`}`