Fixed: no additional properties in resource type

bkoelman · bkoelman · commit 2a42a299a70a · 2024-01-14T13:09:58.000+01:00
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeSchemaGenerator.cs
@@ -41,7 +41,8 @@ public OpenApiSchema Get(Type resourceClrType)
             Enum = new List<IOpenApiAny>
             {
                 new OpenApiString(resourceType.PublicName)
-            }
+            },
+            AdditionalPropertiesAllowed = false
         };
 
         string schemaId = GetSchemaId(resourceType);
diff --git a/test/OpenApiClientTests/LegacyClient/swagger.g.json b/test/OpenApiClientTests/LegacyClient/swagger.g.json
@@ -3470,7 +3470,8 @@
         "enum": [
           "airplanes"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "cabin-area": {
         "enum": [
@@ -3929,7 +3930,8 @@
         "enum": [
           "flight-attendants"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "flight-attendant-secondary-response-document": {
         "required": [
@@ -4411,7 +4413,8 @@
         "enum": [
           "flights"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "jsonapi-object": {
         "type": "object",
@@ -4855,7 +4858,8 @@
         "enum": [
           "passengers"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "to-many-flight-attendant-in-request": {
         "required": [
diff --git a/test/OpenApiClientTests/NamingConventions/CamelCase/swagger.g.json b/test/OpenApiClientTests/NamingConventions/CamelCase/swagger.g.json
@@ -1603,7 +1603,8 @@
         "enum": [
           "staffMembers"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "staffMemberSecondaryResponseDocument": {
         "required": [
@@ -2004,7 +2005,8 @@
         "enum": [
           "supermarkets"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "supermarketType": {
         "enum": [
diff --git a/test/OpenApiClientTests/NamingConventions/KebabCase/swagger.g.json b/test/OpenApiClientTests/NamingConventions/KebabCase/swagger.g.json
@@ -1603,7 +1603,8 @@
         "enum": [
           "staff-members"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "staff-member-secondary-response-document": {
         "required": [
@@ -2004,7 +2005,8 @@
         "enum": [
           "supermarkets"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "supermarket-type": {
         "enum": [
diff --git a/test/OpenApiClientTests/NamingConventions/PascalCase/swagger.g.json b/test/OpenApiClientTests/NamingConventions/PascalCase/swagger.g.json
@@ -1603,7 +1603,8 @@
         "enum": [
           "StaffMembers"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "StaffMemberSecondaryResponseDocument": {
         "required": [
@@ -2004,7 +2005,8 @@
         "enum": [
           "Supermarkets"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "SupermarketType": {
         "enum": [
diff --git a/test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOff/swagger.g.json b/test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOff/swagger.g.json
@@ -1574,7 +1574,8 @@
         "enum": [
           "empties"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "linksInRelationshipObject": {
         "required": [
@@ -2239,7 +2240,8 @@
         "enum": [
           "resources"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "toManyEmptyInRequest": {
         "required": [
diff --git a/test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOn/swagger.g.json b/test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOn/swagger.g.json
@@ -1605,7 +1605,8 @@
         "enum": [
           "empties"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "emptySecondaryResponseDocument": {
         "required": [
@@ -2293,7 +2294,8 @@
         "enum": [
           "resources"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "toManyEmptyInRequest": {
         "required": [
diff --git a/test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOff/swagger.g.json b/test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOff/swagger.g.json
@@ -2073,7 +2073,8 @@
         "enum": [
           "empties"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "emptySecondaryResponseDocument": {
         "required": [
@@ -2834,7 +2835,8 @@
         "enum": [
           "resources"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "toManyEmptyInRequest": {
         "required": [
diff --git a/test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOn/swagger.g.json b/test/OpenApiClientTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOn/swagger.g.json
@@ -2073,7 +2073,8 @@
         "enum": [
           "empties"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "emptySecondaryResponseDocument": {
         "required": [
@@ -2828,7 +2829,8 @@
         "enum": [
           "resources"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "toManyEmptyInRequest": {
         "required": [
diff --git a/test/OpenApiEndToEndTests/QueryStrings/swagger.g.json b/test/OpenApiEndToEndTests/QueryStrings/swagger.g.json
@@ -1387,7 +1387,8 @@
         "enum": [
           "nodes"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "nullableNodeIdentifierResponseDocument": {
         "required": [
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/swagger.json b/test/OpenApiTests/LegacyOpenApiIntegration/swagger.json
@@ -3470,7 +3470,8 @@
         "enum": [
           "airplanes"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "cabin-area": {
         "enum": [
@@ -3929,7 +3930,8 @@
         "enum": [
           "flight-attendants"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "flight-attendant-secondary-response-document": {
         "required": [
@@ -4411,7 +4413,8 @@
         "enum": [
           "flights"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "jsonapi-object": {
         "type": "object",
@@ -4855,7 +4858,8 @@
         "enum": [
           "passengers"
         ],
-        "type": "string"
+        "type": "string",
+        "additionalProperties": false
       },
       "to-many-flight-attendant-in-request": {
         "required": [

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ public OpenApiSchema Get(Type resourceClrType)`
`41`	`41`	`Enum = new List<IOpenApiAny>`
`42`	`42`	`{`
`43`	`43`	`new OpenApiString(resourceType.PublicName)`
`44`		`- }`
	`44`	`+ },`
	`45`	`+ AdditionalPropertiesAllowed = false`
`45`	`46`	`};`
`46`	`47`
`47`	`48`	`string schemaId = GetSchemaId(resourceType);`