Added Primary Constructors to Configuration Handlers

Author: michaelstaib

src/HotChocolate/Core/src/Types/Configuration/Handlers/DefaultTypeDiscoveryHandler.cs

@@ -9,14 +9,10 @@
 
 namespace HotChocolate.Configuration;
 
-internal sealed class DefaultTypeDiscoveryHandler : TypeDiscoveryHandler
+internal sealed class DefaultTypeDiscoveryHandler(ITypeInspector typeInspector) : TypeDiscoveryHandler
 {
-    public DefaultTypeDiscoveryHandler(ITypeInspector typeInspector)
-    {
-        TypeInspector = typeInspector ?? throw new ArgumentNullException(nameof(typeInspector));
-    }
-
-    private ITypeInspector TypeInspector { get; }
+    private ITypeInspector TypeInspector { get; } = 
+        typeInspector ?? throw new ArgumentNullException(nameof(typeInspector));
 
     public override bool TryInferType(
         TypeReference typeReference,

src/HotChocolate/Core/src/Types/Configuration/Handlers/DependantFactoryTypeReferenceHandler.cs

@@ -4,15 +4,11 @@
 
 namespace HotChocolate.Configuration;
 
-internal sealed class DependantFactoryTypeReferenceHandler : ITypeRegistrarHandler
+internal sealed class DependantFactoryTypeReferenceHandler(IDescriptorContext context) 
+    : ITypeRegistrarHandler
 {
-    private readonly HashSet<DependantFactoryTypeReference> _handled = new();
-    private readonly IDescriptorContext _context;
-
-    public DependantFactoryTypeReferenceHandler(IDescriptorContext context)
-    {
-        _context = context ?? throw new ArgumentNullException(nameof(context));
-    }
+    private readonly HashSet<DependantFactoryTypeReference> _handled = [];
+    private readonly IDescriptorContext _context = context ?? throw new ArgumentNullException(nameof(context));
 
     public TypeReferenceKind Kind => TypeReferenceKind.DependantFactory;
 

src/HotChocolate/Core/src/Types/Configuration/Handlers/ExtendedTypeDirectiveReferenceHandler.cs

@@ -4,20 +4,16 @@
 
 namespace HotChocolate.Configuration;
 
-internal sealed class ExtendedTypeDirectiveReferenceHandler : ITypeRegistrarHandler
+internal sealed class ExtendedTypeDirectiveReferenceHandler(ITypeInspector typeInspector) 
+    : ITypeRegistrarHandler
 {
-    private readonly ITypeInspector _typeInspector;
-
-    public ExtendedTypeDirectiveReferenceHandler(ITypeInspector typeInspector)
-        => _typeInspector = typeInspector;
-
     public TypeReferenceKind Kind => TypeReferenceKind.DirectiveExtendedType;
 
     public void Handle(ITypeRegistrar typeRegistrar, TypeReference typeReference)
     {
         var typeRef = (ExtendedTypeDirectiveReference)typeReference;
 
-        if (_typeInspector.TryCreateTypeInfo(typeRef.Type, out var typeInfo) &&
+        if (typeInspector.TryCreateTypeInfo(typeRef.Type, out var typeInfo) &&
             !ExtendedType.Tools.IsSchemaType(typeInfo.NamedType) &&
             !typeRegistrar.IsResolved(typeRef))
         {

src/HotChocolate/Core/src/Types/Configuration/Handlers/ExtendedTypeReferenceHandler.cs

@@ -17,38 +17,40 @@ public void Handle(ITypeRegistrar typeRegistrar, TypeReference typeReference)
     {
         var typeRef = (ExtendedTypeReference)typeReference;
 
-        if (typeInspector.TryCreateTypeInfo(typeRef.Type, out var typeInfo) &&
-            !ExtendedType.Tools.IsNonGenericBaseType(typeInfo.NamedType))
+        if (!typeInspector.TryCreateTypeInfo(typeRef.Type, out var typeInfo) ||
+            ExtendedType.Tools.IsNonGenericBaseType(typeInfo.NamedType))
         {
-            if (typeInfo.NamedType == typeof(IExecutable))
-            {
-                throw ThrowHelper.NonGenericExecutableNotAllowed();
-            }
+            return;
+        }
 
-            var namedType = typeInfo.NamedType;
+        if (typeInfo.NamedType == typeof(IExecutable))
+        {
+            throw ThrowHelper.NonGenericExecutableNotAllowed();
+        }
 
-            if (IsTypeSystemObject(namedType))
-            {
-                var extendedType = typeInspector.GetType(namedType);
-                var namedTypeReference = typeRef.With(extendedType);
+        var namedType = typeInfo.NamedType;
 
-                if (!typeRegistrar.IsResolved(namedTypeReference))
-                {
-                    typeRegistrar.Register(
-                        typeRegistrar.CreateInstance(namedType),
-                        typeReference.Scope,
-                        ExtendedType.Tools.IsGenericBaseType(namedType));
-                }
-            }
-            else
+        if (IsTypeSystemObject(namedType))
+        {
+            var extendedType = typeInspector.GetType(namedType);
+            var namedTypeReference = typeRef.With(extendedType);
+
+            if (!typeRegistrar.IsResolved(namedTypeReference))
             {
-                TryMapToExistingRegistration(
-                    typeRegistrar,
-                    typeInfo,
-                    typeReference.Context,
-                    typeReference.Scope);
+                typeRegistrar.Register(
+                    typeRegistrar.CreateInstance(namedType),
+                    typeReference.Scope,
+                    ExtendedType.Tools.IsGenericBaseType(namedType));
             }
         }
+        else
+        {
+            TryMapToExistingRegistration(
+                typeRegistrar,
+                typeInfo,
+                typeReference.Context,
+                typeReference.Scope);
+        }
     }
 
     private static void TryMapToExistingRegistration(

src/HotChocolate/Core/src/Types/Configuration/Handlers/FactoryTypeReferenceHandler.cs

@@ -4,15 +4,11 @@
 
 namespace HotChocolate.Configuration;
 
-internal sealed class FactoryTypeReferenceHandler : ITypeRegistrarHandler
+internal sealed class FactoryTypeReferenceHandler(IDescriptorContext context) 
+    : ITypeRegistrarHandler
 {
-    private readonly HashSet<string> _handled = new();
-    private readonly IDescriptorContext _context;
-
-    public FactoryTypeReferenceHandler(IDescriptorContext context)
-    {
-        _context = context ?? throw new ArgumentNullException(nameof(context));
-    }
+    private readonly HashSet<string> _handled = [];
+    private readonly IDescriptorContext _context = context ?? throw new ArgumentNullException(nameof(context));
 
     public TypeReferenceKind Kind => TypeReferenceKind.Factory;
 

src/HotChocolate/Core/src/Types/Configuration/Handlers/ScalarTypeDiscoveryHandler.cs

@@ -8,14 +8,11 @@
 
 namespace HotChocolate.Configuration;
 
-internal sealed class ScalarTypeDiscoveryHandler : TypeDiscoveryHandler
+internal sealed class ScalarTypeDiscoveryHandler(ITypeInspector typeInspector) 
+    : TypeDiscoveryHandler
 {
-    public ScalarTypeDiscoveryHandler(ITypeInspector typeInspector)
-    {
-        TypeInspector = typeInspector ?? throw new ArgumentNullException(nameof(typeInspector));
-    }
-
-    private ITypeInspector TypeInspector { get; }
+    private ITypeInspector TypeInspector { get; } = 
+        typeInspector ?? throw new ArgumentNullException(nameof(typeInspector));
 
     public override bool TryInferType(
         TypeReference typeReference,
@@ -25,7 +22,7 @@ public override bool TryInferType(
         if (Scalars.TryGetScalar(typeInfo.RuntimeType, out var scalarType))
         {
             var schemaTypeRef = TypeInspector.GetTypeRef(scalarType);
-            schemaTypeRefs = new TypeReference[] { schemaTypeRef };
+            schemaTypeRefs = [schemaTypeRef];
             return true;
         }
 

src/HotChocolate/Core/src/Types/Configuration/Handlers/SchemaTypeReferenceHandler.cs

@@ -13,20 +13,22 @@ public void Handle(ITypeRegistrar typeRegistrar, TypeReference typeReference)
     {
         var typeRef = (SchemaTypeReference)typeReference;
 
-        if (!typeRegistrar.IsResolved(typeReference))
+        if (typeRegistrar.IsResolved(typeReference))
         {
-            var tsm = typeRef.Type;
+            return;
+        }
+        
+        var tsm = typeRef.Type;
 
-            // if it is a type object we will make sure it is unwrapped.
-            if (typeRef.Type is IType type)
-            {
-                tsm = type.NamedType();
-            }
+        // if it is a type object we will make sure it is unwrapped.
+        if (typeRef.Type is IType type)
+        {
+            tsm = type.NamedType();
+        }
 
-            if (tsm is TypeSystemObjectBase tso)
-            {
-                typeRegistrar.Register(tso, typeReference.Scope);
-            }
+        if (tsm is TypeSystemObjectBase tso)
+        {
+            typeRegistrar.Register(tso, typeReference.Scope);
         }
     }
 }

src/HotChocolate/Core/src/Types/Configuration/Handlers/SyntaxTypeReferenceHandler.cs

@@ -7,16 +7,11 @@
 
 namespace HotChocolate.Configuration;
 
-internal sealed class SyntaxTypeReferenceHandler : ITypeRegistrarHandler
+internal sealed class SyntaxTypeReferenceHandler(ITypeInspector typeInspector) : ITypeRegistrarHandler
 {
-    private readonly HashSet<string> _handled = new();
-    private readonly ITypeInspector _typeInspector;
-
-    public SyntaxTypeReferenceHandler(ITypeInspector typeInspector)
-    {
-        _typeInspector = typeInspector ??
-            throw new ArgumentNullException(nameof(typeInspector));
-    }
+    private readonly HashSet<string> _handled = [];
+    private readonly ITypeInspector _typeInspector = typeInspector ??
+        throw new ArgumentNullException(nameof(typeInspector));
 
     public TypeReferenceKind Kind => TypeReferenceKind.Syntax;