Process feedback

Author: maurei

src/JsonApiDotNetCore.OpenApi.Client/ApiException.cs

@@ -7,7 +7,7 @@
 namespace JsonApiDotNetCore.OpenApi.Client.Exceptions;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-internal class ApiException : Exception
+public sealed class ApiException : Exception
 {
     public int StatusCode { get; }
 
@@ -28,16 +28,3 @@ public override string ToString()
         return $"HTTP Response: \n\n{Response}\n\n{base.ToString()}";
     }
 }
-
-[UsedImplicitly(ImplicitUseTargetFlags.Members)]
-internal sealed class ApiException<TResult> : ApiException
-{
-    public TResult Result { get; }
-
-    public ApiException(string message, int statusCode, string? response, IReadOnlyDictionary<string, IEnumerable<string>> headers, TResult result,
-        Exception innerException)
-        : base(message, statusCode, response, headers, innerException)
-    {
-        Result = result;
-    }
-}

src/JsonApiDotNetCore.OpenApi/StringExtensions.cs

@@ -4,10 +4,10 @@ namespace JsonApiDotNetCore.OpenApi;
 
 internal static class StringExtensions
 {
-    private static readonly Regex PatternForPascalCaseConversion = new("(?:^|-|_| +)(.)", RegexOptions.Compiled);
+    private static readonly Regex Regex = new("(?:^|-|_| +)(.)", RegexOptions.Compiled);
 
     public static string ToPascalCase(this string source)
     {
-        return PatternForPascalCaseConversion.Replace(source, match => match.Groups[1].Value.ToUpper());
+        return Regex.Replace(source, match => match.Groups[1].Value.ToUpper());
     }
 }

test/OpenApiClientTests/NamingConventions/KebabCase/GeneratedTypesTests.cs

@@ -49,7 +49,6 @@ public void Generated_code_is_named_as_expected()
         _ = nameof(ToManyStaffMemberInResponse);
         _ = nameof(LinksInRelationshipObject);
         _ = nameof(StaffMemberIdentifier);
-        _ = nameof(StaffMemberResourceType);
         _ = nameof(StaffMemberResourceType.StaffMembers);
         _ = nameof(SupermarketPrimaryResponseDocument);
         _ = nameof(LinksInResourceDocument);

test/OpenApiClientTests/OpenApiClientTests.csproj

@@ -3,17 +3,17 @@
     <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj" />
-    <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj" />
+    <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />

test/OpenApiTests/JsonElementExtensions.cs

@@ -25,26 +25,26 @@ public static void ShouldBeString(this JsonElement source, string value)
         source.GetString().Should().Be(value);
     }
 
-    public static ReferenceSchemaIdContainer ShouldBeReferenceSchemaId(this JsonElement source, string value)
+    public static SchemaReferenceIdContainer ShouldBeSchemaReferenceId(this JsonElement source, string value)
     {
         source.ValueKind.Should().Be(JsonValueKind.String);
 
         string? jsonElementValue = source.GetString();
         jsonElementValue.ShouldNotBeNull();
 
-        string referenceSchemaId = jsonElementValue.Split('/').Last();
-        referenceSchemaId.Should().Be(value);
+        string schemaReferenceId = jsonElementValue.Split('/').Last();
+        schemaReferenceId.Should().Be(value);
 
-        return new ReferenceSchemaIdContainer(value);
+        return new SchemaReferenceIdContainer(value);
     }
 
-    public sealed class ReferenceSchemaIdContainer
+    public sealed class SchemaReferenceIdContainer
     {
-        public string ReferenceSchemaId { get; }
+        public string SchemaReferenceId { get; }
 
-        public ReferenceSchemaIdContainer(string referenceSchemaId)
+        public SchemaReferenceIdContainer(string schemaReferenceId)
         {
-            ReferenceSchemaId = referenceSchemaId;
+            SchemaReferenceId = schemaReferenceId;
         }
     }
 

test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationTests.cs

@@ -13,31 +13,32 @@ public LegacyOpenApiIntegrationTests()
         UseController<AirplanesController>();
         UseController<FlightsController>();
         UseController<FlightAttendantsController>();
-        GeneratedDocumentNamespace = "OpenApiClientTests.LegacyClient";
+
+        SwaggerDocumentOutputPath = "test/OpenApiClientTests/LegacyClient";
     }
 
     [Fact]
-    public async Task Retrieved_document_matches_expected_document()
+    public async Task Retrieved_swagger_document_matches_expected_document()
     {
         // Act
-        JsonElement jsonElement = await LazyDocument.Value;
+        JsonElement jsonElement = await GetSwaggerDocumentAsync();
 
         // Assert
-        const string embeddedResourceName = $"{nameof(OpenApiTests)}.{nameof(LegacyOpenApiIntegration)}.swagger.json";
-        string expectedDocument = await LoadEmbeddedResourceAsync(embeddedResourceName);
-
+        string expectedJsonText = await GetExpectedSwaggerDocumentAsync();
         string jsonText = jsonElement.ToString();
-        jsonText.Should().BeJson(expectedDocument);
+        jsonText.Should().BeJson(expectedJsonText);
     }
 
-    private static async Task<string> LoadEmbeddedResourceAsync(string name)
+    private static async Task<string> GetExpectedSwaggerDocumentAsync()
     {
+        const string embeddedResourceName = $"{nameof(OpenApiTests)}.{nameof(LegacyOpenApiIntegration)}.swagger.json";
         var assembly = Assembly.GetExecutingAssembly();
-        await using Stream? stream = assembly.GetManifestResourceStream(name);
+
+        await using Stream? stream = assembly.GetManifestResourceStream(embeddedResourceName);
 
         if (stream == null)
         {
-            throw new Exception($"Failed to load embedded resource '{name}'. Set Build Action to Embedded Resource in properties.");
+            throw new Exception($"Failed to load embedded resource '{embeddedResourceName}'. Set Build Action to Embedded Resource in properties.");
         }
 
         using var reader = new StreamReader(stream);