Skip to content

Commit 627c34a

Browse files
committed
Nullability fixes
1 parent 79fd38a commit 627c34a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/Imazen.Routing/Layers/Licensing.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ public class LicenseOptions{
1616
internal class Licensing : ILicenseConfig, ILicenseChecker, IHasDiagnosticPageSection
1717
{
1818

19-
private readonly Func<Uri>? getCurrentRequestUrl;
19+
private readonly Func<Uri?>? getCurrentRequestUrl;
2020

2121
private readonly LicenseManagerSingleton mgr;
2222

2323
private Computation? cachedResult;
24-
internal Licensing(LicenseManagerSingleton mgr, Func<Uri>? getCurrentRequestUrl = null)
24+
internal Licensing(LicenseManagerSingleton mgr, Func<Uri?>? getCurrentRequestUrl = null)
2525
{
2626
this.mgr = mgr;
2727
this.getCurrentRequestUrl = getCurrentRequestUrl;

tests/Imageflow.Server.Tests/IntegrationTest.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ await Assert.ThrowsAsync<InvalidOperationException>(async () =>
106106

107107
using var wrongImageExtension1 = await client.GetAsync("/wrong.webp");
108108
wrongImageExtension1.EnsureSuccessStatusCode();
109-
Assert.Equal("image/png", wrongImageExtension1.Content.Headers.ContentType.MediaType);
109+
Assert.Equal("image/png", wrongImageExtension1.Content.Headers.ContentType?.MediaType);
110110

111111
using var wrongImageExtension2 = await client.GetAsync("/wrong.jpg");
112112
wrongImageExtension2.EnsureSuccessStatusCode();
113-
Assert.Equal("image/png", wrongImageExtension2.Content.Headers.ContentType.MediaType);
113+
Assert.Equal("image/png", wrongImageExtension2.Content.Headers.ContentType?.MediaType);
114114

115115
using var extensionlessRequest = await client.GetAsync("/extensionless/file");
116116
extensionlessRequest.EnsureSuccessStatusCode();
117-
Assert.Equal("image/png", extensionlessRequest.Content.Headers.ContentType.MediaType);
117+
Assert.Equal("image/png", extensionlessRequest.Content.Headers.ContentType?.MediaType);
118118

119119

120120
using var response2 = await client.GetAsync("/fire.jpg?width=1");

tests/Imageflow.Server.Tests/TempContentRoot.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public TempContentRoot AddResource(string relativePath, string resourceName)
2626
using var reader = embeddedProvider.GetFileInfo(resourceName).CreateReadStream();
2727
var newFilePath = Path.Combine(PhysicalPath, relativePath.Replace('/', Path.DirectorySeparatorChar));
2828
var parentDir = Path.GetDirectoryName(newFilePath);
29-
if (!Directory.Exists(parentDir))
29+
if (parentDir != null && !Directory.Exists(parentDir))
3030
Directory.CreateDirectory(parentDir);
3131
using var newFile = File.Create(newFilePath);
3232
reader.CopyTo(newFile);

tests/Imageflow.Server.Tests/TestLicensing.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ namespace Imageflow.Server.Tests
1414
{
1515
class RequestUrlProvider
1616
{
17-
public Uri Url { get; set; } = null;
18-
public Uri Get() => Url;
17+
public Uri? Url { get; set; }
18+
public Uri? Get() => Url;
1919
}
2020

2121
public class TestLicensing

0 commit comments

Comments
 (0)