Merge branch 'copilot/fix-ea45d0db-41a9-4eb8-ab64-a899005cb84b' of https://github.com/BinkyLabs/OpenAPI.NET into copilot/fix-ea45d0db-41a9-4eb8-ab64-a899005cb84b

Author: baywet

src/Microsoft.OpenApi/Reader/V3/OpenApiEncodingDeserializer.cs

@@ -44,7 +44,7 @@ internal static partial class OpenApiV3Deserializer
                 }
             },
             {
-                "allowedReserved", 
+                "allowReserved", 
                 (o, n, _) =>
                 {
                     var allowReserved = n.GetScalarValue();

src/Microsoft.OpenApi/Reader/V31/OpenApiEncodingDeserializer.cs

@@ -43,7 +43,7 @@ internal static partial class OpenApiV31Deserializer
                 }
             },
             {
-                "allowedReserved", (o, n, _) =>
+                "allowReserved", (o, n, _) =>
                 {
                     var allowReserved = n.GetScalarValue();
                     if (allowReserved is not null)

src/Microsoft.OpenApi/Reader/V32/OpenApiEncodingDeserializer.cs

@@ -43,7 +43,7 @@ internal static partial class OpenApiV32Deserializer
                 }
             },
             {
-                "allowedReserved", (o, n, _) =>
+                "allowReserved", (o, n, _) =>
                 {
                     var allowReserved = n.GetScalarValue();
                     if (allowReserved is not null)

test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiMediaTypeTests.cs

@@ -140,5 +140,45 @@ public async Task ParseMediaTypeWithXOaiItemSchemaShouldSucceed()
             };
             Assert.Equivalent(expected, mediaType);
         }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiItemEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Combine(SampleFolderPath, "mediaTypeWithXOaiItemEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_1,
+                new(),
+                SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.ItemEncoding);
+            Assert.Equal("image/png, image/jpeg", mediaType.ItemEncoding.ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.ItemEncoding.Style);
+            Assert.True(mediaType.ItemEncoding.Explode);
+            Assert.True(mediaType.ItemEncoding.AllowReserved);
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiPrefixEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Combine(SampleFolderPath, "mediaTypeWithXOaiPrefixEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_1,
+                new(),
+                SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.PrefixEncoding);
+            Assert.Equal(2, mediaType.PrefixEncoding.Count);
+            Assert.Equal("application/json", mediaType.PrefixEncoding[0].ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.PrefixEncoding[0].Style);
+            Assert.Equal("text/plain", mediaType.PrefixEncoding[1].ContentType);
+            Assert.Equal(ParameterStyle.Form, mediaType.PrefixEncoding[1].Style);
+            Assert.False(mediaType.PrefixEncoding[1].Explode);
+        }
     }
 }

test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemEncoding.yaml

@@ -0,0 +1,7 @@
+schema:
+  type: array
+x-oai-itemEncoding:
+  contentType: image/png, image/jpeg
+  style: simple
+  explode: true
+  allowReserved: true

test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiPrefixEncoding.yaml

@@ -0,0 +1,8 @@
+schema:
+  type: array
+x-oai-prefixEncoding:
+  - contentType: application/json
+    style: simple
+  - contentType: text/plain
+    style: form
+    explode: false

test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiMediaTypeTests.cs

@@ -140,5 +140,45 @@ public async Task ParseMediaTypeWithItemSchemaShouldSucceed()
             };
             Assert.Equivalent(expected, mediaType);
         }
+
+        [Fact]
+        public async Task ParseMediaTypeWithItemEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Combine(SampleFolderPath, "mediaTypeWithItemEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_2,
+                new(),
+                SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.ItemEncoding);
+            Assert.Equal("image/png, image/jpeg", mediaType.ItemEncoding.ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.ItemEncoding.Style);
+            Assert.True(mediaType.ItemEncoding.Explode);
+            Assert.True(mediaType.ItemEncoding.AllowReserved);
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithPrefixEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Combine(SampleFolderPath, "mediaTypeWithPrefixEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_2,
+                new(),
+                SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.PrefixEncoding);
+            Assert.Equal(2, mediaType.PrefixEncoding.Count);
+            Assert.Equal("application/json", mediaType.PrefixEncoding[0].ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.PrefixEncoding[0].Style);
+            Assert.Equal("text/plain", mediaType.PrefixEncoding[1].ContentType);
+            Assert.Equal(ParameterStyle.Form, mediaType.PrefixEncoding[1].Style);
+            Assert.False(mediaType.PrefixEncoding[1].Explode);
+        }
     }
 }

test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithItemEncoding.yaml

@@ -0,0 +1,7 @@
+schema:
+  type: array
+itemEncoding:
+  contentType: image/png, image/jpeg
+  style: simple
+  explode: true
+  allowReserved: true

test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithPrefixEncoding.yaml

@@ -0,0 +1,8 @@
+schema:
+  type: array
+prefixEncoding:
+  - contentType: application/json
+    style: simple
+  - contentType: text/plain
+    style: form
+    explode: false

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs

@@ -114,5 +114,45 @@ public async Task ParseMediaTypeWithEmptyArrayInExamplesWorks()
             // Assert
             Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), serialized.MakeLineBreaksEnvironmentNeutral());
         }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiItemEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Combine(SampleFolderPath, "mediaTypeWithXOaiItemEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_0,
+                new(),
+                SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.ItemEncoding);
+            Assert.Equal("image/png, image/jpeg", mediaType.ItemEncoding.ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.ItemEncoding.Style);
+            Assert.True(mediaType.ItemEncoding.Explode);
+            Assert.True(mediaType.ItemEncoding.AllowReserved);
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiPrefixEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Combine(SampleFolderPath, "mediaTypeWithXOaiPrefixEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_0,
+                new(),
+                SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.PrefixEncoding);
+            Assert.Equal(2, mediaType.PrefixEncoding.Count);
+            Assert.Equal("application/json", mediaType.PrefixEncoding[0].ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.PrefixEncoding[0].Style);
+            Assert.Equal("text/plain", mediaType.PrefixEncoding[1].ContentType);
+            Assert.Equal(ParameterStyle.Form, mediaType.PrefixEncoding[1].Style);
+            Assert.False(mediaType.PrefixEncoding[1].Explode);
+        }
     }
 }