Use Swashbuckle instead of NSwag

src/Umbraco.Cms.ManagementApi/Controllers/Culture/CultureControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Culture;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("culture")]
-[OpenApiTag("Culture")]
+[ApiExplorerSettings(GroupName = "Culture")]
 [ApiVersion("1.0")]
 public abstract class CultureControllerBase : ManagementApiControllerBase
 {

src/Umbraco.Cms.ManagementApi/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -13,7 +12,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DataType.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DataType}")]
-[OpenApiTag("Data Type")]
+[ApiExplorerSettings(GroupName = "Data Type")]
 public class DataTypeTreeControllerBase : FolderTreeControllerBase<FolderTreeItemViewModel>
 {
     private readonly IDataTypeService _dataTypeService;

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/DictionaryControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("dictionary")]
-[OpenApiTag("Dictionary")]
+[ApiExplorerSettings(GroupName = "Dictionary")]
 [ApiVersion("1.0")]
 // TODO: Add authentication
 public abstract class DictionaryControllerBase : ManagementApiControllerBase

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/ExportDictionaryController.cs

@@ -23,13 +23,13 @@ public ExportDictionaryController(ILocalizationService localizationService, IEnt
     [HttpGet("export/{key:guid}")]
     [MapToApiVersion("1.0")]
     [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)]
-    [ProducesResponseType(typeof(NotFoundObjectResult), StatusCodes.Status404NotFound)]
+    [ProducesResponseType(typeof(NotFoundResult), StatusCodes.Status404NotFound)]
     public async Task<IActionResult> ExportDictionary(Guid key, bool includeChildren = false)
     {
         IDictionaryItem? dictionaryItem = _localizationService.GetDictionaryItemById(key);
         if (dictionaryItem is null)
         {
-            return await Task.FromResult(NotFound("No dictionary item found with id "));
+            return await Task.FromResult(NotFound());
         }
 
         XElement xml = _entityXmlSerializer.Serialize(dictionaryItem, includeChildren);

src/Umbraco.Cms.ManagementApi/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
@@ -12,7 +11,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Dictionary.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/dictionary")]
-[OpenApiTag("Dictionary")]
+[ApiExplorerSettings(GroupName = "Dictionary")]
 // NOTE: at the moment dictionary items (renamed to dictionary tree) aren't supported by EntityService, so we have little use of the
 // tree controller base. We'll keep it though, in the hope that we can mend EntityService.
 public class DictionaryTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>

src/Umbraco.Cms.ManagementApi/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -17,7 +16,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Document.RecycleBin;
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.RecycleBin}/{Constants.UdiEntityType.Document}")]
 [RequireDocumentTreeRootAccess]
 [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-[OpenApiTag(nameof(Constants.UdiEntityType.Document))]
+[ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Document))]
 public class DocumentRecycleBinControllerBase : RecycleBinControllerBase<RecycleBinItemViewModel>
 {
     public DocumentRecycleBinControllerBase(IEntityService entityService)

src/Umbraco.Cms.ManagementApi/Controllers/Document/Tree/DocumentTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
@@ -17,7 +16,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Document.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Document}")]
-[OpenApiTag(nameof(Constants.UdiEntityType.Document))]
+[ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Document))]
 public abstract class DocumentTreeControllerBase : UserStartNodeTreeControllerBase<DocumentTreeItemViewModel>
 {
     private readonly IPublicAccessService _publicAccessService;

src/Umbraco.Cms.ManagementApi/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -13,7 +12,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DocumentBlueprint.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DocumentBlueprint}")]
-[OpenApiTag("Document Blueprint")]
+[ApiExplorerSettings(GroupName = "Document Blueprint")]
 public class DocumentBlueprintTreeControllerBase : EntityTreeControllerBase<DocumentBlueprintTreeItemViewModel>
 {
     private readonly IContentTypeService _contentTypeService;

src/Umbraco.Cms.ManagementApi/Controllers/DocumentType/Tree/DocumentTypeTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -13,7 +12,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.DocumentType.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DocumentType}")]
-[OpenApiTag("Document Type")]
+[ApiExplorerSettings(GroupName = "Document Type")]
 public class DocumentTypeTreeControllerBase : FolderTreeControllerBase<DocumentTypeTreeItemViewModel>
 {
     private readonly IContentTypeService _contentTypeService;

src/Umbraco.Cms.ManagementApi/Controllers/Help/HelpControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Help;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("help")]
-[OpenApiTag("Help")]
+[ApiExplorerSettings(GroupName = "Help")]
 [ApiVersion("1.0")]
 public abstract class HelpControllerBase : ManagementApiControllerBase
 {

src/Umbraco.Cms.ManagementApi/Controllers/Install/InstallControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.ManagementApi.Filters;
 using Umbraco.New.Cms.Web.Common.Routing;
@@ -8,7 +7,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Install;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("install")]
-[OpenApiTag("Install")]
+[ApiExplorerSettings(GroupName = "Install")]
 [RequireRuntimeLevel(RuntimeLevel.Install)]
 public abstract class InstallControllerBase : ManagementApiControllerBase
 {

src/Umbraco.Cms.ManagementApi/Controllers/Language/LanguageControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Language;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("language")]
-[OpenApiTag("Language")]
+[ApiExplorerSettings(GroupName = "Language")]
 [ApiVersion("1.0")]
 public abstract class LanguageControllerBase : ManagementApiControllerBase
 {

src/Umbraco.Cms.ManagementApi/Controllers/Media/RecycleBin/MediaRecycleBinControllerBase.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -17,7 +16,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Media.RecycleBin;
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.RecycleBin}/{Constants.UdiEntityType.Media}")]
 [RequireMediaTreeRootAccess]
 [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-[OpenApiTag(nameof(Constants.UdiEntityType.Media))]
+[ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Media))]
 public class MediaRecycleBinControllerBase : RecycleBinControllerBase<RecycleBinItemViewModel>
 {
     public MediaRecycleBinControllerBase(IEntityService entityService)

src/Umbraco.Cms.ManagementApi/Controllers/Media/Tree/MediaTreeControllerBase.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
@@ -16,7 +16,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Media.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Media}")]
-[OpenApiTag(nameof(Constants.UdiEntityType.Media))]
+[ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Media))]
 public class MediaTreeControllerBase : UserStartNodeTreeControllerBase<ContentTreeItemViewModel>
 {
     private readonly AppCaches _appCaches;

src/Umbraco.Cms.ManagementApi/Controllers/MediaType/Tree/MediaTypeTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -13,7 +12,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.MediaType.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.MediaType}")]
-[OpenApiTag("Media Type")]
+[ApiExplorerSettings(GroupName = "Media Type")]
 public class MediaTypeTreeControllerBase : FolderTreeControllerBase<FolderTreeItemViewModel>
 {
     private readonly IMediaTypeService _mediaTypeService;

src/Umbraco.Cms.ManagementApi/Controllers/MemberGroup/Tree/MemberGroupTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -13,7 +12,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.MemberGroup.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.MemberGroup}")]
-[OpenApiTag("Member Group")]
+[ApiExplorerSettings(GroupName = "Member Group")]
 public class MemberGroupTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>
 {
     public MemberGroupTreeControllerBase(IEntityService entityService)

src/Umbraco.Cms.ManagementApi/Controllers/MemberType/Tree/MemberTypeTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -13,7 +12,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.MemberType.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.MemberType}")]
-[OpenApiTag("Member Type")]
+[ApiExplorerSettings(GroupName = "Member Type")]
 public class MemberTypeTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>
 {
     public MemberTypeTreeControllerBase(IEntityService entityService)

src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilder/GetModelsBuilderController.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Umbraco.Cms.ManagementApi.Factories;
 using Umbraco.Cms.ManagementApi.ViewModels.ModelsBuilderDashboard;
@@ -13,7 +12,7 @@ public class GetModelsBuilderController : ModelsBuilderControllerBase
     public GetModelsBuilderController(IModelsBuilderViewModelFactory modelsBuilderViewModelFactory) => _modelsBuilderViewModelFactory = modelsBuilderViewModelFactory;
 
     [HttpGet("dashboard")]
-    [ProducesResponseType(typeof(CreatedResult), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ModelsBuilderViewModel), StatusCodes.Status200OK)]
     [MapToApiVersion("1.0")]
     public async Task<ActionResult<ModelsBuilderViewModel>> GetDashboard() => await Task.FromResult(Ok(_modelsBuilderViewModelFactory.Create()));
 }

src/Umbraco.Cms.ManagementApi/Controllers/ModelsBuilder/ModelsBuilderControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.ModelsBuilder;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("models-builder")]
-[OpenApiTag("Models Builder")]
+[ApiExplorerSettings(GroupName = "Models Builder")]
 [ApiVersion("1.0")]
 
 public class ModelsBuilderControllerBase : ManagementApiControllerBase

src/Umbraco.Cms.ManagementApi/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.ManagementApi.Controllers.Tree;
@@ -10,7 +9,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.PartialView.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.PartialView}")]
-[OpenApiTag("Partial View")]
+[ApiExplorerSettings(GroupName = "Partial View")]
 public class PartialViewTreeControllerBase : FileSystemTreeControllerBase
 {
     public PartialViewTreeControllerBase(FileSystems fileSystems)

src/Umbraco.Cms.ManagementApi/Controllers/Profiling/ProfilingControllerBase.cs

@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Profiling;
 
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute("profiling")]
-[OpenApiTag("Profiling")]
+[ApiExplorerSettings(GroupName = "Profiling")]
 public class ProfilingControllerBase : ManagementApiControllerBase
 {
 }

src/Umbraco.Cms.ManagementApi/Controllers/PublishedCache/PublishedCacheControllerBase.cs

@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.PublishedCache;
 
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute("published-cache")]
-[OpenApiTag("Published Cache")]
+[ApiExplorerSettings(GroupName = "Published Cache")]
 public class PublishedCacheControllerBase : ManagementApiControllerBase
 {
 }

src/Umbraco.Cms.ManagementApi/Controllers/Relation/RelationControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Relation;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("relation")]
-[OpenApiTag("Relation")]
+[ApiExplorerSettings(GroupName = "Relation")]
 [ApiVersion("1.0")]
 // TODO: Implement Authentication
 public abstract class RelationControllerBase : ManagementApiControllerBase

src/Umbraco.Cms.ManagementApi/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
@@ -12,7 +11,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.RelationType.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.RelationType}")]
-[OpenApiTag("Relation Type")]
+[ApiExplorerSettings(GroupName = "Relation Type")]
 // NOTE: at the moment relation types aren't supported by EntityService, so we have little use of the
 // tree controller base. We'll keep it though, in the hope that we can mend EntityService.
 public class RelationTypeTreeControllerBase : EntityTreeControllerBase<EntityTreeItemViewModel>

src/Umbraco.Cms.ManagementApi/Controllers/Script/Tree/ScriptTreeControllerBase.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.ManagementApi.Controllers.Tree;
@@ -10,7 +9,7 @@ namespace Umbraco.Cms.ManagementApi.Controllers.Script.Tree;
 [ApiVersion("1.0")]
 [ApiController]
 [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Script}")]
-[OpenApiTag(nameof(Constants.UdiEntityType.Script))]
+[ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Script))]
 public class ScriptTreeControllerBase : FileSystemTreeControllerBase
 {
     public ScriptTreeControllerBase(FileSystems fileSystems)

src/Umbraco.Cms.ManagementApi/Controllers/Search/SearchControllerBase.cs

@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using NSwag.Annotations;
 using Umbraco.New.Cms.Web.Common.Routing;
 
 namespace Umbraco.Cms.ManagementApi.Controllers.Search;
 
 [ApiController]
 [VersionedApiBackOfficeRoute("search")]
-[OpenApiTag("Search")]
+[ApiExplorerSettings(GroupName = "Search")]
 public class SearchControllerBase : ManagementApiControllerBase
 {
 }