feat: Add analyzers and correct warnings

nikcio · Apr 6, 2024 · 9503de8 · 9503de8
1 parent 91e16b5
commit 9503de8
Show file tree

Hide file tree

Showing 145 changed files with 1,276 additions and 983 deletions.
diff --git a/src/.editorconfig b/src/.editorconfig
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,12 @@
+<Project>
+    <PropertyGroup>
+        <AnalysisMode>All</AnalysisMode>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    </PropertyGroup>
+    <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    </ItemGroup>
+</Project>
diff --git a/src/Examples/Docs/Content/PublicAccessExample/CustomBasicContent.cs b/src/Examples/Docs/Content/PublicAccessExample/CustomBasicContent.cs
@@ -1,4 +1,5 @@
-using HotChocolate;
+using System;
+using HotChocolate;
 using Microsoft.Extensions.Logging;
 using Nikcio.UHeadless.Base.Basics.Models;
 using Nikcio.UHeadless.Base.Properties.Factories;
@@ -28,6 +29,8 @@ public class CustomBasicContent : BasicContent<BasicProperty, BasicContentType,
 
     public CustomBasicContent(CreateContent createContent, IPropertyFactory<BasicProperty> propertyFactory, IContentTypeFactory<BasicContentType> contentTypeFactory, IContentFactory<CustomBasicContent> contentFactory, IVariationContextAccessor variationContextAccessor, IPublicAccessService publicAccessService, IContentService contentService, IUmbracoContextAccessor context, ILogger<CustomBasicContent> logger) : base(createContent, propertyFactory, contentTypeFactory, contentFactory, variationContextAccessor)
     {
+        ArgumentNullException.ThrowIfNull(createContent);
+
         _publicAccessService = publicAccessService;
         _contentService = contentService;
         _context = context;
@@ -43,15 +46,15 @@ public CustomBasicContent(CreateContent createContent, IPropertyFactory<BasicPro
 
         if (content == null)
         {
-            _logger.LogWarning("Content from content service is null. Id: {contentId}", createContent.Content.Id);
+            _logger.LogWarning("Content from content service is null. Id: {ContentId}", createContent.Content.Id);
             return;
         }
 
         PublicAccessEntry? entry = _publicAccessService.GetEntryForContent(content);
 
         if (entry != null)
         {
-            var cache = _context.GetRequiredUmbracoContext();
+            IUmbracoContext cache = _context.GetRequiredUmbracoContext();
 
             if (cache.Content == null)
             {

diff --git a/src/Examples/Docs/Content/PublicAccessExample/PermissionsModel.cs b/src/Examples/Docs/Content/PublicAccessExample/PermissionsModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using HotChocolate;
 
 namespace Examples.Docs.Content.PublicAccessExample;
@@ -8,7 +8,7 @@ public class PermissionsModel
 {
     public PermissionsModel()
     {
-        AccessRules = new List<AccessRuleModel>();
+        AccessRules = [];
     }
 
     [GraphQLDescription("Gets the url to the login page.")]
@@ -19,4 +19,4 @@ public PermissionsModel()
 
     [GraphQLDescription("Gets the access rules for the restrict public access settings.")]
     public List<AccessRuleModel> AccessRules { get; set; }
-}
+}
diff --git a/src/Examples/Docs/PropertyValues/MyPropertyValue.cs b/src/Examples/Docs/PropertyValues/MyPropertyValue.cs
@@ -1,4 +1,5 @@
-using Nikcio.UHeadless.Base.Properties.Commands;
+using System;
+using Nikcio.UHeadless.Base.Properties.Commands;
 using Nikcio.UHeadless.Base.Properties.Models;
 
 namespace Examples.Docs.PropertyValues;
@@ -9,7 +10,9 @@ public class MyPropertyValue : PropertyValue
 
     public MyPropertyValue(CreatePropertyValue createPropertyValue) : base(createPropertyValue)
     {
-        var value = createPropertyValue.Property.GetValue(createPropertyValue.Culture);
+        ArgumentNullException.ThrowIfNull(createPropertyValue);
+
+        object? value = createPropertyValue.Property.GetValue(createPropertyValue.Culture);
         if (value == null)
         {
             return;

diff --git a/src/Examples/Program.cs b/src/Examples/Program.cs
@@ -1,21 +1,121 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using HotChocolate.Execution.Configuration;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Data.Sqlite;
+using Microsoft.Extensions.DependencyInjection;
+using Nikcio.UHeadless.Content.Basics.Queries;
+using Nikcio.UHeadless.Content.Extensions;
+using Nikcio.UHeadless.Extensions;
+using Nikcio.UHeadless.Media.Basics.Queries;
+using Nikcio.UHeadless.Media.Extensions;
+using Nikcio.UHeadless.Members.Basics.Queries;
+using Nikcio.UHeadless.Members.Extensions;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.DependencyInjection;
+using Umbraco.Extensions;
 
-namespace Examples;
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
-public class Program
-{
-    public static void Main(string[] args)
-        => CreateHostBuilder(args)
-            .Build()
-            .Run();
-
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-        Host.CreateDefaultBuilder(args)
-            .ConfigureUmbracoDefaults()
-            .ConfigureWebHostDefaults(webBuilder =>
+builder.CreateUmbracoBuilder()
+    .AddBackOffice()
+    .AddWebsite()
+    .AddDeliveryApi()
+    .AddComposers()
+    .AddUHeadless(new()
+    {
+        PropertyServicesOptions = new()
+        {
+            PropertyMapOptions = new()
+            {
+                PropertyMappings = []
+            },
+        },
+        TracingOptions = new()
+        {
+            TimestampProvider = null,
+            TracingPreference = HotChocolate.Execution.Options.TracingPreference.Never,
+        },
+        UHeadlessGraphQLOptions = new()
+        {
+            GraphQLExtensions = (IRequestExecutorBuilder builder) =>
             {
-                webBuilder.UseStaticWebAssets();
-                webBuilder.UseStartup<Startup>();
-            });
+                builder.AddAuthorization();
+
+                builder.UseContentQueries();
+                builder.AddTypeExtension<BasicContentAllQuery>();
+                builder.AddTypeExtension<BasicContentAtRootQuery>();
+                builder.AddTypeExtension<BasicContentByAbsoluteRouteQuery>();
+                builder.AddTypeExtension<BasicContentByContentTypeQuery>();
+                builder.AddTypeExtension<BasicContentByGuidQuery>();
+                builder.AddTypeExtension<BasicContentByIdQuery>();
+                builder.AddTypeExtension<BasicContentByTagQuery>();
+                builder.AddTypeExtension<BasicContentDescendantsByAbsoluteRouteQuery>();
+                builder.AddTypeExtension<BasicContentDescendantsByContentTypeQuery>();
+                builder.AddTypeExtension<BasicContentDescendantsByGuidQuery>();
+                builder.AddTypeExtension<BasicContentDescendantsByIdQuery>();
+
+                builder.UseMediaQueries();
+                builder.AddTypeExtension<BasicMediaAtRootQuery>();
+                builder.AddTypeExtension<BasicMediaByContentTypeQuery>();
+                builder.AddTypeExtension<BasicMediaByGuidQuery>();
+                builder.AddTypeExtension<BasicMediaByIdQuery>();
+
+                builder.UseMemberQueries();
+                builder.AddTypeExtension<BasicMembersAllQuery>();
+                builder.AddTypeExtension<BasicFindMembersByDisplayNameQuery>();
+                builder.AddTypeExtension<BasicFindMembersByEmailQuery>();
+                builder.AddTypeExtension<BasicFindMembersByRoleQuery>();
+                builder.AddTypeExtension<BasicFindMembersByUsernameQuery>();
+                builder.AddTypeExtension<BasicMemberByEmailQuery>();
+                builder.AddTypeExtension<BasicMemberByIdQuery>();
+                builder.AddTypeExtension<BasicMemberByKeyQuery>();
+                builder.AddTypeExtension<BasicMemberByUsernameQuery>();
+                builder.AddTypeExtension<BasicMembersByIdQuery>();
+                return builder;
+            },
+        },
+    })
+    .Build();
+
+WebApplication app = builder.Build();
+
+await app.BootUmbracoAsync().ConfigureAwait(false);
+
+app.UseAuthentication();
+app.UseAuthorization();
+
+
+app.MapUHeadlessGraphQLEndpoint(new()
+{
+    CorsPolicy = null,
+    GraphQLPath = "/graphql",
+    GraphQLServerOptions = new()
+    {
+        Tool =
+        {
+            Enable = true
+        }
+    }
+});
+
+app.UseUmbraco()
+    .WithMiddleware(u =>
+    {
+        u.UseBackOffice();
+        u.UseWebsite();
+    })
+    .WithEndpoints(u =>
+    {
+        u.UseInstallerEndpoints();
+        u.UseBackOfficeEndpoints();
+        u.UseWebsiteEndpoints();
+    });
+
+await app.RunAsync().ConfigureAwait(false);
+
+public partial class Program
+{
+    private Program()
+    {
+
+    }
 }
diff --git a/src/Examples/Startup.cs b/src/Examples/Startup.cs