Post-merge fixes

Author: bkoelman

.github/workflows/build.yml

@@ -10,9 +10,9 @@ name: Build
 
 on:
   push:
-    branches: [ 'master', 'release/**' ]
+    branches: [ 'master', 'release/**', 'openapi' ]
   pull_request:
-    branches: [ 'master', 'release/**' ]
+    branches: [ 'master', 'release/**', 'openapi' ]
     tags:
     - 'v*'
 

Build.ps1

@@ -7,15 +7,6 @@ function VerifySuccessExitCode {
 Write-Host "$(pwsh --version)"
 Write-Host "Active .NET SDK: $(dotnet --version)"
 
-# In a PR the base branch needs to be fetched in order for regitlint to work.
-function FetchBaseBranchIfNotMaster() {
-    if ($env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -ne "master") {
-        git fetch -q origin ${env:APPVEYOR_REPO_BRANCH}:${env:APPVEYOR_REPO_BRANCH}
-    }
-}
-
-FetchBaseBranchIfNotMaster
-
 dotnet tool restore
 VerifySuccessExitCode
 

src/JsonApiDotNetCore.OpenApi.Client/JsonApiDotNetCore.OpenApi.Client.csproj

@@ -21,10 +21,6 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(APPVEYOR)' != ''">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="..\..\logo.png" Visible="false" Pack="True" PackagePath="" />
     <None Include="..\..\PackageReadme.md" Visible="false" Pack="True" PackagePath="" />

src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj

@@ -21,10 +21,6 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(APPVEYOR)' != ''">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Include="..\..\logo.png" Visible="false" Pack="True" PackagePath="" />
     <None Include="..\..\PackageReadme.md" Visible="false" Pack="True" PackagePath="" />

src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs

@@ -116,15 +116,15 @@ private string ApplyTemplate(string operationIdTemplate, ResourceType resourceTy
         string relationshipName = operationIdTemplate.Contains("[RelationshipName]") ? endpoint.RelativePath.Split("/").Last() : string.Empty;
 
         // @formatter:wrap_chained_method_calls chop_always
-        // @formatter:keep_existing_linebreaks true
+        // @formatter:wrap_before_first_method_call true true
 
         string pascalCaseOperationId = operationIdTemplate
             .Replace("[Method]", method)
             .Replace("[PrimaryResourceName]", resourceType.PublicName.Singularize())
             .Replace("[RelationshipName]", relationshipName)
             .ToPascalCase();
 
-        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_before_first_method_call true restore
         // @formatter:wrap_chained_method_calls restore
 
         return _namingPolicy != null ? _namingPolicy.ConvertName(pascalCaseOperationId) : pascalCaseOperationId;

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs

@@ -9,9 +9,9 @@ internal sealed class ResourceObjectSchemaGenerator
 {
     private readonly SchemaGenerator _defaultSchemaGenerator;
     private readonly IResourceGraph _resourceGraph;
+    private readonly IJsonApiOptions _options;
     private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
     private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;
-    private readonly bool _allowClientGeneratedIds;
     private readonly Func<ResourceTypeInfo, ResourceFieldObjectSchemaBuilder> _resourceFieldObjectSchemaBuilderFactory;
 
     public ResourceObjectSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions options,
@@ -24,12 +24,11 @@ public ResourceObjectSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IRe
 
         _defaultSchemaGenerator = defaultSchemaGenerator;
         _resourceGraph = resourceGraph;
+        _options = options;
         _schemaRepositoryAccessor = schemaRepositoryAccessor;
 
         _resourceTypeSchemaGenerator = new ResourceTypeSchemaGenerator(schemaRepositoryAccessor, resourceGraph, options.SerializerOptions.PropertyNamingPolicy);
 
-        _allowClientGeneratedIds = options.AllowClientGeneratedIds;
-
         _resourceFieldObjectSchemaBuilderFactory = resourceTypeInfo => new ResourceFieldObjectSchemaBuilder(resourceTypeInfo, schemaRepositoryAccessor,
             defaultSchemaGenerator, _resourceTypeSchemaGenerator, options.SerializerOptions.PropertyNamingPolicy);
     }
@@ -43,7 +42,7 @@ public OpenApiSchema GenerateSchema(Type resourceObjectType)
         var resourceTypeInfo = ResourceTypeInfo.Create(resourceObjectType, _resourceGraph);
         ResourceFieldObjectSchemaBuilder fieldObjectBuilder = _resourceFieldObjectSchemaBuilderFactory(resourceTypeInfo);
 
-        RemoveResourceIdIfPostResourceObject(resourceTypeInfo.ResourceObjectOpenType, fullSchemaForResourceObject);
+        RemoveResourceIdIfPostResourceObject(resourceTypeInfo, fullSchemaForResourceObject);
 
         SetResourceType(fullSchemaForResourceObject, resourceTypeInfo.ResourceType.ClrType);
 
@@ -76,12 +75,21 @@ public OpenApiSchema GenerateSchema(Type resourceObjectType)
         return (fullSchema, referenceSchema);
     }
 
-    private void RemoveResourceIdIfPostResourceObject(Type resourceObjectOpenType, OpenApiSchema fullSchemaForResourceObject)
+    private void RemoveResourceIdIfPostResourceObject(ResourceTypeInfo resourceTypeInfo, OpenApiSchema fullSchemaForResourceObject)
     {
-        if (resourceObjectOpenType == typeof(ResourceObjectInPostRequest<>) && !_allowClientGeneratedIds)
+        if (resourceTypeInfo.ResourceObjectOpenType == typeof(ResourceObjectInPostRequest<>))
         {
-            fullSchemaForResourceObject.Required.Remove(JsonApiObjectPropertyName.Id);
-            fullSchemaForResourceObject.Properties.Remove(JsonApiObjectPropertyName.Id);
+            ClientIdGenerationMode clientIdGeneration = resourceTypeInfo.ResourceType.ClientIdGeneration ?? _options.ClientIdGeneration;
+
+            if (clientIdGeneration == ClientIdGenerationMode.Forbidden)
+            {
+                fullSchemaForResourceObject.Required.Remove(JsonApiObjectPropertyName.Id);
+                fullSchemaForResourceObject.Properties.Remove(JsonApiObjectPropertyName.Id);
+            }
+            else if (clientIdGeneration == ClientIdGenerationMode.Allowed)
+            {
+                fullSchemaForResourceObject.Required.Remove(JsonApiObjectPropertyName.Id);
+            }
         }
     }
 

test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs

@@ -3,7 +3,6 @@
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
-// @formatter:keep_existing_linebreaks true
 
 namespace OpenApiTests.LegacyOpenApiIntegration;