Merge branch 'main' into v2

justinyoo · justinyoo · commit 86fa8cc786cd · 2023-01-26T10:48:48.000+09:00
diff --git a/docs/openapi-core.md b/docs/openapi-core.md
@@ -117,7 +117,7 @@ public class MyOpenApiConfigurationOptions : IOpenApiConfigurationOptions
 ```
 
 > **NOTE**:
-> 
+>
 > * If no base URL is declared, the Azure Functions app's URL will be added as a default.
 > * The OpenAPI v2 (Swagger) document only shows the the first server name on both UI and document, while the OpenAPI v3 document shows the first server name on the UI and all server names on the document.
 
@@ -896,7 +896,7 @@ Properties decorated with the `JsonIgnoreAttribute` attribute class will not be
 
 ### `JsonPropertyAttribute` ###
 
-Properties decorated with `JsonPropertyAttribute` attribute class will use `JsonProperty.Name` value instead of their property names. In addition to this, if `JsonProperty.Required` property has `Required.Always` or `Required.DisallowNull`, the property will be recognised as the `required` field.
+Properties decorated with `JsonPropertyAttribute` attribute class will use `JsonProperty.Name` value instead of their property names. In addition to this, if `JsonProperty.Required` property has `Required.Always` or `Required.AllowNull`, the property will be recognised as the `required` field.
 
 
 ### `JsonRequiredAttribute` ###
diff --git a/src/Microsoft.Azure.Functions.Worker.Extensions.OpenApi/Extensions/DocumentHelperExtensions.cs b/src/Microsoft.Azure.Functions.Worker.Extensions.OpenApi/Extensions/DocumentHelperExtensions.cs
@@ -157,7 +157,7 @@ public static List<OpenApiParameter> GetOpenApiParameters(this IDocumentHelper h
         {
             var parameters = element.GetCustomAttributes<OpenApiParameterAttribute>(inherit: false)
                                     .Where(p => p.Deprecated == false)
-                                    .Select(p => p.ToOpenApiParameter(namingStrategy, collection))
+                                    .Select(p => p.ToOpenApiParameter(namingStrategy, collection, version))
                                     .ToList();
 
             // This is the interim solution to resolve:
diff --git a/src/Microsoft.Azure.Functions.Worker.Extensions.OpenApi/Extensions/OpenApiHttpRequestDataExtensions.cs b/src/Microsoft.Azure.Functions.Worker.Extensions.OpenApi/Extensions/OpenApiHttpRequestDataExtensions.cs
@@ -2,7 +2,13 @@
 using System.Linq;
 
 using Microsoft.AspNetCore.Http;
+
+#if NETSTANDARD2_0
+
 using Microsoft.AspNetCore.Http.Internal;
+
+#endif
+
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions;
diff --git a/src/Microsoft.Azure.Functions.Worker.Extensions.OpenApi/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.csproj b/src/Microsoft.Azure.Functions.Worker.Extensions.OpenApi/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\builds\worker.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -21,13 +21,29 @@
     <VersionSuffix></VersionSuffix> -->
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+  <PropertyGroup Condition="'$(Configuration)'=='Debug' And '$(TargetFramework)'=='netstandard2.0'">
     <DocumentationFile>bin\Debug\netstandard2.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug' And '$(TargetFramework)'=='net6.0'">
+    <DocumentationFile>bin\Debug\net6.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug' And '$(TargetFramework)'=='net7.0'">
+    <DocumentationFile>bin\Debug\net7.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
+  </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+  <PropertyGroup Condition="'$(Configuration)'=='Release' And '$(TargetFramework)'=='netstandard2.0'">
     <DocumentationFile>bin\Release\netstandard2.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release' And '$(TargetFramework)'=='net6.0'">
+    <DocumentationFile>bin\Release\net6.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release' And '$(TargetFramework)'=='net7.0'">
+    <DocumentationFile>bin\Release\net7.0\Microsoft.Azure.Functions.Worker.Extensions.OpenApi.xml</DocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)'!='netstandard2.0' ">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
 
   <ItemGroup>
     <!--<FrameworkReference Include="Microsoft.AspNetCore.App" />-->
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Extensions/DocumentHelperExtensions.cs b/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Extensions/DocumentHelperExtensions.cs
@@ -152,7 +152,7 @@ public static List<OpenApiParameter> GetOpenApiParameters(this IDocumentHelper h
         {
             var parameters = element.GetCustomAttributes<OpenApiParameterAttribute>(inherit: false)
                                     .Where(p => p.Deprecated == false)
-                                    .Select(p => p.ToOpenApiParameter(namingStrategy, collection))
+                                    .Select(p => p.ToOpenApiParameter(namingStrategy, collection, version))
                                     .ToList();
 
             // This is the interim solution to resolve:
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/ObjectTypeVisitor.cs b/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/ObjectTypeVisitor.cs
@@ -189,7 +189,7 @@ private void ProcessProperties(IOpenApiSchemaAcceptor instance, string schemaNam
             // Add required properties to schema.
             var jsonPropertyAttributes = properties.Where(p => !p.Value.GetCustomAttribute<JsonPropertyAttribute>(inherit: false).IsNullOrDefault())
                                                    .Select(p => new KeyValuePair<string, JsonPropertyAttribute>(p.Key, p.Value.GetCustomAttribute<JsonPropertyAttribute>(inherit: false)))
-                                                   .Where(p => p.Value.Required == Required.Always || p.Value.Required == Required.DisallowNull);
+                                                   .Where(p => p.Value.Required == Required.Always || p.Value.Required == Required.AllowNull);
             foreach (var attribute in jsonPropertyAttributes)
             {
                 instance.Schemas[schemaName].Required.Add(attribute.Key);
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/OpenApiSchemaAcceptor.cs b/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/OpenApiSchemaAcceptor.cs
@@ -8,6 +8,7 @@
 using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Extensions;
 using Microsoft.OpenApi.Models;
 
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Visitors
@@ -63,6 +64,7 @@ public void Accept(VisitorCollection collection, NamingStrategy namingStrategy)
                         property.Value.GetCustomAttribute<OpenApiPropertyAttribute>(inherit: false),
                     };
                     attributes.AddRange(property.Value.GetCustomAttributes<ValidationAttribute>(inherit: false));
+                    attributes.AddRange(property.Value.GetCustomAttributes<JsonPropertyAttribute>(inherit: false));
 
                     foreach (var visitor in collection.Visitors)
                     {
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/RecursiveObjectTypeVisitor.cs b/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/RecursiveObjectTypeVisitor.cs
@@ -195,7 +195,7 @@ private void ProcessProperties(IOpenApiSchemaAcceptor instance, string schemaNam
             // Add required properties to schema.
             var jsonPropertyAttributes = properties.Where(p => !p.Value.GetCustomAttribute<JsonPropertyAttribute>(inherit: false).IsNullOrDefault())
                                                    .Select(p => new KeyValuePair<string, JsonPropertyAttribute>(p.Key, p.Value.GetCustomAttribute<JsonPropertyAttribute>(inherit: false)))
-                                                   .Where(p => p.Value.Required == Required.Always || p.Value.Required == Required.DisallowNull);
+                                                   .Where(p => p.Value.Required == Required.Always || p.Value.Required == Required.AllowNull);
             foreach (var attribute in jsonPropertyAttributes)
             {
                 instance.Schemas[schemaName].Required.Add(attribute.Key);
diff --git a/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/TypeVisitor.cs b/src/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core/Visitors/TypeVisitor.cs
@@ -9,6 +9,7 @@
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Visitors
@@ -148,9 +149,9 @@ protected string Visit(IAcceptor acceptor, string name, string title, string dat
                 {
                     if (dataType != "object")
                     {
-                        schema.Nullable = this.GetOpenApiPropertyNullable(attr as OpenApiPropertyAttribute);
                         schema.Default = this.GetOpenApiPropertyDefault(attr as OpenApiPropertyAttribute);
                     }
+                    schema.Nullable = this.GetOpenApiPropertyNullable(attr as OpenApiPropertyAttribute);
                     schema.Description = this.GetOpenApiPropertyDescription(attr as OpenApiPropertyAttribute);
                     schema.Deprecated = this.GetOpenApiPropertyDeprecated(attr as OpenApiPropertyAttribute);
                 }
@@ -163,6 +164,12 @@ protected string Visit(IAcceptor acceptor, string name, string title, string dat
                     schema.Extensions.Add("x-ms-visibility", extension);
                 }
 
+                attr = attributes.OfType<JsonPropertyAttribute>().SingleOrDefault();
+                if (!attr.IsNullOrDefault())
+                {
+                    schema.Nullable = this.GetNewtonsoftPropertNullable(attr as JsonPropertyAttribute);
+                }
+
                 schema.ApplyValidationAttributes(attributes.OfType<ValidationAttribute>());
             }
 
@@ -375,7 +382,6 @@ protected string GetOpenApiPropertyDescription(OpenApiPropertyAttribute attr)
             return attr.Description;
         }
 
-
         /// <summary>
         /// Gets the property deprecated.
         /// </summary>
@@ -385,5 +391,15 @@ protected bool GetOpenApiPropertyDeprecated(OpenApiPropertyAttribute attr)
         {
             return attr.Deprecated;
         }
+
+        /// <summary>
+        /// Gets whether Newtonsoft Serialization allows nullability based on the JsonPropertyAttribute
+        /// </summary>
+        /// <param name="attr"><see cref="JsonPropertyAttribute"/> instance.</param>
+        /// <returns>Returns the property deprecated.</returns>
+        private bool GetNewtonsoftPropertNullable(JsonPropertyAttribute attr)
+        {
+            return attr.Required == Required.AllowNull || attr.Required == Required.Default;
+        }
     }
 }
diff --git a/test/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.Tests/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.Tests.csproj b/test/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.Tests/Microsoft.Azure.Functions.Worker.Extensions.OpenApi.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes/FakeModel.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes/FakeModel.cs
@@ -24,6 +24,12 @@ public class FakeModel
         [JsonProperty(Required = Required.Default)]
         public string FakePropertyNoPropertyValue { get; set; }
 
+        [JsonProperty(Required = Required.AllowNull)]
+        public string FakePropertyRequiredAllowNullPropertyValue { get; set; }
+
+        [JsonProperty(Required = Required.DisallowNull)]
+        public string FakePropertyRequiredDisallowAllowNullPropertyValue { get; set; }
+
         [JsonProperty]
         public string FakePropertyNoAnnotation { get; set; }
 
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes/FakeRecursiveModel.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Fakes/FakeRecursiveModel.cs
@@ -15,5 +15,17 @@ public class FakeRecursiveModel
         public FakeOtherClassModel FirstValue { get; set; }
 
         public FakeOtherClassModel SecondValue { get; set; }
+
+        [JsonProperty(Required = Required.Always)]
+        public string FakeAlwaysRequiredProperty { get; set; }
+
+        [JsonProperty(Required = Required.Default)]
+        public string FakePropertyNoPropertyValue { get; set; }
+
+        [JsonProperty(Required = Required.AllowNull)]
+        public string FakePropertyRequiredAllowNullPropertyValue { get; set; }
+
+        [JsonProperty(Required = Required.DisallowNull)]
+        public string FakePropertyRequiredDisallowAllowNullPropertyValue { get; set; }
     }
 }
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/OpenApiParameterAttributeExtensionsTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Extensions/OpenApiParameterAttributeExtensionsTests.cs
@@ -225,5 +225,24 @@ public void Given_Value_With_Deprecated_When_ToOpenApiParameter_Invoked_Then_It_
 
             result.Deprecated.Should().Be(deprecated.GetValueOrDefault());
         }
+
+        [TestMethod]
+        public void Given_Value_With_Examples_When_ToOpenApiParameter_Invoked_With_OpenApi_V3_Then_It_Should_Return_Result()
+        {
+            var attribute = new OpenApiParameterAttribute("hello")
+            {
+                Type = typeof(string),
+                Summary = "lorem ipsum",
+                Description = "hello world",
+                Required = true,
+                Example = typeof(FakeStringParameterExample),
+                In = ParameterLocation.Path,
+            };
+
+            var result = OpenApiParameterAttributeExtensions.ToOpenApiParameter(attribute, version: OpenApiVersionType.V3);
+
+            result.Example.Should().BeNull();
+        }
+
     }
 }
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Visitors/ObjectTypeVisitorTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Visitors/ObjectTypeVisitorTests.cs
@@ -14,6 +14,7 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests.Visitors
@@ -84,9 +85,9 @@ public void Given_Type_When_IsPayloadVisitable_Invoked_Then_It_Should_Return_Res
         }
 
         [DataTestMethod]
-        [DataRow(typeof(FakeModel), "object", null, 2, 3, "fakeModel")]
+        [DataRow(typeof(FakeModel), "object", null, 3, 3, "fakeModel")]
         [DataRow(typeof(FakeRequiredModel), "object", null, 1, 0, "fakeRequiredModel")]
-        [DataRow(typeof(FakeRecursiveModel), "object", null, 1, 2, "fakeRecursiveModel")]
+        [DataRow(typeof(FakeRecursiveModel), "object", null, 3, 2, "fakeRecursiveModel")]
         public void Given_Type_When_Visit_Invoked_Then_It_Should_Return_Result(Type objectType, string dataType, string dataFormat, int requiredCount, int rootSchemaCount, string referenceId)
         {
             var name = "hello";
@@ -110,20 +111,61 @@ public void Given_Type_When_Visit_Invoked_Then_It_Should_Return_Result(Type obje
         }
 
         [DataTestMethod]
-        [DataRow("hello", "lorem ipsum")]
-        public void Given_OpenApiPropertyAttribute_When_Visit_Invoked_Then_It_Should_Return_Result(string name, string description)
+        [DataRow("hello", "lorem ipsum", true)]
+        [DataRow("hello", "lorem ipsum", false)]
+        public void Given_OpenApiPropertyAttribute_When_Visit_Invoked_Then_It_Should_Return_Result(string name, string description, bool nullable)
         {
             var acceptor = new OpenApiSchemaAcceptor();
             var type = new KeyValuePair<string, Type>(name, typeof(FakeModel));
-            var attribute = new OpenApiPropertyAttribute() { Description = description };
+            var attribute = new OpenApiPropertyAttribute() { Description = description, Nullable = nullable };
 
             this._visitor.Visit(acceptor, type, this._strategy, attribute);
 
-            acceptor.Schemas[name].Nullable.Should().Be(false);
+            acceptor.Schemas[name].Nullable.Should().Be(nullable);
             acceptor.Schemas[name].Default.Should().BeNull();
             acceptor.Schemas[name].Description.Should().Be(description);
         }
 
+        [DataTestMethod]
+        [DataRow("hello", 3)]
+        public void Given_ObjectModel_With_NewtonsoftJsonPropertyAttribute_When_Visit_Invoked_Then_It_Should_Set_Required_And_Nullability(string name, int requiredCount)
+        {
+            var acceptor = new OpenApiSchemaAcceptor();
+            var type = new KeyValuePair<string, Type>(name, typeof(FakeModel));
+
+            this._visitor.Visit(acceptor, type, this._strategy);
+
+            acceptor.Schemas[name].Required.Count.Should().Be(requiredCount);
+            acceptor.Schemas[name].Required.Should().Contain("fakeProperty");
+            acceptor.Schemas[name].Required.Should().Contain("anotherJsonFakeProperty");
+            acceptor.Schemas[name].Required.Should().Contain("fakePropertyRequiredAllowNullPropertyValue");
+
+            acceptor.Schemas[name].Properties["anotherJsonFakeProperty"].Nullable.Should().BeFalse();
+            acceptor.Schemas[name].Properties["fakePropertyNoPropertyValue"].Nullable.Should().BeTrue();
+            acceptor.Schemas[name].Properties["fakePropertyRequiredAllowNullPropertyValue"].Nullable.Should().BeTrue();
+            acceptor.Schemas[name].Properties["fakePropertyRequiredDisallowAllowNullPropertyValue"].Nullable.Should().BeFalse();
+        }
+
+        [DataTestMethod]
+        [DataRow("hello", 3)]
+        public void Given_RecursiveModel_With_NewtonsoftJsonPropertyAttribute_When_Visit_Invoked_Then_It_Should_Set_Required_And_Nullability(string name, int requiredCount)
+        {
+            var acceptor = new OpenApiSchemaAcceptor();
+            var type = new KeyValuePair<string, Type>(name, typeof(FakeRecursiveModel));
+
+            this._visitor.Visit(acceptor, type, this._strategy);
+
+            acceptor.Schemas[name].Required.Count.Should().Be(requiredCount);
+            acceptor.Schemas[name].Required.Should().Contain("stringValue");
+            acceptor.Schemas[name].Required.Should().Contain("fakeAlwaysRequiredProperty");
+            acceptor.Schemas[name].Required.Should().Contain("fakePropertyRequiredAllowNullPropertyValue");
+
+            acceptor.Schemas[name].Properties["fakeAlwaysRequiredProperty"].Nullable.Should().BeFalse();
+            acceptor.Schemas[name].Properties["fakePropertyNoPropertyValue"].Nullable.Should().BeTrue();
+            acceptor.Schemas[name].Properties["fakePropertyRequiredAllowNullPropertyValue"].Nullable.Should().BeTrue();
+            acceptor.Schemas[name].Properties["fakePropertyRequiredDisallowAllowNullPropertyValue"].Nullable.Should().BeFalse();
+        }
+
         [DataTestMethod]
         [DataRow("hello", OpenApiVisibilityType.Advanced)]
         [DataRow("hello", OpenApiVisibilityType.Important)]
diff --git a/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Visitors/RecursiveObjectTypeVisitorTests.cs b/test/Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Tests/Visitors/RecursiveObjectTypeVisitorTests.cs
@@ -72,7 +72,7 @@ public void Given_Type_When_IsPayloadVisitable_Invoked_Then_It_Should_Return_Res
         }
 
         [DataTestMethod]
-        [DataRow(typeof(FakeRecursiveModel), "object", null, 1, 0, "fakeRecursiveModel")]
+        [DataRow(typeof(FakeRecursiveModel), "object", null, 3, 0, "fakeRecursiveModel")]
         public void Given_Type_When_Visit_Invoked_Then_It_Should_Return_Result(Type objectType, string dataType, string dataFormat, int requiredCount, int rootSchemaCount, string referenceId)
         {
             var name = "hello";
@@ -93,6 +93,21 @@ public void Given_Type_When_Visit_Invoked_Then_It_Should_Return_Result(Type obje
             acceptor.Schemas[name].Reference.Id.Should().Be(referenceId);
         }
 
+        [DataTestMethod]
+        [DataRow("hello", 3)]
+        public void Given_NewtonsoftJsonPropertyAttribute_When_Visit_Invoked_Then_It_Should_Set_Required(string name, int requiredCount)
+        {
+            var acceptor = new OpenApiSchemaAcceptor();
+            var type = new KeyValuePair<string, Type>(name, typeof(FakeRecursiveModel));
+
+            this._visitor.Visit(acceptor, type, this._strategy);
+
+            acceptor.Schemas[name].Required.Count.Should().Be(requiredCount);
+            acceptor.Schemas[name].Required.Should().Contain("stringValue");
+            acceptor.Schemas[name].Required.Should().Contain("fakeAlwaysRequiredProperty");
+            acceptor.Schemas[name].Required.Should().Contain("fakePropertyRequiredAllowNullPropertyValue");
+        }
+
         [DataTestMethod]
         [DataRow("hello", "lorem ipsum")]
         public void Given_OpenApiPropertyAttribute_When_Visit_Invoked_Then_It_Should_Return_Result(string name, string description)

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public static List<OpenApiParameter> GetOpenApiParameters(this IDocumentHelper h`
`157`	`157`	`{`
`158`	`158`	`var parameters = element.GetCustomAttributes<OpenApiParameterAttribute>(inherit: false)`
`159`	`159`	`.Where(p => p.Deprecated == false)`
`160`		`- .Select(p => p.ToOpenApiParameter(namingStrategy, collection))`
	`160`	`+ .Select(p => p.ToOpenApiParameter(namingStrategy, collection, version))`
`161`	`161`	`.ToList();`
`162`	`162`
`163`	`163`	`// This is the interim solution to resolve:`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public static List<OpenApiParameter> GetOpenApiParameters(this IDocumentHelper h`
`152`	`152`	`{`
`153`	`153`	`var parameters = element.GetCustomAttributes<OpenApiParameterAttribute>(inherit: false)`
`154`	`154`	`.Where(p => p.Deprecated == false)`
`155`		`- .Select(p => p.ToOpenApiParameter(namingStrategy, collection))`
	`155`	`+ .Select(p => p.ToOpenApiParameter(namingStrategy, collection, version))`
`156`	`156`	`.ToList();`
`157`	`157`
`158`	`158`	`// This is the interim solution to resolve:`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private void ProcessProperties(IOpenApiSchemaAcceptor instance, string schemaNam`
`189`	`189`	`// Add required properties to schema.`
`190`	`190`	`var jsonPropertyAttributes = properties.Where(p => !p.Value.GetCustomAttribute<JsonPropertyAttribute>(inherit: false).IsNullOrDefault())`
`191`	`191`	`.Select(p => new KeyValuePair<string, JsonPropertyAttribute>(p.Key, p.Value.GetCustomAttribute<JsonPropertyAttribute>(inherit: false)))`
`192`		`- .Where(p => p.Value.Required == Required.Always \|\| p.Value.Required == Required.DisallowNull);`
	`192`	`+ .Where(p => p.Value.Required == Required.Always \|\| p.Value.Required == Required.AllowNull);`
`193`	`193`	`foreach (var attribute in jsonPropertyAttributes)`
`194`	`194`	`{`
`195`	`195`	`instance.Schemas[schemaName].Required.Add(attribute.Key);`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ private void ProcessProperties(IOpenApiSchemaAcceptor instance, string schemaNam`
`195`	`195`	`// Add required properties to schema.`
`196`	`196`	`var jsonPropertyAttributes = properties.Where(p => !p.Value.GetCustomAttribute<JsonPropertyAttribute>(inherit: false).IsNullOrDefault())`
`197`	`197`	`.Select(p => new KeyValuePair<string, JsonPropertyAttribute>(p.Key, p.Value.GetCustomAttribute<JsonPropertyAttribute>(inherit: false)))`
`198`		`- .Where(p => p.Value.Required == Required.Always \|\| p.Value.Required == Required.DisallowNull);`
	`198`	`+ .Where(p => p.Value.Required == Required.Always \|\| p.Value.Required == Required.AllowNull);`
`199`	`199`	`foreach (var attribute in jsonPropertyAttributes)`
`200`	`200`	`{`
`201`	`201`	`instance.Schemas[schemaName].Required.Add(attribute.Key);`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.OpenApi.Any;`
`10`	`10`	`using Microsoft.OpenApi.Models;`
`11`	`11`
	`12`	`+using Newtonsoft.Json;`
`12`	`13`	`using Newtonsoft.Json.Serialization;`
`13`	`14`
`14`	`15`	`namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Visitors`
`@@ -148,9 +149,9 @@ protected string Visit(IAcceptor acceptor, string name, string title, string dat`
`148`	`149`	`{`
`149`	`150`	`if (dataType != "object")`
`150`	`151`	`{`
`151`		`- schema.Nullable = this.GetOpenApiPropertyNullable(attr as OpenApiPropertyAttribute);`
`152`	`152`	`schema.Default = this.GetOpenApiPropertyDefault(attr as OpenApiPropertyAttribute);`
`153`	`153`	`}`
	`154`	`+ schema.Nullable = this.GetOpenApiPropertyNullable(attr as OpenApiPropertyAttribute);`
`154`	`155`	`schema.Description = this.GetOpenApiPropertyDescription(attr as OpenApiPropertyAttribute);`
`155`	`156`	`schema.Deprecated = this.GetOpenApiPropertyDeprecated(attr as OpenApiPropertyAttribute);`
`156`	`157`	`}`
`@@ -163,6 +164,12 @@ protected string Visit(IAcceptor acceptor, string name, string title, string dat`
`163`	`164`	`schema.Extensions.Add("x-ms-visibility", extension);`
`164`	`165`	`}`
`165`	`166`
	`167`	`+ attr = attributes.OfType<JsonPropertyAttribute>().SingleOrDefault();`
	`168`	`+ if (!attr.IsNullOrDefault())`
	`169`	`+ {`
	`170`	`+ schema.Nullable = this.GetNewtonsoftPropertNullable(attr as JsonPropertyAttribute);`
	`171`	`+ }`
	`172`	`+`
`166`	`173`	`schema.ApplyValidationAttributes(attributes.OfType<ValidationAttribute>());`
`167`	`174`	`}`
`168`	`175`
`@@ -375,7 +382,6 @@ protected string GetOpenApiPropertyDescription(OpenApiPropertyAttribute attr)`
`375`	`382`	`return attr.Description;`
`376`	`383`	`}`
`377`	`384`
`378`		`-`
`379`	`385`	`/// <summary>`
`380`	`386`	`/// Gets the property deprecated.`
`381`	`387`	`/// </summary>`
`@@ -385,5 +391,15 @@ protected bool GetOpenApiPropertyDeprecated(OpenApiPropertyAttribute attr)`
`385`	`391`	`{`
`386`	`392`	`return attr.Deprecated;`
`387`	`393`	`}`
	`394`	`+`
	`395`	`+ /// <summary>`
	`396`	`+ /// Gets whether Newtonsoft Serialization allows nullability based on the JsonPropertyAttribute`
	`397`	`+ /// </summary>`
	`398`	`+ /// <param name="attr"><see cref="JsonPropertyAttribute"/> instance.</param>`
	`399`	`+ /// <returns>Returns the property deprecated.</returns>`
	`400`	`+ private bool GetNewtonsoftPropertNullable(JsonPropertyAttribute attr)`
	`401`	`+ {`
	`402`	`+ return attr.Required == Required.AllowNull \|\| attr.Required == Required.Default;`
	`403`	`+ }`
`388`	`404`	`}`
`389`	`405`	`}`