refactor: Use is (not) null

linkdotnet · Mar 1, 2024 · 4107baa · 4107baa
1 parent 81165c0
commit 4107baa
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 24 deletions.
diff --git a/src/LinkDotNet.Blog.Infrastructure/Persistence/InMemory/Repository.cs b/src/LinkDotNet.Blog.Infrastructure/Persistence/InMemory/Repository.cs
@@ -39,12 +39,12 @@ public ValueTask<IPagedList<TProjection>> GetAllByProjectionAsync<TProjection>(
     {
         ArgumentNullException.ThrowIfNull(selector);
         var result = entities.AsEnumerable();
-        if (filter != null)
+        if (filter is not null)
         {
             result = result.Where(filter.Compile());
         }
 
-        if (orderBy != null)
+        if (orderBy is not null)
         {
             result = descending
                 ? result.OrderByDescending(orderBy.Compile())
@@ -64,7 +64,7 @@ public ValueTask StoreAsync(TEntity entity)
         }
 
         var entry = entities.SingleOrDefault(b => b.Id == entity.Id);
-        if (entry != null)
+        if (entry is not null)
         {
             entities.Remove(entry);
         }
@@ -76,7 +76,7 @@ public ValueTask StoreAsync(TEntity entity)
     public ValueTask DeleteAsync(string id)
     {
         var blogPostToDelete = entities.SingleOrDefault(b => b.Id == id);
-        if (blogPostToDelete != null)
+        if (blogPostToDelete is not null)
         {
             entities.Remove(blogPostToDelete);
         }

diff --git a/src/LinkDotNet.Blog.Infrastructure/Persistence/MongoDB/Repository.cs b/src/LinkDotNet.Blog.Infrastructure/Persistence/MongoDB/Repository.cs
@@ -62,12 +62,12 @@ public async ValueTask<IPagedList<TProjection>> GetAllByProjectionAsync<TProject
     {
         var query = Collection.AsQueryable();
 
-        if (filter != null)
+        if (filter is not null)
         {
             query = query.Where(filter);
         }
 
-        if (orderBy != null)
+        if (orderBy is not null)
         {
             query = descending ? query.OrderByDescending(orderBy) : query.OrderBy(orderBy);
         }

diff --git a/src/LinkDotNet.Blog.Infrastructure/Persistence/RavenDb/Repository.cs b/src/LinkDotNet.Blog.Infrastructure/Persistence/RavenDb/Repository.cs
@@ -59,12 +59,12 @@ public async ValueTask<IPagedList<TProjection>> GetAllByProjectionAsync<TProject
         using var session = documentStore.OpenAsyncSession();
 
         var query = session.Query<TEntity>();
-        if (filter != null)
+        if (filter is not null)
         {
             query = query.Where(filter);
         }
 
-        if (orderBy != null)
+        if (orderBy is not null)
         {
             query = descending
                 ? query.OrderByDescending(orderBy)

diff --git a/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Repository.cs b/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Repository.cs
@@ -62,12 +62,12 @@ public async ValueTask<IPagedList<TProjection>> GetAllByProjectionAsync<TProject
         var blogDbContext = await dbContextFactory.CreateDbContextAsync();
         var entity = blogDbContext.Set<TEntity>().AsNoTracking().AsQueryable();
 
-        if (filter != null)
+        if (filter is not null)
         {
             entity = entity.Where(filter);
         }
 
-        if (orderBy != null)
+        if (orderBy is not null)
         {
             entity = descending
                 ? entity.OrderByDescending(orderBy)
@@ -97,7 +97,7 @@ public async ValueTask StoreAsync(TEntity entity)
     public async ValueTask DeleteAsync(string id)
     {
         var entityToDelete = await GetByIdAsync(id);
-        if (entityToDelete != null)
+        if (entityToDelete is not null)
         {
             var blogDbContext = await dbContextFactory.CreateDbContextAsync();
             blogDbContext.Remove(entityToDelete);

diff --git a/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Profile.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Profile.razor
@@ -98,7 +98,7 @@ OnYesPressed="DeleteItem"></ConfirmDialog>
 
     private async Task HandleDrop(ProfileInformationEntry dropTarget)
     {
-        if (currentDragItem == null || dropTarget  == currentDragItem)
+        if (currentDragItem is null || dropTarget == currentDragItem)
         {
             return;
         }

diff --git a/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Skill/SkillTable.razor b/src/LinkDotNet.Blog.Web/Features/AboutMe/Components/Skill/SkillTable.razor
@@ -83,7 +83,7 @@
 
     private async Task HandleDrop(ProficiencyLevel proficiencyLevel)
     {
-        if (currentDragItem == null || currentDragItem.ProficiencyLevel == proficiencyLevel)
+        if (currentDragItem is null || currentDragItem.ProficiencyLevel == proficiencyLevel)
         {
             return;
         }

diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor
@@ -65,7 +65,7 @@
 	            <label for="tags">Tags</label>
 	            <InputText class="form-control" id="tags" @bind-Value="model.Tags"/>
             </div>
-            @if (BlogPost != null && !IsScheduled)
+            @if (BlogPost is not null && !IsScheduled)
             {
                 <div class="form-check">
                     <InputCheckbox class="form-check-input" id="updatedate" @bind-Value="model.ShouldUpdateDate" />
@@ -117,7 +117,7 @@
 
     protected override void OnParametersSet()
     {
-        if (BlogPost == null)
+        if (BlogPost is null)
         {
             return;
         }

diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/UpdateBlogPostPage.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/UpdateBlogPostPage.razor
@@ -6,7 +6,7 @@
 @inject IRepository<BlogPost> BlogPostRepository
 @inject IToastService ToastService
 
-@if (blogPostFromDb != null)
+@if (blogPostFromDb is not null)
 {
     <CreateNewBlogPost
         Title="Update BlogPost"
@@ -38,4 +38,4 @@ else
         await BlogPostRepository.StoreAsync(blogPostFromDb);
         ToastService.ShowInfo($"Updated BlogPost {blogPost.Title}");
     }
-}
+}
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/VisitCountPerPage.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Dashboard/Components/VisitCountPerPage.razor
@@ -16,7 +16,7 @@
     <div class="card-body">
         <div class="row">
             <DateRangeSelector FilterChanged="RefreshVisitCount"></DateRangeSelector>
-            @if (visitData != null)
+            @if (visitData is not null)
             {
                 <p id="total-clicks">@visitData.Sum(c => c.ClickCount) clicks in total</p>
             }
@@ -31,7 +31,7 @@
                     <th>Clicks</th>
                     <th>Likes</th>
                 </tr>
-                @if (visitData != null)
+                @if (visitData is not null)
                 {
                     @foreach (var date in visitData)
                     {

diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/SitemapPage.razor b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/SitemapPage.razor
@@ -14,7 +14,7 @@
     {
         <Loading></Loading>
     }
-    @if (sitemapUrlSet != null)
+    @if (sitemapUrlSet is not null)
     {
         <table class="table table-striped table-hover h-50">
             <thead>

diff --git a/src/LinkDotNet.Blog.Web/Features/Archive/ArchivePage.razor b/src/LinkDotNet.Blog.Web/Features/Archive/ArchivePage.razor
@@ -9,7 +9,7 @@
 <div class="ps-2">
     <h3 class="pb-3">Archive (@blogPostCount posts)</h3>
 
-    @if (blogPostsPerYear == null)
+    @if (blogPostsPerYear is null)
     {
         <Loading></Loading>
     }

diff --git a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
@@ -45,7 +45,7 @@ else
 					<h1>@BlogPost.Title</h1></header>
 				<div class="blogpost-metainformation d-flex flex-row flex-wrap gap-2">
 					<div><span class="date"></span><span class="ms-1">@BlogPost.UpdatedDate.ToString("dd/MM/yyyy")</span></div>
-					@if (BlogPost.Tags != null && BlogPost.Tags.Any())
+					@if (BlogPost.Tags is not null && BlogPost.Tags.Any())
 					{
 						<span class="blogpost-tag d-inline-block">
 							@foreach (var tag in BlogPost.Tags)

diff --git a/tests/LinkDotNet.Blog.IntegrationTests/SmokeTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/SmokeTests.cs
@@ -64,7 +64,7 @@ public async Task ShouldAllowDotsForFreeTextSearch()
 
     public async ValueTask DisposeAsync()
     {
-        if (factory != null)
+        if (factory is not null)
         {
             await factory.DisposeAsync();
         }

diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs
@@ -78,7 +78,7 @@ private static void AssertMetaTagExistsWithValue(
         titleMeta.Should().NotBeNull();
         var titleMetaTag = (IHtmlMetaElement)titleMeta;
         titleMetaTag.Content.Should().Be(metaTagValue);
-        if (ogPropertyName != null)
+        if (ogPropertyName is not null)
         {
             titleMetaTag.Attributes.Any(a => a.Value == ogPropertyName).Should().BeTrue();
         }