Skip to content

Parse decimals and ints with InvariantCulture since JSON/YAML doesn't vary by culture. #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2018
Merged

Parse decimals and ints with InvariantCulture since JSON/YAML doesn't vary by culture. #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Microsoft.OpenApi.Extensions;
using Microsoft.OpenApi.Interfaces;
Expand Down Expand Up @@ -191,7 +192,7 @@ private static string BuildUrl(string scheme, string host, string basePath)
{
var pieces = host.Split(':');
host = pieces.First();
port = int.Parse(pieces.Last());
port = int.Parse(pieces.Last(), CultureInfo.InvariantCulture);
}

var uriBuilder = new UriBuilder()
Expand Down
17 changes: 9 additions & 8 deletions src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT license.

using System;
using System.Globalization;
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Extensions;
using Microsoft.OpenApi.Models;
Expand Down Expand Up @@ -54,10 +55,10 @@ internal static partial class OpenApiV2Deserializer
GetOrCreateSchema(o).Default = n.CreateAny();
}
},
{
{
"maximum", (o, n) =>
{
GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue());
GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -69,7 +70,7 @@ internal static partial class OpenApiV2Deserializer
{
"minimum", (o, n) =>
{
GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue());
GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -81,13 +82,13 @@ internal static partial class OpenApiV2Deserializer
{
"maxLength", (o, n) =>
{
GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue());
GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minLength", (o, n) =>
{
GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue());
GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -99,13 +100,13 @@ internal static partial class OpenApiV2Deserializer
{
"maxItems", (o, n) =>
{
GetOrCreateSchema(o).MaxItems = int.Parse(n.GetScalarValue());
GetOrCreateSchema(o).MaxItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minItems", (o, n) =>
{
GetOrCreateSchema(o).MinItems = int.Parse(n.GetScalarValue());
GetOrCreateSchema(o).MinItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -117,7 +118,7 @@ internal static partial class OpenApiV2Deserializer
{
"multipleOf", (o, n) =>
{
GetOrCreateSchema(o).MultipleOf = decimal.Parse(n.GetScalarValue());
GetOrCreateSchema(o).MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand Down
9 changes: 5 additions & 4 deletions src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Globalization;
using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Extensions;
using Microsoft.OpenApi.Models;
Expand Down Expand Up @@ -90,25 +91,25 @@ internal static partial class OpenApiV2Deserializer
{
"minimum", (o, n) =>
{
GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue());
GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"maximum", (o, n) =>
{
GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue());
GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"maxLength", (o, n) =>
{
GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue());
GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minLength", (o, n) =>
{
GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue());
GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand Down
19 changes: 10 additions & 9 deletions src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi.Readers.ParseNodes;
using System.Collections.Generic;
using System.Globalization;

namespace Microsoft.OpenApi.Readers.V2
{
Expand All @@ -26,13 +27,13 @@ internal static partial class OpenApiV2Deserializer
{
"multipleOf", (o, n) =>
{
o.MultipleOf = decimal.Parse(n.GetScalarValue());
o.MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"maximum", (o, n) =>
{
o.Maximum = decimal.Parse(n.GetScalarValue());
o.Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -44,7 +45,7 @@ internal static partial class OpenApiV2Deserializer
{
"minimum", (o, n) =>
{
o.Minimum = decimal.Parse(n.GetScalarValue());
o.Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -56,13 +57,13 @@ internal static partial class OpenApiV2Deserializer
{
"maxLength", (o, n) =>
{
o.MaxLength = int.Parse(n.GetScalarValue());
o.MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minLength", (o, n) =>
{
o.MinLength = int.Parse(n.GetScalarValue());
o.MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -74,13 +75,13 @@ internal static partial class OpenApiV2Deserializer
{
"maxItems", (o, n) =>
{
o.MaxItems = int.Parse(n.GetScalarValue());
o.MaxItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minItems", (o, n) =>
{
o.MinItems = int.Parse(n.GetScalarValue());
o.MinItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -92,13 +93,13 @@ internal static partial class OpenApiV2Deserializer
{
"maxProperties", (o, n) =>
{
o.MaxProperties = int.Parse(n.GetScalarValue());
o.MaxProperties = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minProperties", (o, n) =>
{
o.MinProperties = int.Parse(n.GetScalarValue());
o.MinProperties = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand Down
19 changes: 10 additions & 9 deletions src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Microsoft.OpenApi.Models;
using Microsoft.OpenApi.Readers.ParseNodes;
using System.Collections.Generic;
using System.Globalization;

namespace Microsoft.OpenApi.Readers.V3
{
Expand All @@ -26,13 +27,13 @@ internal static partial class OpenApiV3Deserializer
{
"multipleOf", (o, n) =>
{
o.MultipleOf = decimal.Parse(n.GetScalarValue());
o.MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"maximum", (o, n) =>
{
o.Maximum = decimal.Parse(n.GetScalarValue());
o.Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -44,7 +45,7 @@ internal static partial class OpenApiV3Deserializer
{
"minimum", (o, n) =>
{
o.Minimum = decimal.Parse(n.GetScalarValue());
o.Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -56,13 +57,13 @@ internal static partial class OpenApiV3Deserializer
{
"maxLength", (o, n) =>
{
o.MaxLength = int.Parse(n.GetScalarValue());
o.MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minLength", (o, n) =>
{
o.MinLength = int.Parse(n.GetScalarValue());
o.MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -74,13 +75,13 @@ internal static partial class OpenApiV3Deserializer
{
"maxItems", (o, n) =>
{
o.MaxItems = int.Parse(n.GetScalarValue());
o.MaxItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minItems", (o, n) =>
{
o.MinItems = int.Parse(n.GetScalarValue());
o.MinItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand All @@ -92,13 +93,13 @@ internal static partial class OpenApiV3Deserializer
{
"maxProperties", (o, n) =>
{
o.MaxProperties = int.Parse(n.GetScalarValue());
o.MaxProperties = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
"minProperties", (o, n) =>
{
o.MinProperties = int.Parse(n.GetScalarValue());
o.MinProperties = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
}
},
{
Expand Down
73 changes: 73 additions & 0 deletions test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// Licensed under the MIT license.

using System.Collections.Generic;
using System.Globalization;
using System.Threading;
using FluentAssertions;
using Microsoft.OpenApi.Exceptions;
using Microsoft.OpenApi.Models;
Expand Down Expand Up @@ -66,5 +68,76 @@ public void ShouldThrowWhenReferenceDoesNotExist()
new OpenApiError( new OpenApiException("Invalid Reference identifier 'doesnotexist'.")) });
doc.Should().NotBeNull();
}

[Theory]
[InlineData("en-US")]
[InlineData("hi-IN")]
// The equivalent of English 1,000.36 in French and Danish is 1.000,36
[InlineData("fr-FR")]
[InlineData("da-DK")]
public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
{
Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);

var openApiDoc = new OpenApiStringReader().Read(
@"
swagger: 2.0
info:
title: Simple Document
version: 0.9.1
definitions:
sampleSchema:
type: object
properties:
sampleProperty:
type: double
minimum: 100.54
maximum: 60,000,000.35
exclusiveMaximum: true
exclusiveMinimum: false
paths: {}",
out var context);

openApiDoc.ShouldBeEquivalentTo(
new OpenApiDocument
{
Info = new OpenApiInfo
{
Title = "Simple Document",
Version = "0.9.1"
},
Components = new OpenApiComponents()
{
Schemas =
{
["sampleSchema"] = new OpenApiSchema()
{
Type = "object",
Properties =
{
["sampleProperty"] = new OpenApiSchema()
{
Type = "double",
Minimum = (decimal)100.54,
Maximum = (decimal)60000000.35,
ExclusiveMaximum = true,
ExclusiveMinimum = false
}
},
Reference = new OpenApiReference()
{
Id = "sampleSchema",
Type = ReferenceType.Schema
}
}
}
},
Paths = new OpenApiPaths()
});

context.ShouldBeEquivalentTo(
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi2_0 });
}
}
}
Loading