refactor

maurei · maurei · commit 3f4fd7bb5125 · 2021-09-10T00:35:09.000+02:00
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs
@@ -66,16 +66,7 @@ public OpenApiSchema GenerateSchema(Type type, SchemaRepository schemaRepository
                 return jsonApiDocumentSchema;
             }
 
-            OpenApiSchema schema;
-
-            if (IsJsonApiResourceDocument(type))
-            {
-                schema = GenerateResourceJsonApiDocumentSchema(type);
-            }
-            else
-            {
-                schema = _defaultSchemaGenerator.GenerateSchema(type, schemaRepository, memberInfo, parameterInfo);
-            }
+            OpenApiSchema schema = IsJsonApiResourceDocument(type) ? GenerateResourceJsonApiDocumentSchema(type) : _defaultSchemaGenerator.GenerateSchema(type, schemaRepository, memberInfo, parameterInfo);
 
             if (IsSingleNonPrimaryDataDocument(type))
             {
diff --git a/test/OpenApiTests/ClientLibrary/GeneratedCode/IOpenApiClient.cs b/test/OpenApiTests/ClientLibrary/GeneratedCode/IOpenApiClient.cs
@@ -2,6 +2,7 @@
 
 namespace OpenApiTests.ClientLibrary.GeneratedCode
 {
+    // ReSharper disable once MemberCanBeInternal
     partial interface IOpenApiClient : IJsonApiClient
     {
     }
diff --git a/test/OpenApiTests/ClientLibrary/GeneratedCode/OpenApiClient.cs b/test/OpenApiTests/ClientLibrary/GeneratedCode/OpenApiClient.cs
@@ -3,7 +3,7 @@
 
 namespace OpenApiTests.ClientLibrary.GeneratedCode
 {
-    public partial class OpenApiClient : JsonApiClient
+    internal partial class OpenApiClient : JsonApiClient
     {
         partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)
         {

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace OpenApiTests.ClientLibrary.GeneratedCode`
`4`	`4`	`{`
	`5`	`+ // ReSharper disable once MemberCanBeInternal`
`5`	`6`	`partial interface IOpenApiClient : IJsonApiClient`
`6`	`7`	`{`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace OpenApiTests.ClientLibrary.GeneratedCode`
`5`	`5`	`{`
`6`		`- public partial class OpenApiClient : JsonApiClient`
	`6`	`+ internal partial class OpenApiClient : JsonApiClient`
`7`	`7`	`{`
`8`	`8`	`partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)`
`9`	`9`	`{`