Fixed issue where generic types would invalidly be registered. (#5119)

ChilliCream · Jun 3, 2022 · 15ca0db · 15ca0db
1 parent 0feb645
commit 15ca0db
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/Utilities/TestServerExtensions.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/Utilities/TestServerExtensions.cs
@@ -274,7 +274,7 @@ public static Task<HttpResponseMessage> SendPostRequestAsync<TObject>(
     public static Task<HttpResponseMessage> SendPostRequestAsync(
         this TestServer testServer,
         string requestBody,
-        string path = null,
+        string? path = null,
         bool enableApolloTracing = false,
         bool includeQueryPlan = false) =>
         SendPostRequestAsync(
@@ -289,7 +289,7 @@ public static Task<HttpResponseMessage> SendPostRequestAsync(
         this TestServer testServer,
         string requestBody,
         string contentType,
-        string path,
+        string? path,
         bool enableApolloTracing = false,
         bool includeQueryPlan = false)
     {
@@ -314,11 +314,11 @@ public static Task<HttpResponseMessage> SendGetRequestAsync(
         string path = null) =>
         testServer.CreateClient().GetAsync($"{CreateUrl(path)}/?{query}");
 
-    public static string CreateUrl(string path)
+    public static string CreateUrl(string? path)
     {
         var url = "http://localhost:5000";
 
-        if (path != null)
+        if (path is not null)
         {
             url += "/" + path.TrimStart('/');
         }

diff --git a/src/HotChocolate/Core/src/Types.Analyzers/Inspectors/ClassBaseClassInspector.cs b/src/HotChocolate/Core/src/Types.Analyzers/Inspectors/ClassBaseClassInspector.cs
@@ -11,7 +11,11 @@ public bool TryHandle(
         GeneratorSyntaxContext context,
         [NotNullWhen(true)] out ISyntaxInfo? syntaxInfo)
     {
-        if (context.Node is ClassDeclarationSyntax { BaseList.Types.Count: > 0 } possibleType)
+        if (context.Node is ClassDeclarationSyntax
+            {
+                BaseList.Types.Count: > 0,
+                TypeParameterList: null
+            } possibleType)
         {
             var model = context.SemanticModel.GetDeclaredSymbol(possibleType);
             if (model is { IsAbstract: false } type)

diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Tests/QueryType.cs b/src/HotChocolate/Core/test/Types.Analyzers.Tests/QueryType.cs
@@ -8,7 +8,7 @@ protected override void Configure(IObjectTypeDescriptor descriptor)
     {
         descriptor
             .Name("Query");
-            
+
         descriptor
             .Field("person")
             .Type("Entity")

diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Tests/SpecialObjectType.cs b/src/HotChocolate/Core/test/Types.Analyzers.Tests/SpecialObjectType.cs
@@ -0,0 +1,6 @@
+namespace HotChocolate.Types;
+
+public class SpecialObjectType<T> : ObjectType<T>
+{
+
+}