Merge pull request #370 from VitaliyKurokhtin/vvk/parameter-with-no-schema

Nullref fixed when parsing parameter without any schema

Author: PerthCharern

src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs

@@ -149,8 +149,13 @@ internal static partial class OpenApiV2Deserializer
                 {
                     OpenApiConstants.Default,
                     new AnyFieldMapParameter<OpenApiParameter>(
-                        p => p.Schema.Default,
-                        (p, v) => p.Schema.Default = v,
+                        p => p.Schema?.Default,
+                        (p, v) => {
+                            if (p.Schema != null || v != null)
+                            {
+                                GetOrCreateSchema(p).Default = v;
+                            }
+                        },
                         p => p.Schema)
                 }
             };
@@ -161,8 +166,13 @@ internal static partial class OpenApiV2Deserializer
                 {
                     OpenApiConstants.Enum,
                     new AnyListFieldMapParameter<OpenApiParameter>(
-                        p => p.Schema.Enum,
-                        (p, v) => p.Schema.Enum = v,
+                        p => p.Schema?.Enum,
+                        (p, v) => {
+                            if (p.Schema != null || v != null && v.Count > 0)
+                            {
+                                GetOrCreateSchema(p).Enum = v;
+                            }
+                        },
                         p => p.Schema)
                 },
             };
@@ -285,7 +295,7 @@ public static OpenApiParameter LoadParameter(ParseNode node, bool loadRequestBod
                 return null; // Don't include Form or Body parameters when normal parameters are loaded.
             }
 
-            if ( loadRequestBody && !_isBodyOrFormData )
+            if (loadRequestBody && !_isBodyOrFormData)
             {
                 return null; // Don't include non-Body or non-Form parameters when request bodies are loaded.
             }

src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs

@@ -78,12 +78,16 @@ private static void ProcessAnyListFields<T>(
 
                     mapNode.Context.StartObject(anyListFieldName);
 
-                    foreach (var propertyElement in anyListFieldMap[anyListFieldName].PropertyGetter(domainObject))
+                    var list = anyListFieldMap[anyListFieldName].PropertyGetter(domainObject);
+                    if (list != null)
                     {
-                        newProperty.Add(
-                            OpenApiAnyConverter.GetSpecificOpenApiAny(
-                                propertyElement,
-                                anyListFieldMap[anyListFieldName].SchemaGetter(domainObject)));
+                        foreach (var propertyElement in list)
+                        {
+                            newProperty.Add(
+                                OpenApiAnyConverter.GetSpecificOpenApiAny(
+                                    propertyElement,
+                                    anyListFieldMap[anyListFieldName].SchemaGetter(domainObject)));
+                        }
                     }
 
                     anyListFieldMap[anyListFieldName].PropertySetter(domainObject, newProperty);

test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj

@@ -12,6 +12,9 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
+    <ItemGroup>
+      <None Remove="V2Tests\Samples\OpenApiParameter\parameterWithNoSchema.yaml" />
+    </ItemGroup>
     <ItemGroup>
       <EmbeddedResource Include="OpenApiReaderTests\Samples\unsupported.v1.yaml">
         <CopyToOutputDirectory>Never</CopyToOutputDirectory>
@@ -55,6 +58,9 @@
       <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithEnum.yaml">
         <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       </EmbeddedResource>
+      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithNoSchema.yaml">
+        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+      </EmbeddedResource>
       <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithNoLocation.yaml">
         <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       </EmbeddedResource>

test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs

@@ -139,7 +139,7 @@ public void ParseHeaderParameterShouldSucceed()
                     Description = "token to be passed as a header",
                     Required = true,
                     Style = ParameterStyle.Simple,
-                   
+
                     Schema = new OpenApiSchema
                     {
                         Type = "array",
@@ -226,7 +226,7 @@ public void ParseParameterWithNullLocationShouldSucceed()
         {
             // Arrange
             MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNullLocation.yaml")) )
+            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNullLocation.yaml")))
             {
                 node = TestHelper.CreateYamlMapNode(stream);
             }
@@ -254,7 +254,7 @@ public void ParseParameterWithNoLocationShouldSucceed()
         {
             // Arrange
             MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNoLocation.yaml")) )
+            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNoLocation.yaml")))
             {
                 node = TestHelper.CreateYamlMapNode(stream);
             }
@@ -277,12 +277,36 @@ public void ParseParameterWithNoLocationShouldSucceed()
                 });
         }
 
+        [Fact]
+        public void ParseParameterWithNoSchemaShouldSucceed()
+        {
+            // Arrange
+            MapNode node;
+            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNoSchema.yaml")))
+            {
+                node = TestHelper.CreateYamlMapNode(stream);
+            }
+
+            // Act
+            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+
+            // Assert
+            parameter.ShouldBeEquivalentTo(
+                new OpenApiParameter
+                {
+                    In = null,
+                    Name = "username",
+                    Description = "username to fetch",
+                    Required = false
+                });
+        }
+
         [Fact]
         public void ParseParameterWithUnknownLocationShouldSucceed()
         {
             // Arrange
             MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithUnknownLocation.yaml")) )
+            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithUnknownLocation.yaml")))
             {
                 node = TestHelper.CreateYamlMapNode(stream);
             }

test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiParameter/parameterWithNoSchema.yaml

@@ -0,0 +1,3 @@
+name: username
+description: username to fetch
+required: false