Fixed: do not import namespace of resource class when same as controller namespace

Author: bkoelman

src/JsonApiDotNetCore.SourceGenerators/SourceCodeWriter.cs

@@ -66,7 +66,7 @@ public string Write(INamedTypeSymbol resourceType, ITypeSymbol idType, JsonApiEn
             WriteNullableEnable();
         }
 
-        WriteNamespaceImports(loggerFactoryInterface, resourceType);
+        WriteNamespaceImports(loggerFactoryInterface, resourceType, controllerNamespace);
 
         if (controllerNamespace != null)
         {
@@ -96,15 +96,15 @@ private void WriteNullableEnable()
         _sourceBuilder.AppendLine();
     }
 
-    private void WriteNamespaceImports(INamedTypeSymbol loggerFactoryInterface, INamedTypeSymbol resourceType)
+    private void WriteNamespaceImports(INamedTypeSymbol loggerFactoryInterface, INamedTypeSymbol resourceType, string? controllerNamespace)
     {
         _sourceBuilder.AppendLine($@"using {loggerFactoryInterface.ContainingNamespace};");
 
         _sourceBuilder.AppendLine("using JsonApiDotNetCore.Configuration;");
         _sourceBuilder.AppendLine("using JsonApiDotNetCore.Controllers;");
         _sourceBuilder.AppendLine("using JsonApiDotNetCore.Services;");
 
-        if (!resourceType.ContainingNamespace.IsGlobalNamespace)
+        if (!resourceType.ContainingNamespace.IsGlobalNamespace && resourceType.ContainingNamespace.ToString() != controllerNamespace)
         {
             _sourceBuilder.AppendLine($"using {resourceType.ContainingNamespace};");
         }

test/SourceGeneratorTests/ControllerGenerationTests.cs

@@ -709,6 +709,66 @@ public sealed class Item : Identifiable<long>
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Services;
 
+public sealed partial class ItemsController : JsonApiController<Item, long>
+{
+    public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<Item, long> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
+}
+");
+    }
+
+    [Fact]
+    public void Can_generate_for_shared_namespace()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .InNamespace("ExampleApi")
+            .WithCode(@"
+                    [Resource(ControllerNamespace = ""ExampleApi"")]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCode(@"// <auto-generated />
+
+using Microsoft.Extensions.Logging;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+
+namespace ExampleApi;
+
 public sealed partial class ItemsController : JsonApiController<Item, long>
 {
     public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,