Address CodeRabbit review feedback (round 2)

Jaben · Jaben · commit 817ba64b975e · 2026-03-28T23:22:02.000-04:00
diff --git a/README.md b/README.md
@@ -154,6 +154,7 @@ using Gotenberg.Sharp.API.Client;
 using Gotenberg.Sharp.API.Client.Domain.Builders;
 using Gotenberg.Sharp.API.Client.Domain.Builders.Faceted;
 using Gotenberg.Sharp.API.Client.Domain.Requests.Facets; // For Cookie, etc.
+using Gotenberg.Sharp.API.Client.Domain.ValueObjects; // For ScreenshotFormat, etc.
 ```
 
 ### HTML To PDF
diff --git a/examples/Screenshot/Program.cs b/examples/Screenshot/Program.cs
@@ -17,18 +17,18 @@
 var destinationDirectory = args.Length > 0 ? args[0] : Path.Combine(Directory.GetCurrentDirectory(), "output");
 Directory.CreateDirectory(destinationDirectory);
 
+var sharpClient = CreateClient(options);
+
 // Screenshot from HTML
-var htmlPath = await ScreenshotFromHtml(destinationDirectory, options);
+var htmlPath = await ScreenshotFromHtml(destinationDirectory, sharpClient);
 Console.WriteLine($"HTML screenshot: {htmlPath}");
 
 // Screenshot from URL
-var urlPath = await ScreenshotFromUrl(destinationDirectory, options);
+var urlPath = await ScreenshotFromUrl(destinationDirectory, sharpClient);
 Console.WriteLine($"URL screenshot: {urlPath}");
 
-static async Task<string> ScreenshotFromHtml(string destinationDirectory, GotenbergSharpClientOptions options)
+static async Task<string> ScreenshotFromHtml(string destinationDirectory, GotenbergSharpClient sharpClient)
 {
-    var sharpClient = CreateClient(options);
-
     var builder = new ScreenshotHtmlRequestBuilder()
         .AddDocument(doc => doc.SetBody(@"
             <html>
@@ -41,18 +41,16 @@ static async Task<string> ScreenshotFromHtml(string destinationDirectory, Gotenb
             .SetSize(1280, 720)
             .SetFormat(ScreenshotFormat.Png));
 
-    var response = await sharpClient.ScreenshotHtmlAsync(builder);
+    await using var response = await sharpClient.ScreenshotHtmlAsync(builder);
 
     var resultPath = Path.Combine(destinationDirectory, $"ScreenshotHtml-{DateTime.Now:yyyyMMddHHmmss}.png");
     await using var file = File.Create(resultPath);
     await response.CopyToAsync(file);
     return resultPath;
 }
 
-static async Task<string> ScreenshotFromUrl(string destinationDirectory, GotenbergSharpClientOptions options)
+static async Task<string> ScreenshotFromUrl(string destinationDirectory, GotenbergSharpClient sharpClient)
 {
-    var sharpClient = CreateClient(options);
-
     var builder = new ScreenshotUrlRequestBuilder()
         .SetUrl("https://example.com")
         .WithScreenshotProperties(p => p
@@ -61,7 +59,7 @@ static async Task<string> ScreenshotFromUrl(string destinationDirectory, Gotenbe
             .SetQuality(90)
             .SetClip());
 
-    var response = await sharpClient.ScreenshotUrlAsync(builder);
+    await using var response = await sharpClient.ScreenshotUrlAsync(builder);
 
     var resultPath = Path.Combine(destinationDirectory, $"ScreenshotUrl-{DateTime.Now:yyyyMMddHHmmss}.jpg");
     await using var file = File.Create(resultPath);
diff --git a/src/Gotenberg.Sharp.Api.Client/Domain/Requests/ScreenshotRequest.cs b/src/Gotenberg.Sharp.Api.Client/Domain/Requests/ScreenshotRequest.cs
@@ -29,7 +29,6 @@ protected override IEnumerable<HttpContent> ToHttpContent()
     {
         return this.ScreenshotProperties.ToHttpContent()
             .Concat(this.ConversionBehaviors.ToHttpContent())
-            .Concat(this.Config.IfNullEmptyContent())
-            .Concat(base.ToHttpContent());
+            .Concat(this.Config.IfNullEmptyContent());
     }
 }
diff --git a/test/GotenbergSharpClient.Tests/ScreenshotTests.cs b/test/GotenbergSharpClient.Tests/ScreenshotTests.cs
@@ -149,7 +149,7 @@ public async Task ScreenshotHtml_ReturnsImage()
                 .SetSize(800, 600)
                 .SetFormat(ScreenshotFormat.Png));
 
-        var result = await client.ScreenshotHtmlAsync(builder);
+        using var result = await client.ScreenshotHtmlAsync(builder);
 
         result.Should().NotBeNull();
         result.Length.Should().BeGreaterThan(0);
@@ -177,7 +177,7 @@ public async Task ScreenshotUrl_ReturnsImage()
                 .SetFormat(ScreenshotFormat.Jpeg)
                 .SetQuality(90));
 
-        var result = await client.ScreenshotUrlAsync(builder);
+        using var result = await client.ScreenshotUrlAsync(builder);
 
         result.Should().NotBeNull();
         result.Length.Should().BeGreaterThan(0);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ protected override IEnumerable<HttpContent> ToHttpContent()`
`29`	`29`	`{`
`30`	`30`	`return this.ScreenshotProperties.ToHttpContent()`
`31`	`31`	`.Concat(this.ConversionBehaviors.ToHttpContent())`
`32`		`- .Concat(this.Config.IfNullEmptyContent())`
`33`		`- .Concat(base.ToHttpContent());`
	`32`	`+ .Concat(this.Config.IfNullEmptyContent());`
`34`	`33`	`}`
`35`	`34`	`}`