fix: Fixed rare issue with oneOf usage to define required property.

HavenDV · HavenDV · commit a551442e6a12 · 2024-08-31T04:41:15.000+04:00
diff --git a/src/libs/OpenApiGenerator.Core/Models/TypeData.cs b/src/libs/OpenApiGenerator.Core/Models/TypeData.cs
@@ -155,9 +155,15 @@ Default with
             IsDateTime: context.Schema.IsDateTime(),
             IsBinary: context.Schema.IsBinary(),
             IsUnixTimestamp: context.Schema.IsUnixTimestamp(),
-            AnyOfCount: context.Schema.AnyOf?.Count ?? 0,
-            OneOfCount: context.Schema.OneOf?.Count ?? 0,
-            AllOfCount: context.Schema.AllOf?.Count ?? 0,
+            AnyOfCount: context.Schema.IsAnyOf() // Sometimes here AnyOf with only required properties
+                ? context.Schema.AnyOf?.Count ?? 0
+                : 0,
+            OneOfCount: context.Schema.IsOneOf() // Sometimes here OneOf with only required properties
+                ? context.Schema.OneOf?.Count ?? 0
+                : 0,
+            AllOfCount: context.Schema.IsAllOf() // Sometimes here AllOf with only required properties
+                ? context.Schema.AllOf?.Count ?? 0
+                : 0,
             IsComponent: context.IsComponent,
             Properties: properties,
             EnumValues: enumValues,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.ChecksClient.ChecksCreate.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.ChecksClient.ChecksCreate.g.verified.cs
@@ -44,6 +44,8 @@ partial void ProcessChecksCreateResponseContent(
             global::G.ChecksCreateRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareChecksCreateArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.ChecksClient.ChecksUpdate.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.ChecksClient.ChecksUpdate.g.verified.cs
@@ -47,6 +47,8 @@ partial void ProcessChecksUpdateResponseContent(
             global::G.ChecksUpdateRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareChecksUpdateArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.CodeScanningClient.CodeScanningCreateVariantAnalysis.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.CodeScanningClient.CodeScanningCreateVariantAnalysis.g.verified.cs
@@ -45,6 +45,8 @@ partial void ProcessCodeScanningCreateVariantAnalysisResponseContent(
             global::G.CodeScanningCreateVariantAnalysisRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareCodeScanningCreateVariantAnalysisArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.PullsClient.PullsRequestReviewers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.PullsClient.PullsRequestReviewers.g.verified.cs
@@ -46,6 +46,8 @@ partial void ProcessPullsRequestReviewersResponseContent(
             global::G.PullsRequestReviewersRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PreparePullsRequestReviewersArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.ReposClient.ReposCreatePagesSite.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.ReposClient.ReposCreatePagesSite.g.verified.cs
@@ -43,6 +43,8 @@ partial void ProcessReposCreatePagesSiteResponseContent(
             global::G.ReposCreatePagesSiteRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareReposCreatePagesSiteArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.ReposClient.ReposUpdateInformationAboutPagesSite.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/NewtonsoftJson/_#G.ReposClient.ReposUpdateInformationAboutPagesSite.g.verified.cs
@@ -43,6 +43,8 @@ partial void ProcessReposUpdateInformationAboutPagesSiteResponseContent(
             global::G.ReposUpdateInformationAboutPagesSiteRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareReposUpdateInformationAboutPagesSiteArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.ChecksClient.ChecksCreate.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.ChecksClient.ChecksCreate.g.verified.cs
@@ -44,6 +44,8 @@ partial void ProcessChecksCreateResponseContent(
             global::G.ChecksCreateRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareChecksCreateArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.ChecksClient.ChecksUpdate.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.ChecksClient.ChecksUpdate.g.verified.cs
@@ -47,6 +47,8 @@ partial void ProcessChecksUpdateResponseContent(
             global::G.ChecksUpdateRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareChecksUpdateArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.CodeScanningClient.CodeScanningCreateVariantAnalysis.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.CodeScanningClient.CodeScanningCreateVariantAnalysis.g.verified.cs
@@ -45,6 +45,8 @@ partial void ProcessCodeScanningCreateVariantAnalysisResponseContent(
             global::G.CodeScanningCreateVariantAnalysisRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareCodeScanningCreateVariantAnalysisArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.PullsClient.PullsRequestReviewers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.PullsClient.PullsRequestReviewers.g.verified.cs
@@ -46,6 +46,8 @@ partial void ProcessPullsRequestReviewersResponseContent(
             global::G.PullsRequestReviewersRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PreparePullsRequestReviewersArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.ReposClient.ReposCreatePagesSite.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.ReposClient.ReposCreatePagesSite.g.verified.cs
@@ -43,6 +43,8 @@ partial void ProcessReposCreatePagesSiteResponseContent(
             global::G.ReposCreatePagesSiteRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareReposCreatePagesSiteArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.ReposClient.ReposUpdateInformationAboutPagesSite.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/GitHub/SystemTextJson/_#G.ReposClient.ReposUpdateInformationAboutPagesSite.g.verified.cs
@@ -43,6 +43,8 @@ partial void ProcessReposUpdateInformationAboutPagesSiteResponseContent(
             global::G.ReposUpdateInformationAboutPagesSiteRequest request,
             global::System.Threading.CancellationToken cancellationToken = default)
         {
+            request = request ?? throw new global::System.ArgumentNullException(nameof(request));
+
             PrepareArguments(
                 client: _httpClient);
             PrepareReposUpdateInformationAboutPagesSiteArguments(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.CreateAssistantRequestToolResources.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.CreateAssistantRequestToolResources.g.verified.cs
@@ -19,7 +19,6 @@ public sealed partial class CreateAssistantRequestToolResources
         /// 
         /// </summary>
         [global::System.Text.Json.Serialization.JsonPropertyName("file_search")]
-        [global::System.Text.Json.Serialization.JsonConverter(typeof(global::OpenApiGenerator.JsonConverters.OneOfJsonConverterFactory2))]
         public global::G.CreateAssistantRequestToolResourcesFileSearch? FileSearch { get; set; }
 
         /// <summary>
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.CreateThreadRequestToolResources.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.CreateThreadRequestToolResources.g.verified.cs
@@ -19,7 +19,6 @@ public sealed partial class CreateThreadRequestToolResources
         /// 
         /// </summary>
         [global::System.Text.Json.Serialization.JsonPropertyName("file_search")]
-        [global::System.Text.Json.Serialization.JsonConverter(typeof(global::OpenApiGenerator.JsonConverters.OneOfJsonConverterFactory2))]
         public global::G.CreateThreadRequestToolResourcesFileSearch? FileSearch { get; set; }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ partial void ProcessChecksCreateResponseContent(`
`44`	`44`	`global::G.ChecksCreateRequest request,`
`45`	`45`	`global::System.Threading.CancellationToken cancellationToken = default)`
`46`	`46`	`{`
	`47`	`+ request = request ?? throw new global::System.ArgumentNullException(nameof(request));`
	`48`	`+`
`47`	`49`	`PrepareArguments(`
`48`	`50`	`client: _httpClient);`
`49`	`51`	`PrepareChecksCreateArguments(`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ partial void ProcessChecksUpdateResponseContent(`
`47`	`47`	`global::G.ChecksUpdateRequest request,`
`48`	`48`	`global::System.Threading.CancellationToken cancellationToken = default)`
`49`	`49`	`{`
	`50`	`+ request = request ?? throw new global::System.ArgumentNullException(nameof(request));`
	`51`	`+`
`50`	`52`	`PrepareArguments(`
`51`	`53`	`client: _httpClient);`
`52`	`54`	`PrepareChecksUpdateArguments(`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ partial void ProcessCodeScanningCreateVariantAnalysisResponseContent(`
`45`	`45`	`global::G.CodeScanningCreateVariantAnalysisRequest request,`
`46`	`46`	`global::System.Threading.CancellationToken cancellationToken = default)`
`47`	`47`	`{`
	`48`	`+ request = request ?? throw new global::System.ArgumentNullException(nameof(request));`
	`49`	`+`
`48`	`50`	`PrepareArguments(`
`49`	`51`	`client: _httpClient);`
`50`	`52`	`PrepareCodeScanningCreateVariantAnalysisArguments(`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ partial void ProcessPullsRequestReviewersResponseContent(`
`46`	`46`	`global::G.PullsRequestReviewersRequest request,`
`47`	`47`	`global::System.Threading.CancellationToken cancellationToken = default)`
`48`	`48`	`{`
	`49`	`+ request = request ?? throw new global::System.ArgumentNullException(nameof(request));`
	`50`	`+`
`49`	`51`	`PrepareArguments(`
`50`	`52`	`client: _httpClient);`
`51`	`53`	`PreparePullsRequestReviewersArguments(`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ partial void ProcessReposCreatePagesSiteResponseContent(`
`43`	`43`	`global::G.ReposCreatePagesSiteRequest request,`
`44`	`44`	`global::System.Threading.CancellationToken cancellationToken = default)`
`45`	`45`	`{`
	`46`	`+ request = request ?? throw new global::System.ArgumentNullException(nameof(request));`
	`47`	`+`
`46`	`48`	`PrepareArguments(`
`47`	`49`	`client: _httpClient);`
`48`	`50`	`PrepareReposCreatePagesSiteArguments(`