Porting domaindrivendev/Swashbuckle.AspNetCore#2409 for Havunen/DotSw…

…ashbuckle#1 added test for STJ serialization too.
Havunen · Feb 11, 2024 · dcc7114 · dcc7114
1 parent e980cda
commit dcc7114
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/src/DotSwashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGenerator.cs b/src/DotSwashbuckle.AspNetCore.SwaggerGen/SchemaGenerator/SchemaGenerator.cs
@@ -293,7 +293,8 @@ private OpenApiSchema CreatePrimitiveSchema(DataContract dataContract)
         private OpenApiSchema CreateArraySchema(DataContract dataContract, SchemaRepository schemaRepository)
         {
             var hasUniqueItems = dataContract.UnderlyingType.IsConstructedFrom(typeof(ISet<>), out _)
-                || dataContract.UnderlyingType.IsConstructedFrom(typeof(KeyedCollection<,>), out _);
+                || dataContract.UnderlyingType.IsConstructedFrom(typeof(KeyedCollection<,>), out _)
+                || dataContract.UnderlyingType.IsConstructedFrom(typeof(IReadOnlySet<>), out _);
 
             return new OpenApiSchema
             {

diff --git a/...tSwashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs b/...tSwashbuckle.AspNetCore.Newtonsoft.Test/SchemaGenerator/NewtonsoftSchemaGeneratorTests.cs
@@ -21,6 +21,15 @@ namespace DotSwashbuckle.AspNetCore.Newtonsoft.Test
 {
     public class NewtonsoftSchemaGeneratorTests
     {
+        [Fact]
+        public void GenerateSchema_SetsUniqueItems_IfEnumerableTypeIsReadOnlySet()
+        {
+            var schema = Subject().GenerateSchema(typeof(IReadOnlySet<string>), new SchemaRepository());
+
+            Assert.Equal("array", schema.Type);
+            Assert.True(schema.UniqueItems);
+        }
+
         [Theory]
         [InlineData(typeof(IFormFile))]
         [InlineData(typeof(FileResult))]

diff --git a/...shbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs b/...shbuckle.AspNetCore.SwaggerGen.Test/SchemaGenerator/JsonSerializerSchemaGeneratorTests.cs
@@ -21,6 +21,15 @@ namespace DotSwashbuckle.AspNetCore.SwaggerGen.Test
 {
     public class JsonSerializerSchemaGeneratorTests
     {
+        [Fact]
+        public void GenerateSchema_SetsUniqueItems_IfEnumerableTypeIsReadOnlySet()
+        {
+            var schema = Subject().GenerateSchema(typeof(IReadOnlySet<string>), new SchemaRepository());
+
+            Assert.Equal("array", schema.Type);
+            Assert.True(schema.UniqueItems);
+        }
+
         [Theory]
         [InlineData(typeof(IFormFile))]
         [InlineData(typeof(FileResult))]