Fixed various analyzer errors (#9013)

glen-84 · web-flow · commit 65a4eb230b6a · 2025-12-19T17:58:43.000+02:00
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/OperationToolFactory.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp.Core/OperationToolFactory.cs
@@ -30,7 +30,7 @@ public OperationTool CreateTool(OperationToolDefinition toolDefinition)
 
         if (toolDefinition.OpenAiComponent is { } openAiComponent)
         {
-            meta = new JsonObject();
+            meta = [];
             AddOpenAiComponentMetadata(meta, toolDefinition);
             openAiComponentResource = CreateOpenAiComponentResource(openAiComponent, toolDefinition);
         }
@@ -171,13 +171,13 @@ private static Resource CreateOpenAiComponentResource(
 
         if (openAiComponent.Description is not null)
         {
-            meta ??= new JsonObject();
+            meta ??= [];
             meta["openai/widgetDescription"] = openAiComponent.Description;
         }
 
         if (openAiComponent.PrefersBorder is not null)
         {
-            meta ??= new JsonObject();
+            meta ??= [];
             meta["openai/widgetPrefersBorder"] = openAiComponent.PrefersBorder;
         }
 
@@ -187,30 +187,30 @@ private static Resource CreateOpenAiComponentResource(
 
             if (csp.ConnectDomains is { Length: > 0 } connectDomains)
             {
-                contentSecurityPolicy ??= new JsonObject();
+                contentSecurityPolicy ??= [];
                 contentSecurityPolicy.Add(
                     "connect_domains",
                     new JsonArray(connectDomains.Select(d => JsonValue.Create(d)).ToArray<JsonNode>()));
             }
 
             if (csp.ResourceDomains is { Length: > 0 } resourceDomains)
             {
-                contentSecurityPolicy ??= new JsonObject();
+                contentSecurityPolicy ??= [];
                 contentSecurityPolicy.Add(
                     "resource_domains",
                     new JsonArray(resourceDomains.Select(d => JsonValue.Create(d)).ToArray<JsonNode>()));
             }
 
             if (contentSecurityPolicy is not null)
             {
-                meta ??= new JsonObject();
+                meta ??= [];
                 meta.Add("openai/widgetCSP", contentSecurityPolicy);
             }
         }
 
         if (openAiComponent.Domain is not null)
         {
-            meta ??= new JsonObject();
+            meta ??= [];
             meta.Add("openai/widgetDomain", openAiComponent.Domain);
         }
 
diff --git a/src/HotChocolate/Adapters/src/Adapters.OpenApi.AspNetCore/DynamicOpenApiDocumentTransformer.cs b/src/HotChocolate/Adapters/src/Adapters.OpenApi.AspNetCore/DynamicOpenApiDocumentTransformer.cs
@@ -475,8 +475,7 @@ private static OpenApiSchema CreateScalarSchema(IScalarTypeDefinition scalarType
         else
         {
             schema.OneOf = jsonSchemaTypes
-                .Select(IOpenApiSchema (t) => new OpenApiSchema { Type = t })
-                .ToList();
+                .ConvertAll(OpenApiSchemaAbstraction (t) => new OpenApiSchema { Type = t });
         }
 #else
         var jsonSchemaTypes = GetJsonSchemaTypes(scalarType);
@@ -785,7 +784,7 @@ private static OpenApiSchemaAbstraction CreateOpenApiSchemaForSelectionSet(
                     modelLookup,
                     optional: optional || isDifferentType || isSelectionConditional);
 
-                fragmentSchemasByType ??= new Dictionary<string, List<OpenApiSchemaAbstraction>>();
+                fragmentSchemasByType ??= [];
 
                 if (!fragmentSchemasByType.TryGetValue(typeName, out var schemaList))
                 {
@@ -803,7 +802,7 @@ private static OpenApiSchemaAbstraction CreateOpenApiSchemaForSelectionSet(
                 {
                     var typeName = externalFragment.FragmentDefinition.TypeCondition.Name.Value;
 
-                    fragmentSchemasByType ??= new Dictionary<string, List<OpenApiSchemaAbstraction>>();
+                    fragmentSchemasByType ??= [];
 
                     if (!fragmentSchemasByType.TryGetValue(typeName, out var schemaList))
                     {
@@ -841,7 +840,7 @@ private static OpenApiSchemaAbstraction CreateOpenApiSchemaForSelectionSet(
                         modelLookup,
                         optional: optional || isDifferentType || isSelectionConditional);
 
-                    fragmentSchemasByType ??= new Dictionary<string, List<OpenApiSchemaAbstraction>>();
+                    fragmentSchemasByType ??= [];
 
                     if (!fragmentSchemasByType.TryGetValue(typeName, out var schemaList))
                     {
diff --git a/src/HotChocolate/Adapters/src/Adapters.OpenApi.Core/Parser/OpenApiDefinitionParser.cs b/src/HotChocolate/Adapters/src/Adapters.OpenApi.Core/Parser/OpenApiDefinitionParser.cs
@@ -98,7 +98,7 @@ private static OpenApiDefinitionParsingResult ParseOperation(
 
         var cleanOperation = RewriteOperation(operation);
 
-        List<IDefinitionNode> cleanDefinitions = [cleanOperation, ..document.Definitions];
+        List<IDefinitionNode> cleanDefinitions = [cleanOperation, .. document.Definitions];
         cleanDefinitions.Remove(operation);
 
         var fragmentReferences = FragmentReferenceFinder.Find(document);
@@ -107,8 +107,8 @@ private static OpenApiDefinitionParsingResult ParseOperation(
             httpMethod,
             route,
             description,
-            [..routeParameters],
-            [..queryParameters],
+            [.. routeParameters],
+            [.. queryParameters],
             bodyVariableName,
             new DocumentNode(cleanDefinitions),
             fragmentReferences.Local,
diff --git a/src/HotChocolate/Adapters/src/Adapters.OpenApi/Extensions/RequestExecutorBuilderExtensions.cs b/src/HotChocolate/Adapters/src/Adapters.OpenApi/Extensions/RequestExecutorBuilderExtensions.cs
@@ -23,8 +23,7 @@ public static IRequestExecutorBuilder AddOpenApiDefinitionStorage(
     }
 
     public static IRequestExecutorBuilder AddOpenApiDefinitionStorage<
-        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
-        T>(
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(
         this IRequestExecutorBuilder builder)
         where T : class, IOpenApiDefinitionStorage
     {
diff --git a/src/HotChocolate/Core/src/Types/Configuration/TypeDiscoverer.cs b/src/HotChocolate/Core/src/Types/Configuration/TypeDiscoverer.cs
@@ -1,7 +1,6 @@
 using HotChocolate.Properties;
 using HotChocolate.Types;
 using HotChocolate.Types.Descriptors;
-using HotChocolate.Types.Introspection;
 
 namespace HotChocolate.Configuration;
 
diff --git a/src/HotChocolate/Language/src/Language.SyntaxTree/Utilities/SyntaxPrinter.cs b/src/HotChocolate/Language/src/Language.SyntaxTree/Utilities/SyntaxPrinter.cs
@@ -1,4 +1,3 @@
-using System.Buffers;
 using System.Text;
 
 namespace HotChocolate.Language.Utilities;
diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/Fusion/FusionDownloadCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/Fusion/FusionDownloadCommand.cs
@@ -39,7 +39,7 @@ private static async Task<int> ExecuteAsync(
         var apiId = context.ParseResult.GetValueForOption(Opt<ApiIdOption>.Instance)!;
         var outputFile =
             context.ParseResult.GetValueForOption(Opt<OptionalOutputFileOption>.Instance) ??
-            new FileInfo(Path.Combine(System.Environment.CurrentDirectory, "gateway.fgp"));
+            new FileInfo(Path.Combine(Environment.CurrentDirectory, "gateway.fgp"));
 
         console.Title($"Download the fusion configuration {apiId}/{stageName}");
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public OperationTool CreateTool(OperationToolDefinition toolDefinition)`
`30`	`30`
`31`	`31`	`if (toolDefinition.OpenAiComponent is { } openAiComponent)`
`32`	`32`	`{`
`33`		`- meta = new JsonObject();`
	`33`	`+ meta = [];`
`34`	`34`	`AddOpenAiComponentMetadata(meta, toolDefinition);`
`35`	`35`	`openAiComponentResource = CreateOpenAiComponentResource(openAiComponent, toolDefinition);`
`36`	`36`	`}`
`@@ -171,13 +171,13 @@ private static Resource CreateOpenAiComponentResource(`
`171`	`171`
`172`	`172`	`if (openAiComponent.Description is not null)`
`173`	`173`	`{`
`174`		`- meta ??= new JsonObject();`
	`174`	`+ meta ??= [];`
`175`	`175`	`meta["openai/widgetDescription"] = openAiComponent.Description;`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`if (openAiComponent.PrefersBorder is not null)`
`179`	`179`	`{`
`180`		`- meta ??= new JsonObject();`
	`180`	`+ meta ??= [];`
`181`	`181`	`meta["openai/widgetPrefersBorder"] = openAiComponent.PrefersBorder;`
`182`	`182`	`}`
`183`	`183`
`@@ -187,30 +187,30 @@ private static Resource CreateOpenAiComponentResource(`
`187`	`187`
`188`	`188`	`if (csp.ConnectDomains is { Length: > 0 } connectDomains)`
`189`	`189`	`{`
`190`		`- contentSecurityPolicy ??= new JsonObject();`
	`190`	`+ contentSecurityPolicy ??= [];`
`191`	`191`	`contentSecurityPolicy.Add(`
`192`	`192`	`"connect_domains",`
`193`	`193`	`new JsonArray(connectDomains.Select(d => JsonValue.Create(d)).ToArray<JsonNode>()));`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`if (csp.ResourceDomains is { Length: > 0 } resourceDomains)`
`197`	`197`	`{`
`198`		`- contentSecurityPolicy ??= new JsonObject();`
	`198`	`+ contentSecurityPolicy ??= [];`
`199`	`199`	`contentSecurityPolicy.Add(`
`200`	`200`	`"resource_domains",`
`201`	`201`	`new JsonArray(resourceDomains.Select(d => JsonValue.Create(d)).ToArray<JsonNode>()));`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`if (contentSecurityPolicy is not null)`
`205`	`205`	`{`
`206`		`- meta ??= new JsonObject();`
	`206`	`+ meta ??= [];`
`207`	`207`	`meta.Add("openai/widgetCSP", contentSecurityPolicy);`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`if (openAiComponent.Domain is not null)`
`212`	`212`	`{`
`213`		`- meta ??= new JsonObject();`
	`213`	`+ meta ??= [];`
`214`	`214`	`meta.Add("openai/widgetDomain", openAiComponent.Domain);`
`215`	`215`	`}`
`216`	`216`
Original file line number	Diff line number	Diff line change
`@@ -475,8 +475,7 @@ private static OpenApiSchema CreateScalarSchema(IScalarTypeDefinition scalarType`
`475`	`475`	`else`
`476`	`476`	`{`
`477`	`477`	`schema.OneOf = jsonSchemaTypes`
`478`		`- .Select(IOpenApiSchema (t) => new OpenApiSchema { Type = t })`
`479`		`- .ToList();`
	`478`	`+ .ConvertAll(OpenApiSchemaAbstraction (t) => new OpenApiSchema { Type = t });`
`480`	`479`	`}`
`481`	`480`	`#else`
`482`	`481`	`var jsonSchemaTypes = GetJsonSchemaTypes(scalarType);`
`@@ -785,7 +784,7 @@ private static OpenApiSchemaAbstraction CreateOpenApiSchemaForSelectionSet(`
`785`	`784`	`modelLookup,`
`786`	`785`	`optional: optional \|\| isDifferentType \|\| isSelectionConditional);`
`787`	`786`
`788`		`- fragmentSchemasByType ??= new Dictionary<string, List<OpenApiSchemaAbstraction>>();`
	`787`	`+ fragmentSchemasByType ??= [];`
`789`	`788`
`790`	`789`	`if (!fragmentSchemasByType.TryGetValue(typeName, out var schemaList))`
`791`	`790`	`{`
`@@ -803,7 +802,7 @@ private static OpenApiSchemaAbstraction CreateOpenApiSchemaForSelectionSet(`
`803`	`802`	`{`
`804`	`803`	`var typeName = externalFragment.FragmentDefinition.TypeCondition.Name.Value;`
`805`	`804`
`806`		`- fragmentSchemasByType ??= new Dictionary<string, List<OpenApiSchemaAbstraction>>();`
	`805`	`+ fragmentSchemasByType ??= [];`
`807`	`806`
`808`	`807`	`if (!fragmentSchemasByType.TryGetValue(typeName, out var schemaList))`
`809`	`808`	`{`
`@@ -841,7 +840,7 @@ private static OpenApiSchemaAbstraction CreateOpenApiSchemaForSelectionSet(`
`841`	`840`	`modelLookup,`
`842`	`841`	`optional: optional \|\| isDifferentType \|\| isSelectionConditional);`
`843`	`842`
`844`		`- fragmentSchemasByType ??= new Dictionary<string, List<OpenApiSchemaAbstraction>>();`
	`843`	`+ fragmentSchemasByType ??= [];`
`845`	`844`
`846`	`845`	`if (!fragmentSchemasByType.TryGetValue(typeName, out var schemaList))`
`847`	`846`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ public static IRequestExecutorBuilder AddOpenApiDefinitionStorage(`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public static IRequestExecutorBuilder AddOpenApiDefinitionStorage<`
`26`		`- [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]`
`27`		`- T>(`
	`26`	`+ [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(`
`28`	`27`	`this IRequestExecutorBuilder builder)`
`29`	`28`	`where T : class, IOpenApiDefinitionStorage`
`30`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Buffers;`
`2`	`1`	`using System.Text;`
`3`	`2`
`4`	`3`	`namespace HotChocolate.Language.Utilities;`