diff --git a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs index c3b8e8f1..fd332fa9 100644 --- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs +++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -8,6 +8,7 @@ using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Writers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Stef.Validation; using WireMock.Admin.Mappings; using WireMock.Net.OpenApiParser.Extensions; using WireMock.Net.OpenApiParser.Settings; @@ -23,7 +24,7 @@ namespace WireMock.Net.OpenApiParser.Mappers public OpenApiPathsMapper(WireMockOpenApiParserSettings settings) { - _settings = settings ?? throw new ArgumentNullException(nameof(settings)); + _settings = Guard.NotNull(settings, nameof(settings)); _exampleValueGenerator = new ExampleValueGenerator(settings); } @@ -243,7 +244,7 @@ namespace WireMock.Net.OpenApiParser.Mappers } else { - bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x); + // bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x); return new JProperty(key, _exampleValueGenerator.GetExampleValue(openApiSchema)); } } @@ -271,11 +272,11 @@ namespace WireMock.Net.OpenApiParser.Mappers } OpenApiServer server = servers.First(); - Uri uriResult; - if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out uriResult)) + if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out Uri uriResult)) { return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString(); } + return string.Empty; } diff --git a/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs b/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs index a9073f87..64f8406f 100644 --- a/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs +++ b/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs @@ -105,6 +105,7 @@ namespace WireMock.Net.OpenApiParser.Utils } } } + private static IOpenApiAny GetRandomEnumValue(IList schemaEnum) { if (schemaEnum?.Count > 0) @@ -113,7 +114,8 @@ namespace WireMock.Net.OpenApiParser.Utils int randomEnum = new Random().Next(0, maxValue); return schemaEnum[randomEnum]; } + return null; } } -} +} \ No newline at end of file