diff --git a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj index 9472ff96..0c3db63e 100644 --- a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj +++ b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj @@ -30,7 +30,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.json index 2a2e75db..3547391d 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.json +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.json @@ -1025,19 +1025,16 @@ "@odata.id": { "type": "string" } - }, - "additionalProperties": { - "type": "object" } }, "ReferenceNumeric": { "type": "string", - "x-nullable": true, "enum": [ "-INF", "INF", "NaN" - ] + ], + "x-nullable": true }, "DefaultNs.Color": { "type": "string", diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.yaml index 39aac121..92d3100d 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.yaml +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.yaml @@ -676,8 +676,6 @@ definitions: properties: '@odata.id': type: string - additionalProperties: - type: object ReferenceNumeric: type: string enum: diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.json index a7e0d8ab..90354318 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.json +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.json @@ -96,19 +96,16 @@ "@odata.id": { "type": "string" } - }, - "additionalProperties": { - "type": "object" } }, "ReferenceNumeric": { "type": "string", - "x-nullable": true, "enum": [ "-INF", "INF", "NaN" - ] + ], + "x-nullable": true } }, "parameters": { diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.yaml index 6b6a987a..b6488799 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.yaml +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V2.yaml @@ -67,8 +67,6 @@ definitions: properties: '@odata.id': type: string - additionalProperties: - type: object ReferenceNumeric: type: string enum: diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.json index 995e3e06..219c468a 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.json +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.json @@ -4486,19 +4486,16 @@ "@odata.id": { "type": "string" } - }, - "additionalProperties": { - "type": "object" } }, "ReferenceNumeric": { "type": "string", - "x-nullable": true, "enum": [ "-INF", "INF", "NaN" - ] + ], + "x-nullable": true }, "Siterra.Documents.App.DTO.DocumentDto": { "type": "object", @@ -4538,16 +4535,16 @@ }, "ModificationDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "ModifiedBy": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "Tags": { "type": "array", @@ -4609,10 +4606,10 @@ }, "LibraryTemplateId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ParentTypeId": { "type": "number", @@ -4657,16 +4654,16 @@ }, "ModifiedBy": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ModificationDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "Documents": { "type": "array", @@ -4717,10 +4714,10 @@ }, "DocumentId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "DocumentName": { "type": "string", @@ -4746,48 +4743,48 @@ }, "ReviewedBy": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ReviewedDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "IsApproved": { "type": "boolean" }, "ApprovedBy": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ApprovedDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "IsRejected": { "type": "boolean" }, "RejectedBy": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "RejectedDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "DomainId": { "type": "number", @@ -4943,10 +4940,10 @@ }, "LibraryId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "OwnerUserId": { "type": "number", @@ -4961,16 +4958,16 @@ }, "LastRevisionId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "CheckoutDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "CheckoutPath": { "type": "string", @@ -4978,10 +4975,10 @@ }, "CheckoutUserId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "Number": { "type": "string", @@ -4989,9 +4986,9 @@ }, "OriginalDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "FileSized": { "type": "number", @@ -5003,10 +5000,10 @@ }, "LastRevisionFileId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "IsDeleted": { "type": "number", @@ -5016,18 +5013,18 @@ }, "IsNa": { "type": "number", - "x-nullable": true, - "format": "decimal" + "format": "decimal", + "x-nullable": true }, "IsRejected": { "type": "number", - "x-nullable": true, - "format": "decimal" + "format": "decimal", + "x-nullable": true }, "IsReviewed": { "type": "number", - "x-nullable": true, - "format": "decimal" + "format": "decimal", + "x-nullable": true }, "NaDescription": { "type": "string", @@ -5051,37 +5048,37 @@ }, "SourceDocumentId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ScraperMapId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "LastDownloadedDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "SmsId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "IsApprovedOld": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "Suffix": { "type": "string", @@ -5089,29 +5086,29 @@ }, "ScrapeResultId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "IsApproved": { "type": "number", - "x-nullable": true, - "format": "decimal" + "format": "decimal", + "x-nullable": true }, "CategoryId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "SectionId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "VersionCount": { "type": "number", @@ -5389,10 +5386,10 @@ }, "ParentFolderId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "Number": { "type": "string", @@ -5450,31 +5447,31 @@ }, "ProjectId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "SearchRingId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "SiteId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "AssetId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "AllowMultiple": { "type": "boolean" @@ -5491,31 +5488,31 @@ }, "ProgramId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "SourceFolderId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "TemplateClassId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "TemplateSubType": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "IsHidden": { "type": "boolean" @@ -5528,52 +5525,52 @@ }, "StatusId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "SmsId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ContractId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "VendorId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "OrganizationUnitId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "IncidentId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "EventId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ClassInstance": { "type": "number", @@ -5720,10 +5717,10 @@ }, "DomainId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "Description": { "type": "string", @@ -5735,17 +5732,17 @@ }, "MasterId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "Number": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ClassId": { "type": "number", @@ -5755,10 +5752,10 @@ }, "ParentId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "HasChanged": { "type": "boolean" @@ -5873,17 +5870,17 @@ }, "SourceClassId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ContentTypeId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ClientPath": { "type": "string", @@ -5897,20 +5894,20 @@ }, "SmsId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "Latitude": { "type": "number", - "x-nullable": true, - "format": "decimal" + "format": "decimal", + "x-nullable": true }, "Longitude": { "type": "number", - "x-nullable": true, - "format": "decimal" + "format": "decimal", + "x-nullable": true }, "Documents": { "type": "array", @@ -6125,10 +6122,10 @@ }, "DocumentId": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ModificationDate": { "type": "string", @@ -6222,10 +6219,10 @@ }, "ReviewedBy": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "IsRejected": { "type": "boolean" @@ -6240,38 +6237,38 @@ }, "RejectedBy": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "IsApproved": { "type": "boolean" }, "ApprovedBy": { "type": "number", - "x-nullable": true, "format": "int32", "maximum": 2147483647, - "minimum": -2147483648 + "minimum": -2147483648, + "x-nullable": true }, "ReviewedDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "RejectedDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "ApprovedDate": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "Document": { "$ref": "#/definitions/Siterra.Documents.BusinessLogic.Entities.Document.Document" diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.yaml index e8d9a89c..9d2db9e6 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.yaml +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.yaml @@ -3169,8 +3169,6 @@ definitions: properties: '@odata.id': type: string - additionalProperties: - type: object ReferenceNumeric: type: string enum: diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json index 83d8ce19..c0300709 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json @@ -1309,15 +1309,15 @@ "in": "path", "name": "lat", "required": true, - "format": "double", - "type": "number" + "type": "number", + "format": "double" }, { "in": "path", "name": "lon", "required": true, - "format": "double", - "type": "number" + "type": "number", + "format": "double" } ], "responses": { @@ -32021,9 +32021,9 @@ "properties": { "Date": { "type": "string", - "x-nullable": true, "format": "date-time", - "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$" + "pattern": "^[0-9]{4,}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]([.][0-9]{1,12})?(Z|[+-][0-9][0-9]:[0-9][0-9])$", + "x-nullable": true }, "RequestId": { "type": "string", @@ -32065,19 +32065,16 @@ "@odata.id": { "type": "string" } - }, - "additionalProperties": { - "type": "object" } }, "ReferenceNumeric": { "type": "string", - "x-nullable": true, "enum": [ "-INF", "INF", "NaN" - ] + ], + "x-nullable": true }, "Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person": { "type": "object", @@ -32105,8 +32102,8 @@ "allOf": [ { "type": "number", - "x-nullable": true, - "format": "int64" + "format": "int64", + "x-nullable": true } ] }, @@ -32137,8 +32134,8 @@ }, "Photo": { "type": "string", - "x-nullable": true, - "format": "base64url" + "format": "base64url", + "x-nullable": true }, "Friends": { "type": "array", @@ -32285,8 +32282,8 @@ "allOf": [ { "type": "number", - "x-nullable": true, - "format": "float" + "format": "float", + "x-nullable": true } ] }, @@ -32433,8 +32430,8 @@ "allOf": [ { "type": "number", - "x-nullable": true, - "format": "int64" + "format": "int64", + "x-nullable": true } ] }, @@ -32463,8 +32460,8 @@ "allOf": [ { "type": "number", - "x-nullable": true, - "format": "int64" + "format": "int64", + "x-nullable": true } ] }, diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml index a6639290..4f77842d 100644 --- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml +++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml @@ -21781,8 +21781,6 @@ definitions: properties: '@odata.id': type: string - additionalProperties: - type: object ReferenceNumeric: type: string enum: