Merge pull request #1261 from json-api-dotnet/fix-namespace-imports-gen

Fix namespace imports in controller source generator

Author: maurei

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};");
  }