From 417e92dad0b44ddf506b6e0b749c915ce0ca85cd Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 9 May 2023 08:38:07 +0200 Subject: [PATCH] Updated API version package and moved attribute to each controller (#14209) * Updated API version package and moved attribute to each controller as it cannot be inherited. * Ignore "$type" on types implementing interfaces in the delivery api --- .../Configuration/ConfigureApiExplorerOptions.cs | 5 ++--- .../Configuration/ConfigureApiVersioningOptions.cs | 5 ++--- .../ConfigureUmbracoSwaggerGenOptions.cs | 11 +++++++++-- .../UmbracoBuilderApiExtensions.cs | 3 +-- .../Extensions/MethodInfoApiCommonExtensions.cs | 2 +- .../Umbraco.Cms.Api.Common.csproj | 6 +++--- .../Controllers/ByIdContentApiController.cs | 2 ++ .../Controllers/ByRouteContentApiController.cs | 2 ++ .../Controllers/DeliveryApiControllerBase.cs | 2 +- .../Controllers/QueryContentApiController.cs | 2 ++ .../Controllers/AuditLog/AuditLogControllerBase.cs | 4 ++-- .../Controllers/AuditLog/ByKeyAuditLogController.cs | 4 +++- .../Controllers/AuditLog/ByTypeAuditLogController.cs | 4 +++- .../AuditLog/CurrentUserAuditLogController.cs | 5 +++-- .../Controllers/Culture/AllCultureController.cs | 2 ++ .../Controllers/Culture/CultureControllerBase.cs | 4 ++-- .../Controllers/DataType/ByKeyDataTypeController.cs | 4 +++- .../Controllers/DataType/CopyDataTypeController.cs | 2 ++ .../Controllers/DataType/CreateDataTypeController.cs | 5 +++-- .../Controllers/DataType/DataTypeControllerBase.cs | 4 ++-- .../Controllers/DataType/DeleteDataTypeController.cs | 4 +++- .../DataType/Folder/ByKeyDataTypeFolderController.cs | 4 +++- .../DataType/Folder/CreateDataTypeFolderController.cs | 4 +++- .../DataType/Folder/DataTypeFolderControllerBase.cs | 4 ++-- .../DataType/Folder/DeleteDataTypeFolderController.cs | 5 +++-- .../DataType/Folder/UpdateDataTypeFolderController.cs | 4 +++- .../Controllers/DataType/IsUsedDataTypeController.cs | 5 ++--- .../DataType/Items/ItemDatatypeItemController.cs | 4 +++- .../Controllers/DataType/MoveDataTypeController.cs | 2 ++ .../DataType/ReferencesDataTypeController.cs | 4 +++- .../DataType/Tree/ChildrenDataTypeTreeController.cs | 4 +++- .../DataType/Tree/DataTypeTreeControllerBase.cs | 4 ++-- .../DataType/Tree/RootDataTypeTreeController.cs | 4 +++- .../Controllers/DataType/UpdateDataTypeController.cs | 4 +++- .../Controllers/Dictionary/AllDictionaryController.cs | 4 +++- .../Dictionary/ByKeyDictionaryController.cs | 4 +++- .../Dictionary/CreateDictionaryController.cs | 4 +++- .../Dictionary/DeleteDictionaryController.cs | 4 +++- .../Dictionary/DictionaryControllerBase.cs | 2 +- .../Dictionary/ExportDictionaryController.cs | 2 ++ .../Dictionary/ImportDictionaryController.cs | 4 +++- .../Dictionary/Item/ItemDictionaryItemController.cs | 5 +++-- .../Dictionary/MoveDictionaryController.cs | 4 +++- .../Tree/ChildrenDictionaryTreeController.cs | 4 +++- .../Dictionary/Tree/DictionaryTreeControllerBase.cs | 2 +- .../Dictionary/Tree/RootDictionaryTreeController.cs | 4 +++- .../Dictionary/UpdateDictionaryController.cs | 4 +++- .../Controllers/Document/ByKeyDocumentController.cs | 4 +++- .../Controllers/Document/CopyDocumentController.cs | 4 +++- .../Controllers/Document/CreateDocumentController.cs | 4 +++- .../Controllers/Document/DocumentControllerBase.cs | 4 ++-- .../Controllers/Document/DomainsController.cs | 5 ++++- .../Document/Item/DocumentItemControllerBase.cs | 4 ++-- .../Document/Item/ItemDocumentItemController.cs | 4 +++- .../Controllers/Document/MoveDocumentController.cs | 4 +++- .../Document/MoveToRecycleBinDocumentController.cs | 4 +++- .../Controllers/Document/NotificationsController.cs | 5 ++++- .../ChildrenDocumentRecycleBinController.cs | 4 +++- .../RecycleBin/DocumentRecycleBinControllerBase.cs | 4 ++-- .../RecycleBin/RootDocumentRecycleBinController.cs | 4 +++- .../Document/Tree/ChildrenDocumentTreeController.cs | 4 +++- .../Document/Tree/DocumentTreeControllerBase.cs | 4 ++-- .../Document/Tree/RootDocumentTreeController.cs | 4 +++- .../Controllers/Document/UpdateDocumentController.cs | 4 +++- .../Controllers/Document/UpdateDomainsController.cs | 5 ++++- .../Document/UpdateNotificationsController.cs | 5 ++++- .../Item/DocumentBlueprintItemControllerBase.cs | 1 - .../Item/ItemDocumentBlueprintController.cs | 4 +++- .../Tree/DocumentBlueprintTreeControllerBase.cs | 4 ++-- .../Tree/RootDocumentBlueprintTreeController.cs | 4 +++- .../DocumentType/ByKeyDocumentTypeController.cs | 4 +++- .../DocumentType/DocumentTypeControllerBase.cs | 4 ++-- .../Item/DocumentTypeItemControllerBase.cs | 1 - .../Item/ItemDocumentTypeItemController.cs | 4 +++- .../Tree/ChildrenDocumentTypeTreeController.cs | 4 +++- .../Tree/DocumentTypeTreeControllerBase.cs | 4 ++-- .../Tree/RootDocumentTypeTreeController.cs | 4 +++- .../HealthCheck/ExecuteActionHealthCheckController.cs | 2 ++ .../Group/AllHealthCheckGroupController.cs | 2 ++ .../Group/ByNameHealthCheckGroupController.cs | 2 ++ .../Group/CheckHealthCheckGroupController.cs | 2 ++ .../Group/HealthCheckGroupControllerBase.cs | 2 +- .../HealthCheck/HealthCheckControllerBase.cs | 2 +- .../Controllers/Help/GetHelpController.cs | 5 +++-- .../Controllers/Help/HelpControllerBase.cs | 4 ++-- .../Controllers/Indexer/AllIndexerController.cs | 3 ++- .../Controllers/Indexer/DetailsIndexerController.cs | 3 ++- .../Controllers/Indexer/RebuildIndexerController.cs | 3 ++- .../Controllers/Install/SettingsInstallController.cs | 3 ++- .../Controllers/Install/SetupInstallController.cs | 4 ++-- .../Install/ValidateDatabaseInstallController.cs | 3 ++- .../Controllers/Language/AllLanguageController.cs | 4 +++- .../Language/ByIsoCodeLanguageController.cs | 4 +++- .../Controllers/Language/CreateLanguageController.cs | 4 +++- .../Controllers/Language/DeleteLanguageController.cs | 4 +++- .../Language/Item/ItemsLanguageEntityController.cs | 4 +++- .../Controllers/Language/LanguageControllerBase.cs | 4 ++-- .../Controllers/Language/UpdateLanguageController.cs | 5 +++-- .../Controllers/LogViewer/AllLogViewerController.cs | 2 ++ .../AllMessageTemplateLogViewerController.cs | 2 ++ .../LogViewer/AllSinkLevelLogViewerController.cs | 2 ++ .../LogViewer/LogLevelCountLogViewerController.cs | 3 ++- .../Controllers/LogViewer/LogViewerControllerBase.cs | 2 +- .../SavedSearch/AllSavedSearchLogViewerController.cs | 2 ++ .../ByNameSavedSearchLogViewerController.cs | 2 ++ .../CreateSavedSearchLogViewerController.cs | 2 ++ .../DeleteSavedSearchLogViewerController.cs | 2 ++ .../SavedSearch/SavedSearchLogViewerControllerBase.cs | 2 +- .../ValidateLogFileSizeLogViewerController.cs | 2 ++ .../Controllers/Media/ByKeyMediaController.cs | 4 +++- .../Controllers/Media/CreateMediaController.cs | 4 +++- .../Controllers/Media/Item/ItemMediaItemController.cs | 5 +++-- .../Controllers/Media/Item/MediaItemControllerBase.cs | 3 ++- .../Controllers/Media/MediaControllerBase.cs | 4 ++-- .../Controllers/Media/MoveMediaController.cs | 4 +++- .../Media/MoveToRecycleBinMediaController.cs | 4 +++- .../RecycleBin/ChildrenMediaRecycleBinController.cs | 4 +++- .../Media/RecycleBin/MediaRecycleBinControllerBase.cs | 4 ++-- .../Media/RecycleBin/RootMediaRecycleBinController.cs | 4 +++- .../Media/Tree/ChildrenMediaTreeController.cs | 4 +++- .../Media/Tree/ItemsMediaTreeController.cs | 4 +++- .../Controllers/Media/Tree/MediaTreeControllerBase.cs | 4 ++-- .../Controllers/Media/Tree/RootMediaTreeController.cs | 4 +++- .../Controllers/Media/UpdateMediaController.cs | 4 +++- .../Controllers/MediaType/ByKeyMediaTypeController.cs | 4 +++- .../MediaType/Item/ItemMediaTypeItemController.cs | 4 +++- .../MediaType/Item/MediaTypeItemControllerBase.cs | 4 ++-- .../Controllers/MediaType/MediaTypeControllerBase.cs | 4 ++-- .../MediaType/Tree/ChildrenMediaTypeTreeController.cs | 4 +++- .../MediaType/Tree/MediaTypeTreeControllerBase.cs | 4 ++-- .../MediaType/Tree/RootMediaTypeTreeController.cs | 4 +++- .../Member/Item/ItemMemberItemController.cs | 4 +++- .../Member/Item/MemberItemControllerBase.cs | 4 ++-- .../MemberGroup/Item/ItemMemberGroupItemController.cs | 4 +++- .../MemberGroup/Item/MemberGroupItemControllerBase.cs | 4 ++-- .../MemberGroup/Tree/MemberGroupTreeControllerBase.cs | 4 ++-- .../MemberGroup/Tree/RootMemberGroupTreeController.cs | 4 +++- .../MemberType/Items/ItemMemberTypeItemController.cs | 4 +++- .../MemberType/Items/MemberTypeItemControllerBase.cs | 4 ++-- .../MemberType/Tree/MemberTypeTreeControllerBase.cs | 4 ++-- .../MemberType/Tree/RootMemberTypeTreeController.cs | 4 +++- .../ModelsBuilder/BuildModelsBuilderController.cs | 2 ++ .../ModelsBuilder/GetModelsBuilderController.cs | 4 +++- .../ModelsBuilder/ModelsBuilderControllerBase.cs | 5 ++--- .../ModelsBuilder/StatusModelsBuilderController.cs | 2 ++ .../ObjectTypes/AllowedObjectTypesController.cs | 4 +++- .../ObjectTypes/ObjectTypesControllerBase.cs | 4 ++-- .../Package/AllMigrationStatusPackageController.cs | 2 ++ .../Package/AllPackageManifestController.cs | 4 +++- .../Package/Created/AllCreatedPackageController.cs | 2 ++ .../Package/Created/ByKeyCreatedPackageController.cs | 2 ++ .../Package/Created/CreateCreatedPackageController.cs | 2 ++ .../Package/Created/CreatedPackageControllerBase.cs | 2 +- .../Package/Created/DeleteCreatedPackageController.cs | 2 ++ .../Created/DownloadCreatedPackageController.cs | 2 ++ .../Package/Created/UpdateCreatedPackageController.cs | 2 ++ .../Controllers/Package/PackageControllerBase.cs | 2 +- .../Package/RunMigrationPackageController.cs | 2 ++ .../PartialView/ByPathPartialViewController.cs | 4 +++- .../PartialView/CreatePartialViewController.cs | 4 +++- .../PartialView/DeletePartialViewController.cs | 4 +++- .../Folder/ByPathPartialViewFolderController.cs | 4 +++- .../Folder/CreatePartialViewFolderController.cs | 4 +++- .../Folder/DeletePartialViewFolderController.cs | 4 +++- ...ntroller.cs => PartialViewFolderControllerBase.cs} | 4 ++-- .../Items/ItemPartialViewItemController.cs | 4 +++- .../Items/PartialViewItemControllerBase.cs | 4 ++-- .../PartialView/PartialViewControllerBase.cs | 4 ++-- .../PartialView/Snippet/ByNameController.cs | 4 +++- .../PartialView/Snippet/GetAllController.cs | 4 +++- .../Tree/ChildrenPartialViewTreeController.cs | 4 +++- .../PartialView/Tree/PartialViewTreeControllerBase.cs | 4 ++-- .../PartialView/Tree/RootPartialViewTreeController.cs | 4 +++- .../PartialView/UpdatePartialViewController.cs | 4 +++- .../Profiling/GetStatusProfilingController.cs | 4 +++- .../Controllers/Profiling/ProfilingControllerBase.cs | 4 ++-- .../Profiling/UpdateStatusProfilingController.cs | 4 +++- .../PropertyType/IsUsedPropertyTypeController.cs | 4 +++- .../PropertyType/PropertyTypeControllerBase.cs | 4 ++-- .../PublishedCache/CollectPublishedCacheController.cs | 4 +++- .../PublishedCache/PublishedCacheControllerBase.cs | 4 ++-- .../PublishedCache/RebuildPublishedCacheController.cs | 4 +++- .../PublishedCache/ReloadPublishedCacheController.cs | 4 +++- .../PublishedCache/StatusPublishedCacheController.cs | 4 +++- .../ByKeyRedirectUrlManagementController.cs | 7 +++++-- .../DeleteByKeyRedirectUrlManagementController.cs | 7 +++++-- .../GetAllRedirectUrlManagementController.cs | 7 +++++-- .../GetStatusRedirectUrlManagementController.cs | 7 +++++-- ...ller.cs => RedirectUrlManagementControllerBase.cs} | 6 +++--- .../SetStatusRedirectUrlManagementController.cs | 7 +++++-- .../Controllers/Relation/ByChildRelationController.cs | 4 +++- .../Controllers/Relation/ByIdRelationController.cs | 4 +++- .../Relation/ByRelationTypeKeyRelationController.cs | 4 +++- .../Controllers/Relation/RelationControllerBase.cs | 4 ++-- .../Item/ItemRelationTypeItemController.cs | 4 +++- .../Item/RelationTypeItemControllerBase.cs | 4 ++-- .../RelationType/Query/ByKeyRelationTypeController.cs | 4 +++- .../Query/CreateRelationTypeController.cs | 5 +++-- .../Query/DeleteRelationTypeController.cs | 4 +++- .../RelationType/Query/RelationTypeControllerBase.cs | 4 ++-- .../Query/UpdateRelationTypeController.cs | 4 +++- .../Tree/RelationTypeTreeControllerBase.cs | 4 ++-- .../Tree/RootRelationTypeTreeController.cs | 4 +++- .../Controllers/Script/ByPathScriptController.cs | 4 +++- .../Controllers/Script/CreateScriptController.cs | 4 +++- .../Controllers/Script/DeleteScriptController.cs | 4 +++- .../Script/Folder/ByPathScriptFolderController.cs | 4 +++- .../Script/Folder/CreateScriptFolderController.cs | 4 +++- .../Script/Folder/DeleteScriptFolderController.cs | 4 +++- .../Script/Folder/ScriptFolderControllerBase.cs | 4 ++-- .../Script/Item/ItemScriptItemController.cs | 4 +++- .../Script/Item/ScriptItemControllerBase.cs | 4 ++-- .../Controllers/Script/ScriptControllerBase.cs | 4 ++-- .../Script/Tree/ChildrenScriptTreeController.cs | 4 +++- .../Script/Tree/RootScriptTreeController.cs | 4 +++- .../Script/Tree/ScriptTreeControllerBase.cs | 4 ++-- .../Controllers/Script/UpdateScriptController.cs | 4 +++- .../Controllers/Searcher/AllSearcherController.cs | 3 ++- .../Controllers/Searcher/QuerySearcherController.cs | 5 +++-- .../Controllers/Security/BackOfficeController.cs | 2 ++ .../Controllers/Server/StatusServerController.cs | 3 ++- .../Controllers/Server/VersionServerController.cs | 3 ++- .../StaticFile/Item/ItemStaticFileItemController.cs | 4 +++- .../StaticFile/Item/StaticFileItemControllerBase.cs | 4 ++-- .../Tree/ChildrenStaticFileTreeController.cs | 4 +++- .../StaticFile/Tree/RootStaticFileTreeController.cs | 4 +++- .../StaticFile/Tree/StaticFileTreeControllerBase.cs | 4 ++-- .../Controllers/Stylesheet/AllStylesheetController.cs | 4 +++- .../Stylesheet/ByPathStylesheetController.cs | 4 +++- .../Stylesheet/CreateStylesheetController.cs | 4 +++- .../Stylesheet/DeleteStylesheetController.cs | 4 +++- .../Stylesheet/ExtractRichTextRulesController.cs | 4 +++- .../Folder/ByPathStylesheetFolderController.cs | 4 +++- .../Folder/CreateStylesheetFolderController.cs | 4 +++- .../Folder/DeleteStylesheetFolderController.cs | 4 +++- .../Folder/StylesheetFolderControllerBase.cs | 4 ++-- .../Controllers/Stylesheet/GetRichTextRulesByPath.cs | 4 +++- .../Stylesheet/InterpolateRichTextRulesController.cs | 4 +++- .../Stylesheet/Item/ItemStylesheetItemController.cs | 4 +++- .../Stylesheet/Item/StylesheetItemControllerBase.cs | 4 ++-- .../Stylesheet/StylesheetControllerBase.cs | 4 ++-- .../Tree/ChildrenStylesheetTreeController.cs | 4 +++- .../Stylesheet/Tree/RootStylesheetTreeController.cs | 4 +++- .../Stylesheet/Tree/StylesheetTreeControllerBase.cs | 4 ++-- .../Stylesheet/UpdateStylesheetController.cs | 4 +++- .../Controllers/Tag/ByQueryTagController.cs | 4 +++- .../Controllers/Tag/TagControllerBase.cs | 4 ++-- .../Controllers/Telemetry/AllTelemetryController.cs | 2 ++ .../Controllers/Telemetry/GetTelemetryController.cs | 4 +++- .../Controllers/Telemetry/SetTelemetryController.cs | 4 +++- .../Controllers/Telemetry/TelemetryControllerBase.cs | 4 ++-- .../Controllers/Template/ByKeyTemplateController.cs | 4 +++- .../Controllers/Template/CreateTemplateController.cs | 4 +++- .../Controllers/Template/DeleteTemplateController.cs | 4 +++- .../Template/Item/ItemTemplateItemController.cs | 5 +++-- .../Template/Item/TemplateItemControllerBase.cs | 1 - .../Template/Query/ExecuteTemplateQueryController.cs | 2 ++ .../Template/Query/SettingsTemplateQueryController.cs | 4 +++- .../Template/ScaffoldTemplateController.cs | 4 +++- .../Controllers/Template/TemplateControllerBase.cs | 4 ++-- .../Template/Tree/ChildrenTemplateTreeController.cs | 4 +++- .../Template/Tree/RootTemplateTreeController.cs | 4 +++- .../Template/Tree/TemplateTreeControllerBase.cs | 4 ++-- .../Controllers/Template/UpdateTemplateController.cs | 4 +++- .../TemporaryFile/ByKeyTemporaryFileController.cs | 7 +++++-- .../TemporaryFile/CreateTemporaryFileController.cs | 4 +++- .../TemporaryFile/DeleteTemporaryFileController.cs | 4 +++- .../TemporaryFile/TemporaryFileControllerBase.cs | 2 -- .../ByIdTrackedReferenceController.cs | 4 +++- .../DescendantsTrackedReferenceController.cs | 4 +++- .../ItemsTrackedReferenceController.cs | 4 +++- .../TrackedReferencesControllerBase.cs | 1 - .../Controllers/Upgrade/AuthorizeUpgradeController.cs | 3 ++- .../Controllers/Upgrade/SettingsUpgradeController.cs | 3 ++- .../Controllers/User/ByKeyUsersController.cs | 4 +++- .../Controllers/User/ChangePasswordUsersController.cs | 4 +++- .../Controllers/User/ClearAvatarUsersController.cs | 5 ++++- .../Controllers/User/CreateUsersController.cs | 4 +++- .../Controllers/User/DeleteUsersController.cs | 5 ++++- .../Controllers/User/DisableUsersController.cs | 4 +++- .../Controllers/User/EnableUsersController.cs | 4 +++- .../Controllers/User/FilterUsersController.cs | 4 +++- .../Controllers/User/GetAllUsersController.cs | 4 +++- .../Controllers/User/InviteUsersController.cs | 4 +++- .../Controllers/User/Item/ItemUserItemController.cs | 4 +++- .../Controllers/User/Item/UserItemControllerBase.cs | 4 ++-- .../Controllers/User/SetAvatarUsersController.cs | 5 ++++- .../Controllers/User/UnlockUsersController.cs | 4 +++- .../User/UpdateUserGroupsUsersController.cs | 4 +++- .../Controllers/User/UpdateUsersController.cs | 4 +++- .../Controllers/User/UsersControllerBase.cs | 4 ++-- .../Controllers/UserGroup/ByKeyUserGroupController.cs | 5 +++-- .../UserGroup/CreateUserGroupController.cs | 4 +++- .../UserGroup/DeleteUserGroupController.cs | 4 +++- .../UserGroup/GetAllUserGroupController.cs | 4 +++- .../UserGroup/Item/ItemUserGroupItemController.cs | 4 +++- .../UserGroup/Item/UserGroupItemControllerBase.cs | 4 ++-- .../UserGroup/UpdateUserGroupController.cs | 4 +++- .../Controllers/UserGroup/UserGroupsControllerBase.cs | 4 ++-- 299 files changed, 781 insertions(+), 355 deletions(-) rename src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/{PartialViewFolderBaseController.cs => PartialViewFolderControllerBase.cs} (98%) rename src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/{RedirectUrlManagementBaseController.cs => RedirectUrlManagementControllerBase.cs} (68%) diff --git a/src/Umbraco.Cms.Api.Common/Configuration/ConfigureApiExplorerOptions.cs b/src/Umbraco.Cms.Api.Common/Configuration/ConfigureApiExplorerOptions.cs index 2b9179202b..918661bea8 100644 --- a/src/Umbraco.Cms.Api.Common/Configuration/ConfigureApiExplorerOptions.cs +++ b/src/Umbraco.Cms.Api.Common/Configuration/ConfigureApiExplorerOptions.cs @@ -1,6 +1,5 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.ApiExplorer; -using Microsoft.AspNetCore.Mvc.Versioning; +using Asp.Versioning; +using Asp.Versioning.ApiExplorer; using Microsoft.Extensions.Options; namespace Umbraco.Cms.Api.Common.Configuration; diff --git a/src/Umbraco.Cms.Api.Common/Configuration/ConfigureApiVersioningOptions.cs b/src/Umbraco.Cms.Api.Common/Configuration/ConfigureApiVersioningOptions.cs index 028d731444..b2994428b9 100644 --- a/src/Umbraco.Cms.Api.Common/Configuration/ConfigureApiVersioningOptions.cs +++ b/src/Umbraco.Cms.Api.Common/Configuration/ConfigureApiVersioningOptions.cs @@ -1,5 +1,5 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Versioning; + +using Asp.Versioning; using Microsoft.Extensions.Options; namespace Umbraco.Cms.Api.Common.Configuration; @@ -13,6 +13,5 @@ public class ConfigureApiVersioningOptions : IConfigureOptions { + if (type.Namespace != null && type.Namespace.StartsWith(cachedApiElementNamespace)) + { + // We do not show type on delivery, as it is read only. + return null; + } + if (type.GetInterfaces().Any()) { return "$type"; diff --git a/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderApiExtensions.cs b/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderApiExtensions.cs index 360bcb7db3..8b940a8b1d 100644 --- a/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderApiExtensions.cs +++ b/src/Umbraco.Cms.Api.Common/DependencyInjection/UmbracoBuilderApiExtensions.cs @@ -23,9 +23,8 @@ public static class UmbracoBuilderApiExtensions public static IUmbracoBuilder AddUmbracoApiOpenApiUI(this IUmbracoBuilder builder) { builder.Services.ConfigureOptions(); - builder.Services.AddApiVersioning(); builder.Services.ConfigureOptions(); - builder.Services.AddVersionedApiExplorer(); + builder.Services.AddApiVersioning().AddApiExplorer(); builder.Services.AddSwaggerGen(); builder.Services.ConfigureOptions(); diff --git a/src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs b/src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs index 3e72c097aa..9d619f5e1c 100644 --- a/src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs +++ b/src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs @@ -1,5 +1,5 @@ using System.Reflection; -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; using Umbraco.Cms.Api.Common.Attributes; using Umbraco.Cms.Api.Common.Configuration; diff --git a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj index 08f4ec69f8..9fb4dbc3b0 100644 --- a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj +++ b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj @@ -9,13 +9,13 @@ - - + + - + diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/ByIdContentApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/ByIdContentApiController.cs index 3a01f35d3a..01a5149a14 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/ByIdContentApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/ByIdContentApiController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.DeliveryApi; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Delivery.Controllers; +[ApiVersion("1.0")] public class ByIdContentApiController : ContentApiItemControllerBase { public ByIdContentApiController( diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/ByRouteContentApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/ByRouteContentApiController.cs index 1f8334cefb..cc260f3930 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/ByRouteContentApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/ByRouteContentApiController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.DeliveryApi; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Delivery.Controllers; +[ApiVersion("1.0")] public class ByRouteContentApiController : ContentApiItemControllerBase { private readonly IRequestRoutingService _requestRoutingService; diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/DeliveryApiControllerBase.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/DeliveryApiControllerBase.cs index a939c816a5..becf64e73d 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/DeliveryApiControllerBase.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/DeliveryApiControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Attributes; using Umbraco.Cms.Api.Common.Filters; @@ -8,7 +9,6 @@ using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Delivery.Controllers; [ApiController] -[ApiVersion("1.0")] [DeliveryApiAccess] [JsonOptionsName(Constants.JsonOptionsNames.DeliveryApi)] [LocalizeFromAcceptLanguageHeader] diff --git a/src/Umbraco.Cms.Api.Delivery/Controllers/QueryContentApiController.cs b/src/Umbraco.Cms.Api.Delivery/Controllers/QueryContentApiController.cs index e220269310..95f021f02f 100644 --- a/src/Umbraco.Cms.Api.Delivery/Controllers/QueryContentApiController.cs +++ b/src/Umbraco.Cms.Api.Delivery/Controllers/QueryContentApiController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -8,6 +9,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Delivery.Controllers; +[ApiVersion("1.0")] public class QueryContentApiController : ContentApiControllerBase { private readonly IApiContentQueryService _apiContentQueryService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/AuditLogControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/AuditLogControllerBase.cs index 29293c67b7..ff11825755 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/AuditLogControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/AuditLogControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.AuditLog; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.AuditLog; [ApiController] [VersionedApiBackOfficeRoute("audit-log")] [ApiExplorerSettings(GroupName = "Audit Log")] -[ApiVersion("1.0")] public class AuditLogControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs index e7a1704f3c..96952f1d61 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByKeyAuditLogController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -10,6 +11,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.AuditLog; +[ApiVersion("1.0")] public class ByKeyAuditLogController : AuditLogControllerBase { private readonly IAuditService _auditService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByTypeAuditLogController.cs b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByTypeAuditLogController.cs index b57aa5ba19..0f6625df73 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByTypeAuditLogController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/ByTypeAuditLogController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.AuditLog; +[ApiVersion("1.0")] public class ByTypeAuditLogController : AuditLogControllerBase { private readonly IAuditService _auditService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/CurrentUserAuditLogController.cs b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/CurrentUserAuditLogController.cs index d620367f2e..1917a866f9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/CurrentUserAuditLogController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/AuditLog/CurrentUserAuditLogController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -9,11 +10,11 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Membership; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; -using Umbraco.Cms.Core.Services.OperationStatus; using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.AuditLog; +[ApiVersion("1.0")] public class CurrentUserAuditLogController : AuditLogControllerBase { private readonly IAuditService _auditService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Culture/AllCultureController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Culture/AllCultureController.cs index d17b31cfe2..c1105c7391 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Culture/AllCultureController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Culture/AllCultureController.cs @@ -1,4 +1,5 @@ using System.Globalization; +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Api.Common.ViewModels.Pagination; namespace Umbraco.Cms.Api.Management.Controllers.Culture; +[ApiVersion("1.0")] public class AllCultureController : CultureControllerBase { private readonly IUmbracoMapper _umbracoMapper; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Culture/CultureControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Culture/CultureControllerBase.cs index 7355345493..a0fb19d0ac 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Culture/CultureControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Culture/CultureControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Culture; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Culture; [ApiController] [VersionedApiBackOfficeRoute("culture")] [ApiExplorerSettings(GroupName = "Culture")] -[ApiVersion("1.0")] public abstract class CultureControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/ByKeyDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/ByKeyDataTypeController.cs index 6b40a0a406..f79eceb4e8 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/ByKeyDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/ByKeyDataTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.DataType; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.DataType; +[ApiVersion("1.0")] public class ByKeyDataTypeController : DataTypeControllerBase { private readonly IDataTypeService _dataTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/CopyDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/CopyDataTypeController.cs index fd0954a04d..c28913abf7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/CopyDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/CopyDataTypeController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.DataType; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.DataType; +[ApiVersion("1.0")] public class CopyDataTypeController : DataTypeControllerBase { private readonly IDataTypeService _dataTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/CreateDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/CreateDataTypeController.cs index 86ceb32dfc..c595472a49 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/CreateDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/CreateDataTypeController.cs @@ -1,9 +1,9 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.DataType; using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; @@ -11,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.DataType; +[ApiVersion("1.0")] public class CreateDataTypeController : DataTypeControllerBase { private readonly IDataTypeService _dataTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/DataTypeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/DataTypeControllerBase.cs index cf8373f726..984e70970e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/DataTypeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/DataTypeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -10,7 +11,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.DataType; [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.DataType)] [ApiExplorerSettings(GroupName = "Data Type")] -[ApiVersion("1.0")] public abstract class DataTypeControllerBase : ManagementApiControllerBase { protected IActionResult DataTypeOperationStatusResult(DataTypeOperationStatus status) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/DeleteDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/DeleteDataTypeController.cs index 0128d0385b..777ed85437 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/DeleteDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/DeleteDataTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.DataType; +[ApiVersion("1.0")] public class DeleteDataTypeController : DataTypeControllerBase { private readonly IDataTypeService _dataTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/ByKeyDataTypeFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/ByKeyDataTypeFolderController.cs index 7286f0ae96..5399c2f6ad 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/ByKeyDataTypeFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/ByKeyDataTypeFolderController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Folder; using Umbraco.Cms.Core.Security; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Folder; +[ApiVersion("1.0")] public class ByKeyDataTypeFolderController : DataTypeFolderControllerBase { public ByKeyDataTypeFolderController(IBackOfficeSecurityAccessor backOfficeSecurityAccessor, IDataTypeContainerService dataTypeContainerService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/CreateDataTypeFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/CreateDataTypeFolderController.cs index 4c5490ce2f..7124193a22 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/CreateDataTypeFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/CreateDataTypeFolderController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Folder; using Umbraco.Cms.Core.Security; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Folder; +[ApiVersion("1.0")] public class CreateDataTypeFolderController : DataTypeFolderControllerBase { public CreateDataTypeFolderController(IBackOfficeSecurityAccessor backOfficeSecurityAccessor, IDataTypeContainerService dataTypeContainerService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs index 297869a133..c003f5479a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DataTypeFolderControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -10,7 +11,6 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Folder; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DataType}/folder")] [ApiExplorerSettings(GroupName = "Data Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DeleteDataTypeFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DeleteDataTypeFolderController.cs index 75b2f71f06..59da3f56bb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DeleteDataTypeFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/DeleteDataTypeFolderController.cs @@ -1,11 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Folder; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Folder; +[ApiVersion("1.0")] public class DeleteDataTypeFolderController : DataTypeFolderControllerBase { public DeleteDataTypeFolderController(IBackOfficeSecurityAccessor backOfficeSecurityAccessor, IDataTypeContainerService dataTypeContainerService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/UpdateDataTypeFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/UpdateDataTypeFolderController.cs index 756b67223c..3df3c580ee 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/UpdateDataTypeFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Folder/UpdateDataTypeFolderController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Folder; using Umbraco.Cms.Core.Security; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Folder; +[ApiVersion("1.0")] public class UpdateDataTypeFolderController : DataTypeFolderControllerBase { public UpdateDataTypeFolderController(IBackOfficeSecurityAccessor backOfficeSecurityAccessor, IDataTypeContainerService dataTypeContainerService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/IsUsedDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/IsUsedDataTypeController.cs index c1fbb4f34d..55515fbb36 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/IsUsedDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/IsUsedDataTypeController.cs @@ -1,14 +1,13 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.DataType; using Umbraco.Cms.Core; -using Umbraco.Cms.Core.Mapping; -using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.DataType; +[ApiVersion("1.0")] public class IsUsedDataTypeController : DataTypeControllerBase { private readonly IDataTypeUsageService _dataTypeUsageService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ItemDatatypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ItemDatatypeItemController.cs index 066c568dbb..95240a97ca 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ItemDatatypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Items/ItemDatatypeItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.DataType.Item; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Items; +[ApiVersion("1.0")] public class ItemDatatypeItemController : DatatypeItemControllerBase { private readonly IDataTypeService _dataTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/MoveDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/MoveDataTypeController.cs index 552eadd4cf..2899c30293 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/MoveDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/MoveDataTypeController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.DataType; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.DataType; +[ApiVersion("1.0")] public class MoveDataTypeController : DataTypeControllerBase { private readonly IDataTypeService _dataTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/ReferencesDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/ReferencesDataTypeController.cs index 24cd35029f..34d81a7bab 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/ReferencesDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/ReferencesDataTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.DataType; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.DataType; +[ApiVersion("1.0")] public class ReferencesDataTypeController : DataTypeControllerBase { private readonly IDataTypeService _dataTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs index 3695e38e5a..22eb3eb6a6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/ChildrenDataTypeTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Tree; +[ApiVersion("1.0")] public class ChildrenDataTypeTreeController : DataTypeTreeControllerBase { public ChildrenDataTypeTreeController(IEntityService entityService, IDataTypeService dataTypeService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs index ce91cff57b..e5167959d3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; @@ -9,7 +10,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DataType}")] [ApiExplorerSettings(GroupName = "Data Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/RootDataTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/RootDataTypeTreeController.cs index e80ede25f6..a9c3eaf447 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/RootDataTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/RootDataTypeTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.DataType.Tree; +[ApiVersion("1.0")] public class RootDataTypeTreeController : DataTypeTreeControllerBase { public RootDataTypeTreeController(IEntityService entityService, IDataTypeService dataTypeService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DataType/UpdateDataTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DataType/UpdateDataTypeController.cs index 60ca5de703..98cbdb1427 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DataType/UpdateDataTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DataType/UpdateDataTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.DataType; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.DataType; +[ApiVersion("1.0")] public class UpdateDataTypeController : DataTypeControllerBase { private readonly IDataTypeService _dataTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs index fb1f5f67d9..a5122b7506 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/AllDictionaryController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; +[ApiVersion("1.0")] public class AllDictionaryController : DictionaryControllerBase { private readonly IDictionaryItemService _dictionaryItemService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ByKeyDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ByKeyDictionaryController.cs index b53481b4a6..aa535ddf20 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ByKeyDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ByKeyDictionaryController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Core.Models; @@ -7,6 +8,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Dictionary; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; +[ApiVersion("1.0")] public class ByKeyDictionaryController : DictionaryControllerBase { private readonly IDictionaryItemService _dictionaryItemService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/CreateDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/CreateDictionaryController.cs index 715582dbb6..1aef960436 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/CreateDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/CreateDictionaryController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Core.Models; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; +[ApiVersion("1.0")] public class CreateDictionaryController : DictionaryControllerBase { private readonly IDictionaryItemService _dictionaryItemService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DeleteDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DeleteDictionaryController.cs index c3a7697b5a..35b4e0110f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DeleteDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DeleteDictionaryController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; +[ApiVersion("1.0")] public class DeleteDictionaryController : DictionaryControllerBase { private readonly IDictionaryItemService _dictionaryItemService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DictionaryControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DictionaryControllerBase.cs index 5f417acf76..1e15bef9b1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DictionaryControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/DictionaryControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; @@ -9,7 +10,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; [ApiController] [VersionedApiBackOfficeRoute("dictionary")] [ApiExplorerSettings(GroupName = "Dictionary")] -[ApiVersion("1.0")] // TODO: Add authentication public abstract class DictionaryControllerBase : ManagementApiControllerBase { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ExportDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ExportDictionaryController.cs index a230fd88b0..6f8116a829 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ExportDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ExportDictionaryController.cs @@ -1,6 +1,7 @@ using System.Net.Mime; using System.Text; using System.Xml.Linq; +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Models; @@ -9,6 +10,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; +[ApiVersion("1.0")] public class ExportDictionaryController : DictionaryControllerBase { private readonly IDictionaryItemService _dictionaryItemService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ImportDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ImportDictionaryController.cs index 193203c13f..3e0dfe1a09 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ImportDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/ImportDictionaryController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Core.Models; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Security; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; +[ApiVersion("1.0")] public class ImportDictionaryController : DictionaryControllerBase { private readonly IDictionaryItemImportService _dictionaryItemImportService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Item/ItemDictionaryItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Item/ItemDictionaryItemController.cs index 3b3da8c786..90fe0834be 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Item/ItemDictionaryItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Item/ItemDictionaryItemController.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.DataType.Item; using Umbraco.Cms.Api.Management.ViewModels.Dictionary.Item; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -8,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary.Item; +[ApiVersion("1.0")] public class ItemDictionaryItemController : DictionaryItemControllerBase { private readonly IDictionaryItemService _dictionaryItemService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/MoveDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/MoveDictionaryController.cs index e55259e593..60c3549fd7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/MoveDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/MoveDictionaryController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Dictionary; using Umbraco.Cms.Core; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; +[ApiVersion("1.0")] public class MoveDictionaryController : DictionaryControllerBase { private readonly IDictionaryItemService _dictionaryItemService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs index 659bcb81e1..1d70c4cab9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/ChildrenDictionaryTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; @@ -8,6 +9,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary.Tree; +[ApiVersion("1.0")] public class ChildrenDictionaryTreeController : DictionaryTreeControllerBase { public ChildrenDictionaryTreeController(IEntityService entityService, IDictionaryItemService dictionaryItemService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs index 4f269aa47a..1aeb5350b9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/DictionaryTreeControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -8,7 +9,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/dictionary")] [ApiExplorerSettings(GroupName = "Dictionary")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/RootDictionaryTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/RootDictionaryTreeController.cs index 0412f6181f..24e66bf281 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/RootDictionaryTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/Tree/RootDictionaryTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; @@ -8,6 +9,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary.Tree; +[ApiVersion("1.0")] public class RootDictionaryTreeController : DictionaryTreeControllerBase { public RootDictionaryTreeController(IEntityService entityService, IDictionaryItemService dictionaryItemService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/UpdateDictionaryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/UpdateDictionaryController.cs index 120e16b38f..d563850052 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/UpdateDictionaryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Dictionary/UpdateDictionaryController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Core.Models; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Dictionary; +[ApiVersion("1.0")] public class UpdateDictionaryController : DictionaryControllerBase { private readonly IDictionaryItemService _dictionaryItemService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs index 7ff436f264..2768fa592b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/ByKeyDocumentController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Document; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class ByKeyDocumentController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/CopyDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/CopyDocumentController.cs index 44d0aa77dd..adf364eba5 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/CopyDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/CopyDocumentController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Document; using Umbraco.Cms.Core; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class CopyDocumentController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentController.cs index 79f0e03899..7157859b9a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/CreateDocumentController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Document; @@ -11,6 +12,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class CreateDocumentController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/DocumentControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/DocumentControllerBase.cs index fa3574041d..3fe5280f11 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/DocumentControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/DocumentControllerBase.cs @@ -1,11 +1,11 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Content; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.Document; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.Document)] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Document))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/DomainsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/DomainsController.cs index 95f9fb8746..3b51d9509a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/DomainsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/DomainsController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Document; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class DomainsController : DocumentControllerBase { private readonly IDomainService _domainService; @@ -17,6 +19,7 @@ public class DomainsController : DocumentControllerBase _umbracoMapper = umbracoMapper; } + [MapToApiVersion("1.0")] [HttpGet("{id:guid}/domains")] public async Task DomainsAsync(Guid id) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/DocumentItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/DocumentItemControllerBase.cs index c66b2a14c2..314662a5f1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/DocumentItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/DocumentItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.Document.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.Document)] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Document))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs index d7373da0cd..09e72c21ee 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Item/ItemDocumentItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.Services.Entities; @@ -10,6 +11,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.Document.Item; +[ApiVersion("1.0")] public class ItemDocumentItemController : DocumentItemControllerBase { private readonly IEntityService _entityService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveDocumentController.cs index e1d34fbffa..b558c55183 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveDocumentController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Document; using Umbraco.Cms.Core; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class MoveDocumentController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveToRecycleBinDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveToRecycleBinDocumentController.cs index c0867031cf..f8e4822c2b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveToRecycleBinDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/MoveToRecycleBinDocumentController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class MoveToRecycleBinDocumentController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/NotificationsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/NotificationsController.cs index 19294f2f32..55c0463a44 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/NotificationsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/NotificationsController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Document; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class NotificationsController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; @@ -18,6 +20,7 @@ public class NotificationsController : DocumentControllerBase _documentNotificationPresentationFactory = documentNotificationPresentationFactory; } + [MapToApiVersion("1.0")] [HttpGet("{id:guid}/notifications")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs index 293e8e011a..82f9e3ed8f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/ChildrenDocumentRecycleBinController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.RecycleBin; namespace Umbraco.Cms.Api.Management.Controllers.Document.RecycleBin; +[ApiVersion("1.0")] public class ChildrenDocumentRecycleBinController : DocumentRecycleBinControllerBase { public ChildrenDocumentRecycleBinController(IEntityService entityService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs index d4f59d7712..9e099cd1d2 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/DocumentRecycleBinControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -11,7 +12,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Document.RecycleBin; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.RecycleBin}/{Constants.UdiEntityType.Document}")] [RequireDocumentTreeRootAccess] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/RootDocumentRecycleBinController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/RootDocumentRecycleBinController.cs index eb0a2eee7a..5471adb291 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/RootDocumentRecycleBinController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/RecycleBin/RootDocumentRecycleBinController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.RecycleBin; namespace Umbraco.Cms.Api.Management.Controllers.Document.RecycleBin; +[ApiVersion("1.0")] public class RootDocumentRecycleBinController : DocumentRecycleBinControllerBase { public RootDocumentRecycleBinController(IEntityService entityService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ChildrenDocumentTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ChildrenDocumentTreeController.cs index 889c6810e5..790fda0721 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ChildrenDocumentTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/ChildrenDocumentTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Security; @@ -9,6 +10,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Document.Tree; +[ApiVersion("1.0")] public class ChildrenDocumentTreeController : DocumentTreeControllerBase { public ChildrenDocumentTreeController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs index 70ead04951..1826b8358c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Models; @@ -13,7 +14,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Document.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Document}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Document))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/RootDocumentTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/RootDocumentTreeController.cs index e50f7af14c..02a4586f55 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/RootDocumentTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/RootDocumentTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Security; @@ -9,6 +10,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Document.Tree; +[ApiVersion("1.0")] public class RootDocumentTreeController : DocumentTreeControllerBase { public RootDocumentTreeController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs index 07f3a069c6..240b1d7910 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDocumentController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Document; @@ -11,6 +12,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class UpdateDocumentController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDomainsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDomainsController.cs index df2c87e76f..8722a80fff 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDomainsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateDomainsController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.ViewModels.Document; @@ -11,6 +12,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class UpdateDomainsController : DocumentControllerBase { private readonly IDomainService _domainService; @@ -22,6 +24,7 @@ public class UpdateDomainsController : DocumentControllerBase _umbracoMapper = umbracoMapper; } + [MapToApiVersion("1.0")] [HttpPut("{id:guid}/domains")] public async Task UpdateDomainsAsync(Guid id, UpdateDomainsRequestModel updateModel) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs index e08deebfa9..3eb3ea4baf 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Document/UpdateNotificationsController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Document; using Umbraco.Cms.Core.Models; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Document; +[ApiVersion("1.0")] public class UpdateNotificationsController : DocumentControllerBase { private readonly IContentEditingService _contentEditingService; @@ -20,6 +22,7 @@ public class UpdateNotificationsController : DocumentControllerBase _backOfficeSecurityAccessor = backOfficeSecurityAccessor; } + [MapToApiVersion("1.0")] [HttpPut("{id:guid}/notifications")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/DocumentBlueprintItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/DocumentBlueprintItemControllerBase.cs index ca7ec9ab8a..2f308c7741 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/DocumentBlueprintItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/DocumentBlueprintItemControllerBase.cs @@ -4,7 +4,6 @@ using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.DocumentBlueprint.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.DocumentBlueprint}")] [ApiExplorerSettings(GroupName = "Document Blueprint")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs index 3a90e8871e..db7a59668b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Item/ItemDocumentBlueprintController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.DocumentBlueprint.Item; @@ -9,6 +10,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.DocumentBlueprint.Item; +[ApiVersion("1.0")] public class ItemDocumentBlueprintController : DocumentBlueprintItemControllerBase { private readonly IEntityService _entityService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs index de71b57595..23537e9385 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; @@ -9,7 +10,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.DocumentBlueprint.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DocumentBlueprint}")] [ApiExplorerSettings(GroupName = "Document Blueprint")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/RootDocumentBlueprintTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/RootDocumentBlueprintTreeController.cs index 5c9c482843..04e188acde 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/RootDocumentBlueprintTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentBlueprint/Tree/RootDocumentBlueprintTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.DocumentBlueprint.Tree; +[ApiVersion("1.0")] public class RootDocumentBlueprintTreeController : DocumentBlueprintTreeControllerBase { public RootDocumentBlueprintTreeController(IEntityService entityService, IContentTypeService contentTypeService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/ByKeyDocumentTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/ByKeyDocumentTypeController.cs index b68b939a98..2f7b7cdd86 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/ByKeyDocumentTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/ByKeyDocumentTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.DocumentType; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.DocumentType; +[ApiVersion("1.0")] public class ByKeyDocumentTypeController : DocumentTypeControllerBase { private readonly IContentTypeService _contentTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/DocumentTypeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/DocumentTypeControllerBase.cs index d5279cfde4..e216c63d15 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/DocumentTypeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/DocumentTypeControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.DocumentType; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.DocumentType)] [ApiExplorerSettings(GroupName = "Document Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/DocumentTypeItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/DocumentTypeItemControllerBase.cs index b43a187da0..936c80c555 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/DocumentTypeItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/DocumentTypeItemControllerBase.cs @@ -4,7 +4,6 @@ using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.DocumentType.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.DocumentType)] [ApiExplorerSettings(GroupName = "Document Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/ItemDocumentTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/ItemDocumentTypeItemController.cs index 85c0885ba8..c83d341e08 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/ItemDocumentTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Item/ItemDocumentTypeItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.DocumentType.Item; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.DocumentType.Item; +[ApiVersion("1.0")] public class ItemDocumentTypeItemController : DocumentTypeItemControllerBase { private readonly IContentTypeService _contentTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs index 1cfbf58ead..0e8f387dae 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/ChildrenDocumentTypeTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.DocumentType.Tree; +[ApiVersion("1.0")] public class ChildrenDocumentTypeTreeController : DocumentTypeTreeControllerBase { public ChildrenDocumentTypeTreeController(IEntityService entityService, IContentTypeService contentTypeService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/DocumentTypeTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/DocumentTypeTreeControllerBase.cs index af67429975..1e3a33034f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/DocumentTypeTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/DocumentTypeTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; @@ -9,7 +10,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.DocumentType.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.DocumentType}")] [ApiExplorerSettings(GroupName = "Document Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/RootDocumentTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/RootDocumentTypeTreeController.cs index ddb25600c0..dc11dc7d80 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/RootDocumentTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Tree/RootDocumentTypeTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.DocumentType.Tree; +[ApiVersion("1.0")] public class RootDocumentTypeTreeController : DocumentTypeTreeControllerBase { public RootDocumentTypeTreeController(IEntityService entityService, IContentTypeService contentTypeService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs index 830ec7bb3a..01b07f08db 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/ExecuteActionHealthCheckController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Mapping; namespace Umbraco.Cms.Api.Management.Controllers.HealthCheck; +[ApiVersion("1.0")] public class ExecuteActionHealthCheckController : HealthCheckControllerBase { private readonly HealthCheckCollection _healthChecks; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs index 1fc1f40c2c..273ec4aaea 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/AllHealthCheckGroupController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Mapping; namespace Umbraco.Cms.Api.Management.Controllers.HealthCheck.Group; +[ApiVersion("1.0")] public class AllHealthCheckGroupController : HealthCheckGroupControllerBase { private readonly IHealthCheckGroupPresentationFactory _healthCheckGroupPresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/ByNameHealthCheckGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/ByNameHealthCheckGroupController.cs index e87385d4a3..d8e5706014 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/ByNameHealthCheckGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/ByNameHealthCheckGroupController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; @@ -7,6 +8,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.HealthCheck.Group; +[ApiVersion("1.0")] public class ByNameHealthCheckGroupController : HealthCheckGroupControllerBase { private readonly IHealthCheckGroupPresentationFactory _healthCheckGroupPresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/CheckHealthCheckGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/CheckHealthCheckGroupController.cs index e69dfb7f5b..f66107e679 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/CheckHealthCheckGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/CheckHealthCheckGroupController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; @@ -6,6 +7,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.HealthCheck.Group; +[ApiVersion("1.0")] public class CheckHealthCheckGroupController : HealthCheckGroupControllerBase { private readonly IHealthCheckGroupPresentationFactory _healthCheckGroupPresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/HealthCheckGroupControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/HealthCheckGroupControllerBase.cs index 06731d32e1..77502d2a10 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/HealthCheckGroupControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/Group/HealthCheckGroupControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Constants = Umbraco.Cms.Core.Constants; @@ -7,7 +8,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.HealthCheck.Group; [ApiController] [VersionedApiBackOfficeRoute($"{Constants.HealthChecks.RoutePath.HealthCheck}-group")] [ApiExplorerSettings(GroupName = "Health Check")] -[ApiVersion("1.0")] public abstract class HealthCheckGroupControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/HealthCheckControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/HealthCheckControllerBase.cs index c5681f3323..6ba666bc27 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/HealthCheckControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/HealthCheck/HealthCheckControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Constants = Umbraco.Cms.Core.Constants; @@ -7,7 +8,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.HealthCheck; [ApiController] [VersionedApiBackOfficeRoute($"{Constants.HealthChecks.RoutePath.HealthCheck}")] [ApiExplorerSettings(GroupName = "Health Check")] -[ApiVersion("1.0")] public abstract class HealthCheckControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs index 9a94fa7b59..bc246e9777 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Help/GetHelpController.cs @@ -1,16 +1,17 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Serialization; using Umbraco.Cms.Api.Common.Builders; -using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Help; using Umbraco.Cms.Api.Common.ViewModels.Pagination; namespace Umbraco.Cms.Api.Management.Controllers.Help; +[ApiVersion("1.0")] public class GetHelpController : HelpControllerBase { private readonly ILogger _logger; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Help/HelpControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Help/HelpControllerBase.cs index f09e424a31..b728d8ad5e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Help/HelpControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Help/HelpControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Help; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Help; [ApiController] [VersionedApiBackOfficeRoute("help")] [ApiExplorerSettings(GroupName = "Help")] -[ApiVersion("1.0")] public abstract class HelpControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/AllIndexerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/AllIndexerController.cs index ad8a94cb62..96627bd69e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/AllIndexerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/AllIndexerController.cs @@ -1,4 +1,5 @@ -using Examine; +using Asp.Versioning; +using Examine; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs index 8316c68d70..335c034ce7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/DetailsIndexerController.cs @@ -1,4 +1,5 @@ -using Examine; +using Asp.Versioning; +using Examine; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/RebuildIndexerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/RebuildIndexerController.cs index 4d2b51fd87..801669381d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/RebuildIndexerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/RebuildIndexerController.cs @@ -1,4 +1,5 @@ -using Examine; +using Asp.Versioning; +using Examine; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Install/SettingsInstallController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Install/SettingsInstallController.cs index 86f23711a3..af71b2d9c5 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Install/SettingsInstallController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Install/SettingsInstallController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Infrastructure.Install; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Install/SetupInstallController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Install/SetupInstallController.cs index a55831767d..ed925227f3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Install/SetupInstallController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Install/SetupInstallController.cs @@ -1,11 +1,11 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Api.Management.ViewModels.Installer; -using Umbraco.Extensions; using Umbraco.New.Cms.Core.Models.Installer; using Umbraco.New.Cms.Core.Services.Installer; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Install/ValidateDatabaseInstallController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Install/ValidateDatabaseInstallController.cs index a624a44f21..33ac4bb4cd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Install/ValidateDatabaseInstallController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Install/ValidateDatabaseInstallController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Install.Models; using Umbraco.Cms.Core.Mapping; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Language/AllLanguageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Language/AllLanguageController.cs index 4a15f6385c..4bb96d3694 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Language/AllLanguageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Language/AllLanguageController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.ViewModels.Language; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Language; +[ApiVersion("1.0")] public class AllLanguageController : LanguageControllerBase { private readonly ILanguageService _languageService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Language/ByIsoCodeLanguageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Language/ByIsoCodeLanguageController.cs index be175c46d9..f0b437348a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Language/ByIsoCodeLanguageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Language/ByIsoCodeLanguageController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Language; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Language; +[ApiVersion("1.0")] public class ByIsoCodeLanguageController : LanguageControllerBase { private readonly ILanguageService _languageService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Language/CreateLanguageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Language/CreateLanguageController.cs index 6a44d5aa4f..b09dbbfe00 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Language/CreateLanguageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Language/CreateLanguageController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Language; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Language; +[ApiVersion("1.0")] public class CreateLanguageController : LanguageControllerBase { private readonly ILanguageService _languageService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Language/DeleteLanguageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Language/DeleteLanguageController.cs index 9e6aed7f40..4c5b99f870 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Language/DeleteLanguageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Language/DeleteLanguageController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Language; +[ApiVersion("1.0")] public class DeleteLanguageController : LanguageControllerBase { private readonly ILanguageService _languageService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Language/Item/ItemsLanguageEntityController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Language/Item/ItemsLanguageEntityController.cs index 18161bae72..f74556b1e0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Language/Item/ItemsLanguageEntityController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Language/Item/ItemsLanguageEntityController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Language.Item; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Language.Item; +[ApiVersion("1.0")] public class ItemsLanguageEntityController : LanguageEntityControllerBase { private readonly ILanguageService _languageService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Language/LanguageControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Language/LanguageControllerBase.cs index ee88d8673b..81fdf030d2 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Language/LanguageControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Language/LanguageControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -9,7 +10,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Language; [ApiController] [VersionedApiBackOfficeRoute("language")] [ApiExplorerSettings(GroupName = "Language")] -[ApiVersion("1.0")] public abstract class LanguageControllerBase : ManagementApiControllerBase { protected IActionResult LanguageOperationStatusResult(LanguageOperationStatus status) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Language/UpdateLanguageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Language/UpdateLanguageController.cs index 25dcc2388d..0ab4a60257 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Language/UpdateLanguageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Language/UpdateLanguageController.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Language; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; @@ -11,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Language; +[ApiVersion("1.0")] public class UpdateLanguageController : LanguageControllerBase { private readonly ILanguageService _languageService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllLogViewerController.cs index 6a51228a48..c8069749b4 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllLogViewerController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -12,6 +13,7 @@ using LogLevel = Umbraco.Cms.Core.Logging.LogLevel; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer; +[ApiVersion("1.0")] public class AllLogViewerController : LogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllMessageTemplateLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllMessageTemplateLogViewerController.cs index abd4a02b6a..496573eacc 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllMessageTemplateLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllMessageTemplateLogViewerController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -11,6 +12,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer; +[ApiVersion("1.0")] public class AllMessageTemplateLogViewerController : LogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllSinkLevelLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllSinkLevelLogViewerController.cs index 5ab99780a1..4ed43dcffb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllSinkLevelLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/AllSinkLevelLogViewerController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer; +[ApiVersion("1.0")] public class AllSinkLevelLogViewerController : LogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogLevelCountLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogLevelCountLogViewerController.cs index 5692888ba6..a855cae748 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogLevelCountLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogLevelCountLogViewerController.cs @@ -1,6 +1,6 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.ViewModels.LogViewer; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Logging.Viewer; @@ -10,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer; +[ApiVersion("1.0")] public class LogLevelCountLogViewerController : LogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogViewerControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogViewerControllerBase.cs index 080d414442..d8a6d2abb5 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogViewerControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/LogViewerControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; @@ -9,7 +10,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.LogViewer; [ApiController] [VersionedApiBackOfficeRoute("log-viewer")] [ApiExplorerSettings(GroupName = "Log Viewer")] -[ApiVersion("1.0")] public abstract class LogViewerControllerBase : ManagementApiControllerBase { protected IActionResult LogViewerOperationStatusResult(LogViewerOperationStatus status) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/AllSavedSearchLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/AllSavedSearchLogViewerController.cs index 29bf2c85d3..09562548fa 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/AllSavedSearchLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/AllSavedSearchLogViewerController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -9,6 +10,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer.SavedSearch; +[ApiVersion("1.0")] public class AllSavedSearchLogViewerController : SavedSearchLogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/ByNameSavedSearchLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/ByNameSavedSearchLogViewerController.cs index 1e69a3fa48..9119d48164 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/ByNameSavedSearchLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/ByNameSavedSearchLogViewerController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.LogViewer; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer.SavedSearch; +[ApiVersion("1.0")] public class ByNameSavedSearchLogViewerController : SavedSearchLogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/CreateSavedSearchLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/CreateSavedSearchLogViewerController.cs index 2f672d8bb8..e291c383ae 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/CreateSavedSearchLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/CreateSavedSearchLogViewerController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.LogViewer; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer.SavedSearch; +[ApiVersion("1.0")] public class CreateSavedSearchLogViewerController : SavedSearchLogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/DeleteSavedSearchLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/DeleteSavedSearchLogViewerController.cs index 5f7ae438fe..fdd4de945c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/DeleteSavedSearchLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/DeleteSavedSearchLogViewerController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer.SavedSearch; +[ApiVersion("1.0")] public class DeleteSavedSearchLogViewerController : SavedSearchLogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/SavedSearchLogViewerControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/SavedSearchLogViewerControllerBase.cs index 5952f58d63..0b4cfd3d1f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/SavedSearchLogViewerControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/SavedSearch/SavedSearchLogViewerControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.LogViewer.SavedSearch; [ApiController] [VersionedApiBackOfficeRoute("log-viewer/saved-search")] [ApiExplorerSettings(GroupName = "Log Viewer")] -[ApiVersion("1.0")] public class SavedSearchLogViewerControllerBase : LogViewerControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/ValidateLogFileSizeLogViewerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/ValidateLogFileSizeLogViewerController.cs index 3950dd7c15..0d042f1fe2 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/ValidateLogFileSizeLogViewerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/LogViewer/ValidateLogFileSizeLogViewerController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.LogViewer; +[ApiVersion("1.0")] public class ValidateLogFileSizeLogViewerController : LogViewerControllerBase { private readonly ILogViewerService _logViewerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs index 237d931b2b..1d8d5f52ae 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/ByKeyMediaController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Document; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Media; +[ApiVersion("1.0")] public class ByKeyMediaController : MediaControllerBase { private readonly IMediaEditingService _mediaEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/CreateMediaController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/CreateMediaController.cs index 7a427afd1f..93339add5a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/CreateMediaController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/CreateMediaController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Media; @@ -11,6 +12,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Media; +[ApiVersion("1.0")] public class CreateMediaController : MediaControllerBase { private readonly IMediaEditingService _mediaEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs index 5254e46b32..835e3d9a12 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/ItemMediaItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Services.Entities; using Umbraco.Cms.Api.Management.ViewModels.Media.Item; @@ -10,7 +11,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.Media.Item; - +[ApiVersion("1.0")] public class ItemMediaItemController : MediaItemControllerBase { private readonly IEntityService _entityService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/MediaItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/MediaItemControllerBase.cs index 9a176f7653..4df02e948c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/MediaItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Item/MediaItemControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/MediaControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/MediaControllerBase.cs index 5d9005c21b..8cdf8cb0f9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/MediaControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/MediaControllerBase.cs @@ -1,11 +1,11 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Content; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.Media; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.Media)] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Media))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveMediaController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveMediaController.cs index 19f2f0a091..5f0e9a210a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveMediaController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveMediaController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Media; using Umbraco.Cms.Core; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Media; +[ApiVersion("1.0")] public class MoveMediaController : MediaControllerBase { private readonly IMediaEditingService _mediaEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveToRecycleBinMediaController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveToRecycleBinMediaController.cs index dfcc589a61..cba24e23da 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveToRecycleBinMediaController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/MoveToRecycleBinMediaController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Media; +[ApiVersion("1.0")] public class MoveToRecycleBinMediaController : MediaControllerBase { private readonly IMediaEditingService _mediaEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs index c038d5f835..f1d0dc4654 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/ChildrenMediaRecycleBinController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.RecycleBin; namespace Umbraco.Cms.Api.Management.Controllers.Media.RecycleBin; +[ApiVersion("1.0")] public class ChildrenMediaRecycleBinController : MediaRecycleBinControllerBase { public ChildrenMediaRecycleBinController(IEntityService entityService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/MediaRecycleBinControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/MediaRecycleBinControllerBase.cs index 7b75f52db1..8d06a1d01d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/MediaRecycleBinControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/MediaRecycleBinControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -11,7 +12,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Media.RecycleBin; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.RecycleBin}/{Constants.UdiEntityType.Media}")] [RequireMediaTreeRootAccess] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/RootMediaRecycleBinController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/RootMediaRecycleBinController.cs index 78fa222bf4..1990493e02 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/RootMediaRecycleBinController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/RecycleBin/RootMediaRecycleBinController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.RecycleBin; namespace Umbraco.Cms.Api.Management.Controllers.Media.RecycleBin; +[ApiVersion("1.0")] public class RootMediaRecycleBinController : MediaRecycleBinControllerBase { public RootMediaRecycleBinController(IEntityService entityService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs index a7a4689ee5..d5cc4f8ac6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ChildrenMediaTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Security; @@ -9,6 +10,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Media.Tree; +[ApiVersion("1.0")] public class ChildrenMediaTreeController : MediaTreeControllerBase { public ChildrenMediaTreeController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ItemsMediaTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ItemsMediaTreeController.cs index 6b4617df69..c43bf19105 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ItemsMediaTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/ItemsMediaTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Security; @@ -8,6 +9,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Media.Tree; +[ApiVersion("1.0")] public class ItemsMediaTreeController : MediaTreeControllerBase { public ItemsMediaTreeController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/MediaTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/MediaTreeControllerBase.cs index 6803bee3c0..87470e775a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/MediaTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/MediaTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using Asp.Versioning; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Cache; @@ -13,7 +14,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Media.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Media}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Media))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs index 69a76dd0ae..cfd47f63c6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/RootMediaTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Security; @@ -9,6 +10,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Media.Tree; +[ApiVersion("1.0")] public class RootMediaTreeController : MediaTreeControllerBase { public RootMediaTreeController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs index 6ebd3a89ff..b7f245d734 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Media/UpdateMediaController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Media; @@ -11,6 +12,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Media; +[ApiVersion("1.0")] public class UpdateMediaController : MediaControllerBase { private readonly IMediaEditingService _mediaEditingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs index 2d75162185..5e7d4812e7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/ByKeyMediaTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.MediaType; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.MediaType; +[ApiVersion("1.0")] public class ByKeyMediaTypeController : MediaTypeControllerBase { private readonly IMediaTypeService _mediaTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/ItemMediaTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/ItemMediaTypeItemController.cs index 9bb26446d9..466564ceb1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/ItemMediaTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/ItemMediaTypeItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.MediaType.Item; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.MediaType.Item; +[ApiVersion("1.0")] public class ItemMediaTypeItemController : MediaTypeItemControllerBase { private readonly IMediaTypeService _mediaTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/MediaTypeItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/MediaTypeItemControllerBase.cs index 24286be858..5132e56262 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/MediaTypeItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Item/MediaTypeItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.MediaType.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.MediaType)] [ApiExplorerSettings(GroupName = "Media Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/MediaTypeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/MediaTypeControllerBase.cs index 3609e4bbb6..6909a747cb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/MediaTypeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/MediaTypeControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.MediaType; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.MediaType)] [ApiExplorerSettings(GroupName = "Media Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs index 12f75b7d63..442e709f56 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/ChildrenMediaTypeTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.MediaType.Tree; +[ApiVersion("1.0")] public class ChildrenMediaTypeTreeController : MediaTypeTreeControllerBase { public ChildrenMediaTypeTreeController(IEntityService entityService, IMediaTypeService mediaTypeService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/MediaTypeTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/MediaTypeTreeControllerBase.cs index b3783502a3..1f5985d9ef 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/MediaTypeTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/MediaTypeTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; @@ -9,7 +10,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.MediaType.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.MediaType}")] [ApiExplorerSettings(GroupName = "Media Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/RootMediaTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/RootMediaTypeTreeController.cs index 5a7773cd33..fe1f00d017 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/RootMediaTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Tree/RootMediaTypeTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.MediaType.Tree; +[ApiVersion("1.0")] public class RootMediaTypeTreeController : MediaTypeTreeControllerBase { public RootMediaTypeTreeController(IEntityService entityService, IMediaTypeService mediaTypeService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/ItemMemberItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/ItemMemberItemController.cs index 620b549e5f..56c2782290 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/ItemMemberItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/ItemMemberItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Member.Item; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Member.Item; +[ApiVersion("1.0")] public class ItemMemberItemController : MemberItemControllerBase { private readonly IMemberService _memberService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/MemberItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/MemberItemControllerBase.cs index 5ebb4da2e1..040213af67 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/MemberItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Member/Item/MemberItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.Member.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Member}")] [ApiExplorerSettings(GroupName = "Member")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Item/ItemMemberGroupItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Item/ItemMemberGroupItemController.cs index ef2d3e9d2f..cf52fe1e7d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Item/ItemMemberGroupItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Item/ItemMemberGroupItemController.cs @@ -1,4 +1,5 @@ -using J2N.Collections.Generic.Extensions; +using Asp.Versioning; +using J2N.Collections.Generic.Extensions; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.MemberGroup.Item; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.MemberGroup.Item; +[ApiVersion("1.0")] public class ItemMemberGroupItemController : MemberGroupItemControllerBase { private readonly IEntityService _entityService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Item/MemberGroupItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Item/MemberGroupItemControllerBase.cs index 83887c9266..4cddc2e3b4 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Item/MemberGroupItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Item/MemberGroupItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.MemberGroup.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.MemberGroup}")] [ApiExplorerSettings(GroupName = "Member Group")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/MemberGroupTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/MemberGroupTreeControllerBase.cs index 81743f99b4..0704c98b71 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/MemberGroupTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/MemberGroupTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; @@ -9,7 +10,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.MemberGroup.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.MemberGroup}")] [ApiExplorerSettings(GroupName = "Member Group")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/RootMemberGroupTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/RootMemberGroupTreeController.cs index 8b29471667..0a29610c79 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/RootMemberGroupTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberGroup/Tree/RootMemberGroupTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.MemberGroup.Tree; +[ApiVersion("1.0")] public class RootMemberGroupTreeController : MemberGroupTreeControllerBase { public RootMemberGroupTreeController(IEntityService entityService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/ItemMemberTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/ItemMemberTypeItemController.cs index 560cbb1ac9..a677ab28ba 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/ItemMemberTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/ItemMemberTypeItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.MemberType.Items; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Items; +[ApiVersion("1.0")] public class ItemMemberTypeItemController : MemberTypeItemControllerBase { private readonly IUmbracoMapper _mapper; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/MemberTypeItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/MemberTypeItemControllerBase.cs index 8df306071e..9d4019a598 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/MemberTypeItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Items/MemberTypeItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Items; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.MemberType}")] [ApiExplorerSettings(GroupName = "Member Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/MemberTypeTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/MemberTypeTreeControllerBase.cs index d30de61690..20b905942a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/MemberTypeTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/MemberTypeTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; @@ -9,7 +10,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.MemberType}")] [ApiExplorerSettings(GroupName = "Member Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/RootMemberTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/RootMemberTypeTreeController.cs index 715d5744a9..9d7e6a130b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/RootMemberTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MemberType/Tree/RootMemberTypeTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.MemberType.Tree; +[ApiVersion("1.0")] public class RootMemberTypeTreeController : MemberTypeTreeControllerBase { public RootMemberTypeTreeController(IEntityService entityService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/BuildModelsBuilderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/BuildModelsBuilderController.cs index 4303d6f0bc..b2c7959b1b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/BuildModelsBuilderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/BuildModelsBuilderController.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; @@ -10,6 +11,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.ModelsBuilder; +[ApiVersion("1.0")] public class BuildModelsBuilderController : ModelsBuilderControllerBase { private ModelsBuilderSettings _modelsBuilderSettings; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/GetModelsBuilderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/GetModelsBuilderController.cs index 29778eee64..4e5a1e3931 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/GetModelsBuilderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/GetModelsBuilderController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.ModelsBuilderDashboard; namespace Umbraco.Cms.Api.Management.Controllers.ModelsBuilder; +[ApiVersion("1.0")] public class GetModelsBuilderController : ModelsBuilderControllerBase { private readonly IModelsBuilderPresentationFactory _modelsBuilderPresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/ModelsBuilderControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/ModelsBuilderControllerBase.cs index ca018896ed..a4ff21f515 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/ModelsBuilderControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/ModelsBuilderControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.ModelsBuilder; @@ -6,8 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.ModelsBuilder; [ApiController] [VersionedApiBackOfficeRoute("models-builder")] [ApiExplorerSettings(GroupName = "Models Builder")] -[ApiVersion("1.0")] - public class ModelsBuilderControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/StatusModelsBuilderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/StatusModelsBuilderController.cs index 66248d7547..036dc0f131 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/StatusModelsBuilderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ModelsBuilder/StatusModelsBuilderController.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Infrastructure.ModelsBuilder; @@ -7,6 +8,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.ModelsBuilder; +[ApiVersion("1.0")] public class StatusModelsBuilderController : ModelsBuilderControllerBase { private readonly OutOfDateModelsStatus _outOfDateModelsStatus; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs b/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs index 084dd4d135..5f0d37e7b3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/AllowedObjectTypesController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.RelationType; namespace Umbraco.Cms.Api.Management.Controllers.ObjectTypes; +[ApiVersion("1.0")] public class AllowedObjectTypesController : ObjectTypesControllerBase { private readonly IObjectTypePresentationFactory _objectTypePresentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/ObjectTypesControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/ObjectTypesControllerBase.cs index 6f0a7dd8b5..653a924fbf 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/ObjectTypesControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/ObjectTypes/ObjectTypesControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.ObjectTypes; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.ObjectTypes; [ApiController] [VersionedApiBackOfficeRoute("object-types")] [ApiExplorerSettings(GroupName = "Object Types")] -[ApiVersion("1.0")] public class ObjectTypesControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/AllMigrationStatusPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/AllMigrationStatusPackageController.cs index bb5b51336e..40e2467c6b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/AllMigrationStatusPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/AllMigrationStatusPackageController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -9,6 +10,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.Package; +[ApiVersion("1.0")] public class AllMigrationStatusPackageController : PackageControllerBase { private readonly IPackagingService _packagingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/AllPackageManifestController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/AllPackageManifestController.cs index 588c55879a..dcdd94bfac 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/AllPackageManifestController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/AllPackageManifestController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Package; using Umbraco.Cms.Core.Manifest; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Mapping; namespace Umbraco.Cms.Api.Management.Controllers.Package; +[ApiVersion("1.0")] public class AllPackageManifestController : PackageControllerBase { private readonly IPackageManifestService _packageManifestService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/AllCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/AllCreatedPackageController.cs index fffe6a6dff..f3c3080422 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/AllCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/AllCreatedPackageController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -9,6 +10,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.Package.Created; +[ApiVersion("1.0")] public class AllCreatedPackageController : CreatedPackageControllerBase { private readonly IPackagingService _packagingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/ByKeyCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/ByKeyCreatedPackageController.cs index 24cd1601e1..76c741e755 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/ByKeyCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/ByKeyCreatedPackageController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Package; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Package.Created; +[ApiVersion("1.0")] public class ByKeyCreatedPackageController : CreatedPackageControllerBase { private readonly IPackagingService _packagingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/CreateCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/CreateCreatedPackageController.cs index acf998b94f..af0689876f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/CreateCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/CreateCreatedPackageController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Package.Created; +[ApiVersion("1.0")] public class CreateCreatedPackageController : CreatedPackageControllerBase { private readonly IPackagingService _packagingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/CreatedPackageControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/CreatedPackageControllerBase.cs index a1d9bd9cd9..5153f07216 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/CreatedPackageControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/CreatedPackageControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Package.Created; [ApiController] [VersionedApiBackOfficeRoute("package/created")] [ApiExplorerSettings(GroupName = "Package")] -[ApiVersion("1.0")] public class CreatedPackageControllerBase : PackageControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DeleteCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DeleteCreatedPackageController.cs index 414d571541..f197a2d68c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DeleteCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DeleteCreatedPackageController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Package.Created; +[ApiVersion("1.0")] public class DeleteCreatedPackageController : CreatedPackageControllerBase { private readonly IPackagingService _packagingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DownloadCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DownloadCreatedPackageController.cs index 3393623d13..215c1fae5c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DownloadCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/DownloadCreatedPackageController.cs @@ -1,6 +1,7 @@ using System.Net; using System.Net.Mime; using System.Text; +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Net.Http.Headers; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Package.Created; +[ApiVersion("1.0")] public class DownloadCreatedPackageController : CreatedPackageControllerBase { private readonly IPackagingService _packagingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/UpdateCreatedPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/UpdateCreatedPackageController.cs index 613f6d1d24..39ea11b027 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/UpdateCreatedPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/Created/UpdateCreatedPackageController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Package; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Package.Created; +[ApiVersion("1.0")] public class UpdateCreatedPackageController : CreatedPackageControllerBase { private readonly IPackagingService _packagingService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/PackageControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/PackageControllerBase.cs index 0ec683d7b3..93e16c6ee1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/PackageControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/PackageControllerBase.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; @@ -9,7 +10,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Package; [ApiController] [VersionedApiBackOfficeRoute("package")] [ApiExplorerSettings(GroupName = "Package")] -[ApiVersion("1.0")] public abstract class PackageControllerBase : ManagementApiControllerBase { protected IActionResult PackageOperationStatusResult(PackageOperationStatus status) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Package/RunMigrationPackageController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Package/RunMigrationPackageController.cs index 1c3fc6fd31..740fd351ad 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Package/RunMigrationPackageController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Package/RunMigrationPackageController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; @@ -6,6 +7,7 @@ using Umbraco.Cms.Infrastructure.Install; namespace Umbraco.Cms.Api.Management.Controllers.Package; +[ApiVersion("1.0")] public class RunMigrationPackageController : PackageControllerBase { private readonly PackageMigrationRunner _packageMigrationRunner; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/ByPathPartialViewController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/ByPathPartialViewController.cs index 6e51d1bf95..c00eb46ecd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/ByPathPartialViewController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/ByPathPartialViewController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.PartialView; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.PartialView; +[ApiVersion("1.0")] public class ByPathPartialViewController : PartialViewControllerBase { private readonly IPartialViewService _partialViewService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/CreatePartialViewController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/CreatePartialViewController.cs index c72c9aa0c7..ac5267b8f3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/CreatePartialViewController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/CreatePartialViewController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.PartialView; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.PartialView; +[ApiVersion("1.0")] public class CreatePartialViewController : PartialViewControllerBase { private readonly IUmbracoMapper _umbracoMapper; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/DeletePartialViewController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/DeletePartialViewController.cs index 47d2bbc4de..96c194137b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/DeletePartialViewController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/DeletePartialViewController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.PartialView; +[ApiVersion("1.0")] public class DeletePartialViewController : PartialViewControllerBase { private readonly IPartialViewService _partialViewService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/ByPathPartialViewFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/ByPathPartialViewFolderController.cs index 58cf73eb70..d3271158b3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/ByPathPartialViewFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/ByPathPartialViewFolderController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Folder; +[ApiVersion("1.0")] public class ByPathPartialViewFolderController : PartialViewFolderControllerBase { public ByPathPartialViewFolderController(IUmbracoMapper mapper, IPartialViewFolderService partialViewFolderService) : base(mapper, partialViewFolderService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/CreatePartialViewFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/CreatePartialViewFolderController.cs index 73f2f32c82..07706351b1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/CreatePartialViewFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/CreatePartialViewFolderController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Folder; using Umbraco.Cms.Core.Mapping; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Folder; +[ApiVersion("1.0")] public class CreatePartialViewFolderController : PartialViewFolderControllerBase { public CreatePartialViewFolderController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/DeletePartialViewFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/DeletePartialViewFolderController.cs index 8b7b8d54e8..3d933ac6e1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/DeletePartialViewFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/DeletePartialViewFolderController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Folder; +[ApiVersion("1.0")] public class DeletePartialViewFolderController : PartialViewFolderControllerBase { public DeletePartialViewFolderController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/PartialViewFolderBaseController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/PartialViewFolderControllerBase.cs similarity index 98% rename from src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/PartialViewFolderBaseController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/PartialViewFolderControllerBase.cs index a5539dab94..8b032c7ede 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/PartialViewFolderBaseController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Folder/PartialViewFolderControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -10,7 +11,6 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Folder; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.PartialView}/folder")] [ApiExplorerSettings(GroupName = "Partial View")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Items/ItemPartialViewItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Items/ItemPartialViewItemController.cs index 9b0f494f69..49ffd5cb45 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Items/ItemPartialViewItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Items/ItemPartialViewItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.PartialView.Item; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.IO; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Items; +[ApiVersion("1.0")] public class ItemPartialViewItemController : PartialViewItemControllerBase { private readonly IFileItemPresentationModelFactory _fileItemPresentationModelFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Items/PartialViewItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Items/PartialViewItemControllerBase.cs index 82b748b7bd..9750548305 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Items/PartialViewItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Items/PartialViewItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Items; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.PartialView}")] [ApiExplorerSettings(GroupName = "Partial View")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/PartialViewControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/PartialViewControllerBase.cs index 1c46734d87..f4a7e82800 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/PartialViewControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/PartialViewControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -7,7 +8,6 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.PartialView; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.PartialView}")] [ApiExplorerSettings(GroupName = "Partial View")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Snippet/ByNameController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Snippet/ByNameController.cs index 82489af1df..e7864bdef6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Snippet/ByNameController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Snippet/ByNameController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.PartialView.Snippets; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Snippets; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Snippet; +[ApiVersion("1.0")] public class ByNameController : PartialViewControllerBase { private readonly IPartialViewService _partialViewService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Snippet/GetAllController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Snippet/GetAllController.cs index e937157db2..9785ab1d44 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Snippet/GetAllController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Snippet/GetAllController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.ViewModels.PartialView.Snippets; @@ -7,6 +8,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Snippet; +[ApiVersion("1.0")] public class GetAllController : PartialViewControllerBase { private readonly IPartialViewService _partialViewService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs index f1ee2a2c43..cf723744d9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/ChildrenPartialViewTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree; +[ApiVersion("1.0")] public class ChildrenPartialViewTreeController : PartialViewTreeControllerBase { public ChildrenPartialViewTreeController(FileSystems fileSystems) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs index 45fef6eb7f..09687a134a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/PartialViewTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Management.Controllers.Tree; @@ -6,7 +7,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.PartialView}")] [ApiExplorerSettings(GroupName = "Partial View")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs index 36a8862c69..4fc61e878b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/Tree/RootPartialViewTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.PartialView.Tree; +[ApiVersion("1.0")] public class RootPartialViewTreeController : PartialViewTreeControllerBase { public RootPartialViewTreeController(FileSystems fileSystems) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/UpdatePartialViewController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/UpdatePartialViewController.cs index fdbbeab878..6731e2d466 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PartialView/UpdatePartialViewController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PartialView/UpdatePartialViewController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.PartialView; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.PartialView; +[ApiVersion("1.0")] public class UpdatePartialViewController : PartialViewControllerBase { private readonly IPartialViewService _partialViewService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Profiling/GetStatusProfilingController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Profiling/GetStatusProfilingController.cs index 016fa08d9a..b69ed72c20 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Profiling/GetStatusProfilingController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Profiling/GetStatusProfilingController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Profiling; using Umbraco.Cms.Core; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Profiling; +[ApiVersion("1.0")] public class GetStatusProfilingController : ProfilingControllerBase { private readonly IWebProfilerService _webProfilerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Profiling/ProfilingControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Profiling/ProfilingControllerBase.cs index 49be02c341..99c5d2c790 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Profiling/ProfilingControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Profiling/ProfilingControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -6,7 +7,6 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Profiling; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute("profiling")] [ApiExplorerSettings(GroupName = "Profiling")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Profiling/UpdateStatusProfilingController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Profiling/UpdateStatusProfilingController.cs index bbf405db18..6e91e1f3ac 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Profiling/UpdateStatusProfilingController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Profiling/UpdateStatusProfilingController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Profiling; using Umbraco.Cms.Core; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Profiling; +[ApiVersion("1.0")] public class UpdateStatusProfilingController : ProfilingControllerBase { private readonly IWebProfilerService _webProfilerService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PropertyType/IsUsedPropertyTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PropertyType/IsUsedPropertyTypeController.cs index e09d3ebf93..ba4427e30d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PropertyType/IsUsedPropertyTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PropertyType/IsUsedPropertyTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Core; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.PropertyType; +[ApiVersion("1.0")] public class IsUsedPropertyTypeController : PropertyTypeControllerBase { private readonly IPropertyTypeUsageService _propertyTypeUsageService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PropertyType/PropertyTypeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/PropertyType/PropertyTypeControllerBase.cs index e003b039b9..3305b51f39 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PropertyType/PropertyTypeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PropertyType/PropertyTypeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core.Services.OperationStatus; @@ -8,7 +9,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.PropertyType; [ApiController] [VersionedApiBackOfficeRoute("property-type")] [ApiExplorerSettings(GroupName = "Property Type")] -[ApiVersion("1.0")] public abstract class PropertyTypeControllerBase : ManagementApiControllerBase { protected IActionResult PropertyTypeOperationStatusResult(PropertyTypeOperationStatus status) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/CollectPublishedCacheController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/CollectPublishedCacheController.cs index eecb495f7a..db1cc57988 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/CollectPublishedCacheController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/CollectPublishedCacheController.cs @@ -1,9 +1,11 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.PublishedCache; namespace Umbraco.Cms.Api.Management.Controllers.PublishedCache; +[ApiVersion("1.0")] public class CollectPublishedCacheController : PublishedCacheControllerBase { private readonly IPublishedSnapshotService _publishedSnapshotService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/PublishedCacheControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/PublishedCacheControllerBase.cs index aa8db8b316..5ec43cc9e3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/PublishedCacheControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/PublishedCacheControllerBase.cs @@ -1,9 +1,9 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.PublishedCache; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute("published-cache")] [ApiExplorerSettings(GroupName = "Published Cache")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/RebuildPublishedCacheController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/RebuildPublishedCacheController.cs index c7742b567f..2772beefd4 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/RebuildPublishedCacheController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/RebuildPublishedCacheController.cs @@ -1,9 +1,11 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.PublishedCache; namespace Umbraco.Cms.Api.Management.Controllers.PublishedCache; +[ApiVersion("1.0")] public class RebuildPublishedCacheController : PublishedCacheControllerBase { private readonly IPublishedSnapshotService _publishedSnapshotService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/ReloadPublishedCacheController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/ReloadPublishedCacheController.cs index 36c36a64b7..d3defdcce6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/ReloadPublishedCacheController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/ReloadPublishedCacheController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Cache; using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.PublishedCache; +[ApiVersion("1.0")] public class ReloadPublishedCacheController : PublishedCacheControllerBase { private readonly DistributedCache _distributedCache; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/StatusPublishedCacheController.cs b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/StatusPublishedCacheController.cs index ba24605f79..8cd308171c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/StatusPublishedCacheController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/PublishedCache/StatusPublishedCacheController.cs @@ -1,9 +1,11 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.PublishedCache; namespace Umbraco.Cms.Api.Management.Controllers.PublishedCache; +[ApiVersion("1.0")] public class StatusPublishedCacheController : PublishedCacheControllerBase { private readonly IPublishedSnapshotStatus _publishedSnapshotStatus; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/ByKeyRedirectUrlManagementController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/ByKeyRedirectUrlManagementController.cs index daf5395433..0a05ee1915 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/ByKeyRedirectUrlManagementController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/ByKeyRedirectUrlManagementController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -8,7 +9,8 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.RedirectUrlManagement; -public class ByKeyRedirectUrlManagementController : RedirectUrlManagementBaseController +[ApiVersion("1.0")] +public class ByKeyRedirectUrlManagementController : RedirectUrlManagementControllerBase { private readonly IRedirectUrlService _redirectUrlService; private readonly IRedirectUrlPresentationFactory _redirectUrlPresentationFactory; @@ -21,6 +23,7 @@ public class ByKeyRedirectUrlManagementController : RedirectUrlManagementBaseCon _redirectUrlPresentationFactory = redirectUrlPresentationFactory; } + [MapToApiVersion("1.0")] [HttpGet("{id:guid}")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] public Task>> ByKey(Guid id, int skip, int take) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/DeleteByKeyRedirectUrlManagementController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/DeleteByKeyRedirectUrlManagementController.cs index 5b36bb6196..fae25a6174 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/DeleteByKeyRedirectUrlManagementController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/DeleteByKeyRedirectUrlManagementController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.RedirectUrlManagement; -public class DeleteByKeyRedirectUrlManagementController : RedirectUrlManagementBaseController +[ApiVersion("1.0")] +public class DeleteByKeyRedirectUrlManagementController : RedirectUrlManagementControllerBase { private readonly IRedirectUrlService _redirectUrlService; @@ -13,6 +15,7 @@ public class DeleteByKeyRedirectUrlManagementController : RedirectUrlManagementB _redirectUrlService = redirectUrlService; } + [MapToApiVersion("1.0")] [HttpDelete("{id:guid}")] [ProducesResponseType(StatusCodes.Status200OK)] public async Task DeleteByKey(Guid id) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/GetAllRedirectUrlManagementController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/GetAllRedirectUrlManagementController.cs index 6e0c571ad1..27271ba793 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/GetAllRedirectUrlManagementController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/GetAllRedirectUrlManagementController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -9,7 +10,8 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.RedirectUrlManagement; -public class GetAllRedirectUrlManagementController : RedirectUrlManagementBaseController +[ApiVersion("1.0")] +public class GetAllRedirectUrlManagementController : RedirectUrlManagementControllerBase { private readonly IRedirectUrlService _redirectUrlService; private readonly IRedirectUrlPresentationFactory _redirectUrlPresentationFactory; @@ -22,6 +24,7 @@ public class GetAllRedirectUrlManagementController : RedirectUrlManagementBaseCo _redirectUrlPresentationFactory = redirectUrlPresentationFactory; } + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/GetStatusRedirectUrlManagementController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/GetStatusRedirectUrlManagementController.cs index b25b57e7fd..6de61bb852 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/GetStatusRedirectUrlManagementController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/GetStatusRedirectUrlManagementController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.RedirectUrlManagement; namespace Umbraco.Cms.Api.Management.Controllers.RedirectUrlManagement; -public class GetStatusRedirectUrlManagementController : RedirectUrlManagementBaseController +[ApiVersion("1.0")] +public class GetStatusRedirectUrlManagementController : RedirectUrlManagementControllerBase { private readonly IRedirectUrlStatusPresentationFactory _redirectUrlStatusPresentationFactory; @@ -12,6 +14,7 @@ public class GetStatusRedirectUrlManagementController : RedirectUrlManagementBas IRedirectUrlStatusPresentationFactory redirectUrlStatusPresentationFactory) => _redirectUrlStatusPresentationFactory = redirectUrlStatusPresentationFactory; + [MapToApiVersion("1.0")] [HttpGet("status")] [ProducesResponseType(typeof(RedirectUrlStatusResponseModel), 200)] public Task> GetStatus() => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/RedirectUrlManagementBaseController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/RedirectUrlManagementControllerBase.cs similarity index 68% rename from src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/RedirectUrlManagementBaseController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/RedirectUrlManagementControllerBase.cs index 0c8cc74822..90baba3cb3 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/RedirectUrlManagementBaseController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/RedirectUrlManagementControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.RedirectUrlManagement; @@ -6,8 +7,7 @@ namespace Umbraco.Cms.Api.Management.Controllers.RedirectUrlManagement; [ApiController] [VersionedApiBackOfficeRoute("redirect-management")] [ApiExplorerSettings(GroupName = "Redirect Management")] -[ApiVersion("1.0")] -public class RedirectUrlManagementBaseController : ManagementApiControllerBase +public class RedirectUrlManagementControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/SetStatusRedirectUrlManagementController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/SetStatusRedirectUrlManagementController.cs index d51e91a08d..54237f272f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/SetStatusRedirectUrlManagementController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RedirectUrlManagement/SetStatusRedirectUrlManagementController.cs @@ -1,11 +1,13 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Core.Security; using Umbraco.New.Cms.Core.Models.RedirectUrlManagement; namespace Umbraco.Cms.Api.Management.Controllers.RedirectUrlManagement; -public class SetStatusRedirectUrlManagementController : RedirectUrlManagementBaseController +[ApiVersion("1.0")] +public class SetStatusRedirectUrlManagementController : RedirectUrlManagementControllerBase { private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor; private readonly IConfigManipulator _configManipulator; @@ -22,6 +24,7 @@ public class SetStatusRedirectUrlManagementController : RedirectUrlManagementBas // We generally don't want to edit the appsettings from our code. // But maybe there is a valid use case for doing it on the fly. [HttpPost("status")] + [MapToApiVersion("1.0")] public async Task SetStatus([FromQuery] RedirectStatus status) { // TODO: uncomment this when auth is implemented. diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByChildRelationController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByChildRelationController.cs index 49a0032bfc..6e5b65b3fd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByChildRelationController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByChildRelationController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; @@ -9,6 +10,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.Relation; +[ApiVersion("1.0")] public class ByChildRelationController : RelationControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByIdRelationController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByIdRelationController.cs index a56986932c..4622d86160 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByIdRelationController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByIdRelationController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; @@ -7,6 +8,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Relation; namespace Umbraco.Cms.Api.Management.Controllers.Relation; +[ApiVersion("1.0")] public class ByIdRelationController : RelationControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs index 60b0cebcfd..11167a72f1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Relation/ByRelationTypeKeyRelationController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -11,6 +12,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.Relation; +[ApiVersion("1.0")] public class ByRelationTypeKeyRelationController : RelationControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Relation/RelationControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Relation/RelationControllerBase.cs index 702c3af7c9..db12dd9406 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Relation/RelationControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Relation/RelationControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core.Services.OperationStatus; @@ -8,7 +9,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Relation; [ApiController] [VersionedApiBackOfficeRoute("relation")] [ApiExplorerSettings(GroupName = "Relation")] -[ApiVersion("1.0")] // TODO: Implement Authentication public abstract class RelationControllerBase : ManagementApiControllerBase { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/ItemRelationTypeItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/ItemRelationTypeItemController.cs index cbb339ea19..93bb86f0ba 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/ItemRelationTypeItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/ItemRelationTypeItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.RelationType.Item; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Item; +[ApiVersion("1.0")] public class ItemRelationTypeItemController : RelationTypeItemControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/RelationTypeItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/RelationTypeItemControllerBase.cs index a28c187c23..43afafd1d6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/RelationTypeItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Item/RelationTypeItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.RelationType}")] [ApiExplorerSettings(GroupName = "Relation Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/ByKeyRelationTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/ByKeyRelationTypeController.cs index 451dd708dd..06fb21509d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/ByKeyRelationTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/ByKeyRelationTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.RelationType; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Query; +[ApiVersion("1.0")] public class ByKeyRelationTypeController : RelationTypeControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/CreateRelationTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/CreateRelationTypeController.cs index 5a194af6d0..a12896b3aa 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/CreateRelationTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/CreateRelationTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.RelationType; @@ -8,9 +9,9 @@ using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; - namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Query; +[ApiVersion("1.0")] public class CreateRelationTypeController : RelationTypeControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/DeleteRelationTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/DeleteRelationTypeController.cs index 43ee789ebf..5165fe2fe2 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/DeleteRelationTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/DeleteRelationTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Query; +[ApiVersion("1.0")] public class DeleteRelationTypeController : RelationTypeControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/RelationTypeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/RelationTypeControllerBase.cs index 0931a2b6b8..aba0df4aa2 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/RelationTypeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/RelationTypeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; @@ -9,7 +10,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Query; [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.RelationType}")] [ApiExplorerSettings(GroupName = "Relation Type")] -[ApiVersion("1.0")] public class RelationTypeControllerBase : ManagementApiControllerBase { protected IActionResult RelationTypeOperationStatusResult(RelationTypeOperationStatus status) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/UpdateRelationTypeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/UpdateRelationTypeController.cs index f0873d4534..1a9e7721e8 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/UpdateRelationTypeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Query/UpdateRelationTypeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Factories; @@ -11,6 +12,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Query; +[ApiVersion("1.0")] public class UpdateRelationTypeController : RelationTypeControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs index f540a8c7a0..b1527293dd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RelationTypeTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; @@ -8,7 +9,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.RelationType}")] [ApiExplorerSettings(GroupName = "Relation Type")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RootRelationTypeTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RootRelationTypeTreeController.cs index 9f9212ab4d..122e71faa1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RootRelationTypeTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/RelationType/Tree/RootRelationTypeTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; @@ -8,6 +9,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.RelationType.Tree; +[ApiVersion("1.0")] public class RootRelationTypeTreeController : RelationTypeTreeControllerBase { private readonly IRelationService _relationService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/ByPathScriptController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/ByPathScriptController.cs index 4a6b018314..f788b3aaa8 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/ByPathScriptController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/ByPathScriptController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Script; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Script; +[ApiVersion("1.0")] public class ByPathScriptController : ScriptControllerBase { private readonly IScriptService _scriptService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/CreateScriptController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/CreateScriptController.cs index 3c7a94ce46..8d68f2d72a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/CreateScriptController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/CreateScriptController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Script; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Script; +[ApiVersion("1.0")] public class CreateScriptController : ScriptControllerBase { private readonly IScriptService _scriptService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/DeleteScriptController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/DeleteScriptController.cs index d98a4d5a25..e984341843 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/DeleteScriptController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/DeleteScriptController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Script; +[ApiVersion("1.0")] public class DeleteScriptController : ScriptControllerBase { private readonly IScriptService _scriptService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/ByPathScriptFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/ByPathScriptFolderController.cs index fea03112cc..1e7e4dbb86 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/ByPathScriptFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/ByPathScriptFolderController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Script.Folder; +[ApiVersion("1.0")] public class ByPathScriptFolderController : ScriptFolderControllerBase { public ByPathScriptFolderController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/CreateScriptFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/CreateScriptFolderController.cs index 37720ad187..9ce91c1c03 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/CreateScriptFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/CreateScriptFolderController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Folder; using Umbraco.Cms.Core.Mapping; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Script.Folder; +[ApiVersion("1.0")] public class CreateScriptFolderController : ScriptFolderControllerBase { public CreateScriptFolderController( diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/DeleteScriptFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/DeleteScriptFolderController.cs index 1b78471587..17d670abae 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/DeleteScriptFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/DeleteScriptFolderController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Script.Folder; +[ApiVersion("1.0")] public class DeleteScriptFolderController : ScriptFolderControllerBase { public DeleteScriptFolderController(IUmbracoMapper mapper, IScriptFolderService scriptFolderService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/ScriptFolderControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/ScriptFolderControllerBase.cs index 7981112b6e..6a046c9a06 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/ScriptFolderControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Folder/ScriptFolderControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -10,7 +11,6 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Script.Folder; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Script}/folder")] [ApiExplorerSettings(GroupName = "Script")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs index 53ee5ec43a..4b426b3369 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ItemScriptItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Script.Item; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.IO; namespace Umbraco.Cms.Api.Management.Controllers.Script.Item; +[ApiVersion("1.0")] public class ItemScriptItemController : ScriptItemControllerBase { private readonly IFileSystem _fileSystem; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ScriptItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ScriptItemControllerBase.cs index a7a8be3d9e..47aa5c4a91 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ScriptItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Item/ScriptItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.Script.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Script}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Script))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/ScriptControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/ScriptControllerBase.cs index a82db8ba8c..8e0bfe941b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/ScriptControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/ScriptControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -7,7 +8,6 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Script; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Script}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Script))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs index d2a21e303e..320ac3d652 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ChildrenScriptTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree; +[ApiVersion("1.0")] public class ChildrenScriptTreeController : ScriptTreeControllerBase { public ChildrenScriptTreeController(FileSystems fileSystems) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs index 011b8277e9..41126b477b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/RootScriptTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree; +[ApiVersion("1.0")] public class RootScriptTreeController : ScriptTreeControllerBase { public RootScriptTreeController(FileSystems fileSystems) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs index d5206e1734..bcd4085296 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/Tree/ScriptTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Management.Controllers.Tree; @@ -6,7 +7,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Script.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Script}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Script))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Script/UpdateScriptController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Script/UpdateScriptController.cs index ecd5541852..3f2b475420 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Script/UpdateScriptController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Script/UpdateScriptController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Script; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Script; +[ApiVersion("1.0")] public class UpdateScriptController : ScriptControllerBase { private readonly IScriptService _scriptService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs index f35810c92b..2bc382518a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs @@ -1,4 +1,5 @@ -using Examine; +using Asp.Versioning; +using Examine; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/QuerySearcherController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/QuerySearcherController.cs index d30e309563..293a719439 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/QuerySearcherController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/QuerySearcherController.cs @@ -1,4 +1,5 @@ -using Examine; +using Asp.Versioning; +using Examine; using Examine.Search; using Lucene.Net.QueryParsers.Classic; using Microsoft.AspNetCore.Http; @@ -17,7 +18,7 @@ public class QuerySearcherController : SearcherControllerBase public QuerySearcherController(IExamineManagerService examineManagerService) => _examineManagerService = examineManagerService; - [HttpGet("{searcherName}/query")] + [Microsoft.AspNetCore.Mvc.HttpGet("{searcherName}/query")] [MapToApiVersion("1.0")] [ProducesResponseType(typeof(PagedViewModel), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeController.cs index 89ee1fd625..9797d0f62d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Security/BackOfficeController.cs @@ -1,4 +1,5 @@ using System.Security.Claims; +using Asp.Versioning; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; @@ -18,6 +19,7 @@ using IdentitySignInResult = Microsoft.AspNetCore.Identity.SignInResult; namespace Umbraco.Cms.Api.Management.Controllers.Security; +[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute(Paths.BackOfficeApiEndpointTemplate)] [ApiExplorerSettings(GroupName = "Security")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Server/StatusServerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Server/StatusServerController.cs index 3af285a180..47e4d424ee 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Server/StatusServerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Server/StatusServerController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Management.ViewModels.Server; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Server/VersionServerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Server/VersionServerController.cs index e075bf7e50..41efed5a5d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Server/VersionServerController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Server/VersionServerController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Configuration; using Umbraco.Cms.Api.Management.ViewModels.Server; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs index 7f42022488..9c2da6583b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/ItemStaticFileItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.StaticFile.Item; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.IO; namespace Umbraco.Cms.Api.Management.Controllers.StaticFile.Item; +[ApiVersion("1.0")] public class ItemStaticFileItemController : StaticFileItemControllerBase { private readonly IFileItemPresentationModelFactory _presentationModelFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/StaticFileItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/StaticFileItemControllerBase.cs index 3ee012c1a2..cd1f712925 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/StaticFileItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Item/StaticFileItemControllerBase.cs @@ -1,9 +1,9 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.StaticFile.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute("static-file")] [ApiExplorerSettings(GroupName = "Static File")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/ChildrenStaticFileTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/ChildrenStaticFileTreeController.cs index 6dc90d6ff2..5e932c7951 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/ChildrenStaticFileTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/ChildrenStaticFileTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.StaticFile.Tree; +[ApiVersion("1.0")] public class ChildrenStaticFileTreeController : StaticFileTreeControllerBase { public ChildrenStaticFileTreeController(IPhysicalFileSystem physicalFileSystem) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/RootStaticFileTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/RootStaticFileTreeController.cs index b8a50c941c..adb35a3015 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/RootStaticFileTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/RootStaticFileTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.StaticFile.Tree; +[ApiVersion("1.0")] public class RootStaticFileTreeController : StaticFileTreeControllerBase { public RootStaticFileTreeController(IPhysicalFileSystem physicalFileSystem) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/StaticFileTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/StaticFileTreeControllerBase.cs index aed2042255..41bda81364 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/StaticFileTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/StaticFile/Tree/StaticFileTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Management.Controllers.Tree; @@ -6,7 +7,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.StaticFile.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/static-file")] [ApiExplorerSettings(GroupName = "Static File")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/AllStylesheetController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/AllStylesheetController.cs index 42187fd4b6..2f672f2583 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/AllStylesheetController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/AllStylesheetController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.ViewModels.Stylesheet; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; +[ApiVersion("1.0")] public class AllStylesheetController : StylesheetControllerBase { private readonly IStylesheetService _stylesheetService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/ByPathStylesheetController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/ByPathStylesheetController.cs index 2a98c2dc22..9d21b046d1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/ByPathStylesheetController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/ByPathStylesheetController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Stylesheet; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; +[ApiVersion("1.0")] public class ByPathStylesheetController : StylesheetControllerBase { private readonly IStylesheetService _stylesheetService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/CreateStylesheetController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/CreateStylesheetController.cs index a31bf7ac12..22c6c20f7a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/CreateStylesheetController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/CreateStylesheetController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Stylesheet; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; +[ApiVersion("1.0")] public class CreateStylesheetController : StylesheetControllerBase { private readonly IStylesheetService _stylesheetService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/DeleteStylesheetController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/DeleteStylesheetController.cs index 6d55819be2..f09659962b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/DeleteStylesheetController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/DeleteStylesheetController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Security; using Umbraco.Cms.Core.Services; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; +[ApiVersion("1.0")] public class DeleteStylesheetController : StylesheetControllerBase { private readonly IStylesheetService _stylesheetService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/ExtractRichTextRulesController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/ExtractRichTextRulesController.cs index 967e95b24d..09b264e94a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/ExtractRichTextRulesController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/ExtractRichTextRulesController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.RichTextStylesheet; using Umbraco.Cms.Core.Mapping; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Strings.Css; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; +[ApiVersion("1.0")] public class ExtractRichTextRulesController : StylesheetControllerBase { private readonly IRichTextStylesheetService _richTextStylesheetService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/ByPathStylesheetFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/ByPathStylesheetFolderController.cs index 789a844f8c..2bbb2c7689 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/ByPathStylesheetFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/ByPathStylesheetFolderController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Folder; +[ApiVersion("1.0")] public class ByPathStylesheetFolderController : StylesheetFolderControllerBase { public ByPathStylesheetFolderController(IUmbracoMapper mapper, IStylesheetFolderService stylesheetFolderService) : base(mapper, stylesheetFolderService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/CreateStylesheetFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/CreateStylesheetFolderController.cs index dd97b3f0c7..3a25ba2aba 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/CreateStylesheetFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/CreateStylesheetFolderController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Folder; using Umbraco.Cms.Core.Mapping; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Folder; +[ApiVersion("1.0")] public class CreateStylesheetFolderController : StylesheetFolderControllerBase { public CreateStylesheetFolderController(IUmbracoMapper mapper, IStylesheetFolderService stylesheetFolderService) : base(mapper, stylesheetFolderService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/DeleteStylesheetFolderController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/DeleteStylesheetFolderController.cs index d5d0107606..313bedbea1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/DeleteStylesheetFolderController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/DeleteStylesheetFolderController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Folder; +[ApiVersion("1.0")] public class DeleteStylesheetFolderController : StylesheetFolderControllerBase { public DeleteStylesheetFolderController(IUmbracoMapper mapper, IStylesheetFolderService stylesheetFolderService) : base(mapper, stylesheetFolderService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/StylesheetFolderControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/StylesheetFolderControllerBase.cs index 943de371e9..2568ceea1f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/StylesheetFolderControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Folder/StylesheetFolderControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -10,7 +11,6 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Folder; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Stylesheet}/folder")] [ApiExplorerSettings(GroupName = "Stylesheet")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/GetRichTextRulesByPath.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/GetRichTextRulesByPath.cs index 3df24e7652..de0904fd4d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/GetRichTextRulesByPath.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/GetRichTextRulesByPath.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.RichTextStylesheet; using Umbraco.Cms.Core; @@ -9,6 +10,7 @@ using StylesheetRule = Umbraco.Cms.Core.Strings.Css.StylesheetRule; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; +[ApiVersion("1.0")] public class GetRichTextRulesByPath : StylesheetControllerBase { private readonly IRichTextStylesheetService _richTextStylesheetService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/InterpolateRichTextRulesController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/InterpolateRichTextRulesController.cs index ce8f0077d2..711ede81d1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/InterpolateRichTextRulesController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/InterpolateRichTextRulesController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.RichTextStylesheet; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; +[ApiVersion("1.0")] public class InterpolateRichTextRulesController : StylesheetControllerBase { private readonly IRichTextStylesheetService _richTextStylesheetService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs index 73170f99fc..19b9bf5d39 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/ItemStylesheetItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.Script.Item; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.IO; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Item; +[ApiVersion("1.0")] public class ItemStylesheetItemController : StylesheetItemControllerBase { private readonly IFileItemPresentationModelFactory _fileItemPresentationModelFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/StylesheetItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/StylesheetItemControllerBase.cs index 6727c9bcc2..764f653bed 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/StylesheetItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Item/StylesheetItemControllerBase.cs @@ -1,10 +1,10 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Stylesheet}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Stylesheet))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/StylesheetControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/StylesheetControllerBase.cs index 8d5b6bd47f..0b600ec830 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/StylesheetControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/StylesheetControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -7,7 +8,6 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Stylesheet}")] [ApiExplorerSettings(GroupName = "Stylesheet")] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs index 7f539b4f60..b986e83c2c 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/ChildrenStylesheetTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree; +[ApiVersion("1.0")] public class ChildrenStylesheetTreeController : StylesheetTreeControllerBase { public ChildrenStylesheetTreeController(FileSystems fileSystems) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs index 17082e0f79..f5474651d4 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/RootStylesheetTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree; +[ApiVersion("1.0")] public class RootStylesheetTreeController : StylesheetTreeControllerBase { public RootStylesheetTreeController(FileSystems fileSystems) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs index 905d31bb1f..824ee1894d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/Tree/StylesheetTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.IO; using Umbraco.Cms.Api.Management.Controllers.Tree; @@ -6,7 +7,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Stylesheet}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Stylesheet))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/UpdateStylesheetController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/UpdateStylesheetController.cs index 4c6157ccd7..114b03a1a7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/UpdateStylesheetController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Stylesheet/UpdateStylesheetController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Stylesheet; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Stylesheet; +[ApiVersion("1.0")] public class UpdateStylesheetController : StylesheetControllerBase { private readonly IStylesheetService _stylesheetService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tag/ByQueryTagController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tag/ByQueryTagController.cs index 924397447e..97eea89ec6 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Tag/ByQueryTagController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Tag/ByQueryTagController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.ViewModels.Tag; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Tag; +[ApiVersion("1.0")] public class ByQueryTagController : TagControllerBase { private readonly ITagService _tagService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Tag/TagControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Tag/TagControllerBase.cs index b5a5b0ffe4..86ae45ea70 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Tag/TagControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Tag/TagControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Tag; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Tag; [ApiController] [VersionedApiBackOfficeRoute("tag")] [ApiExplorerSettings(GroupName = "Tag")] -[ApiVersion("1.0")] public class TagControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/AllTelemetryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/AllTelemetryController.cs index 34d7280f01..d12f7078dc 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/AllTelemetryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/AllTelemetryController.cs @@ -1,3 +1,4 @@ +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Models; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Telemetry; namespace Umbraco.Cms.Api.Management.Controllers.Telemetry; +[ApiVersion("1.0")] public class AllTelemetryController : TelemetryControllerBase { [HttpGet] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/GetTelemetryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/GetTelemetryController.cs index dd98928976..16014b66ec 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/GetTelemetryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/GetTelemetryController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Management.ViewModels.Telemetry; namespace Umbraco.Cms.Api.Management.Controllers.Telemetry; +[ApiVersion("1.0")] public class GetTelemetryController : TelemetryControllerBase { private readonly IMetricsConsentService _metricsConsentService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/SetTelemetryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/SetTelemetryController.cs index d746271af2..d61133f60e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/SetTelemetryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/SetTelemetryController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Management.ViewModels.Telemetry; namespace Umbraco.Cms.Api.Management.Controllers.Telemetry; +[ApiVersion("1.0")] public class SetTelemetryController : TelemetryControllerBase { private readonly IMetricsConsentService _metricsConsentService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/TelemetryControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/TelemetryControllerBase.cs index bb65bf1b85..5791470433 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/TelemetryControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Telemetry/TelemetryControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Telemetry; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Telemetry; [ApiController] [VersionedApiBackOfficeRoute("telemetry")] [ApiExplorerSettings(GroupName = "Telemetry")] -[ApiVersion("1.0")] public abstract class TelemetryControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/ByKeyTemplateController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/ByKeyTemplateController.cs index 828480ff98..b0334fd051 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/ByKeyTemplateController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/ByKeyTemplateController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Template; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Template; +[ApiVersion("1.0")] public class ByKeyTemplateController : TemplateControllerBase { private readonly ITemplateService _templateService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/CreateTemplateController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/CreateTemplateController.cs index 81bb0ca59a..d0070725f4 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/CreateTemplateController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/CreateTemplateController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Template; using Umbraco.Cms.Core; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Template; +[ApiVersion("1.0")] public class CreateTemplateController : TemplateControllerBase { private readonly ITemplateService _templateService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/DeleteTemplateController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/DeleteTemplateController.cs index 2e1f5efff8..0af5b61aee 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/DeleteTemplateController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/DeleteTemplateController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Template; +[ApiVersion("1.0")] public class DeleteTemplateController : TemplateControllerBase { private readonly ITemplateService _templateService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Item/ItemTemplateItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Item/ItemTemplateItemController.cs index 46401c9d40..e6abca829f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Item/ItemTemplateItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Item/ItemTemplateItemController.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.MediaType.Item; using Umbraco.Cms.Api.Management.ViewModels.Template.Item; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -9,6 +9,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Template.Item; +[ApiVersion("1.0")] public class ItemTemplateItemController : TemplateItemControllerBase { private readonly IEntityService _entityService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Item/TemplateItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Item/TemplateItemControllerBase.cs index a4b80b92bb..50aa1382ac 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Item/TemplateItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Item/TemplateItemControllerBase.cs @@ -4,7 +4,6 @@ using Umbraco.Cms.Core; namespace Umbraco.Cms.Api.Management.Controllers.Template.Item; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.UdiEntityType.Template}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Template))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs index 0123f3792f..17dbf80dcb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/ExecuteTemplateQueryController.cs @@ -1,6 +1,7 @@ using System.Diagnostics; using System.Linq.Expressions; using System.Text; +using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Template.Query; @@ -12,6 +13,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Api.Management.Controllers.Template.Query; +[ApiVersion("1.0")] public class ExecuteTemplateQueryController : TemplateQueryControllerBase { private readonly IPublishedContentQuery _publishedContentQuery; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/SettingsTemplateQueryController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/SettingsTemplateQueryController.cs index bdb73d57da..fe33a15075 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/SettingsTemplateQueryController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Query/SettingsTemplateQueryController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Template.Query; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.Template.Query; +[ApiVersion("1.0")] public class SettingsTemplateQueryController : TemplateQueryControllerBase { private readonly IContentTypeService _contentTypeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/ScaffoldTemplateController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/ScaffoldTemplateController.cs index 81e2e3d6f7..1c4aa1db7d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/ScaffoldTemplateController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/ScaffoldTemplateController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Template; using Umbraco.Cms.Core.IO; namespace Umbraco.Cms.Api.Management.Controllers.Template; +[ApiVersion("1.0")] public class ScaffoldTemplateController : TemplateControllerBase { private readonly IDefaultViewContentProvider _defaultViewContentProvider; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/TemplateControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/TemplateControllerBase.cs index 1d2f800a71..d99aa3f94a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/TemplateControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/TemplateControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -10,7 +11,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.Template; [ApiController] [VersionedApiBackOfficeRoute(Constants.UdiEntityType.Template)] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Template))] -[ApiVersion("1.0")] public class TemplateControllerBase : ManagementApiControllerBase { protected IActionResult TemplateOperationStatusResult(TemplateOperationStatus status) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ChildrenTemplateTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ChildrenTemplateTreeController.cs index f159f2e4ea..01b4219f28 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ChildrenTemplateTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/ChildrenTemplateTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Template.Tree; +[ApiVersion("1.0")] public class ChildrenTemplateTreeController : TemplateTreeControllerBase { public ChildrenTemplateTreeController(IEntityService entityService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/RootTemplateTreeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/RootTemplateTreeController.cs index 7be46e7f94..a33876c3da 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/RootTemplateTreeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/RootTemplateTreeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Api.Common.ViewModels.Pagination; @@ -6,6 +7,7 @@ using Umbraco.Cms.Api.Management.ViewModels.Tree; namespace Umbraco.Cms.Api.Management.Controllers.Template.Tree; +[ApiVersion("1.0")] public class RootTemplateTreeController : TemplateTreeControllerBase { public RootTemplateTreeController(IEntityService entityService) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/TemplateTreeControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/TemplateTreeControllerBase.cs index 2a3b1ab99c..ddd3e572c1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/TemplateTreeControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/Tree/TemplateTreeControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.Entities; @@ -9,7 +10,6 @@ using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.Template.Tree; -[ApiVersion("1.0")] [ApiController] [VersionedApiBackOfficeRoute($"{Constants.Web.RoutePath.Tree}/{Constants.UdiEntityType.Template}")] [ApiExplorerSettings(GroupName = nameof(Constants.UdiEntityType.Template))] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Template/UpdateTemplateController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Template/UpdateTemplateController.cs index 7f4f641e2b..664119e6be 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Template/UpdateTemplateController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Template/UpdateTemplateController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.Template; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.Template; +[ApiVersion("1.0")] public class UpdateTemplateController : TemplateControllerBase { private readonly ITemplateService _templateService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/ByKeyTemporaryFileController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/ByKeyTemporaryFileController.cs index a55140319a..f06460b5bc 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/ByKeyTemporaryFileController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/ByKeyTemporaryFileController.cs @@ -1,6 +1,6 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.Language; using Umbraco.Cms.Api.Management.ViewModels.TemporaryFile; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models.TemporaryFile; @@ -8,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.TemporaryFile; +[ApiVersion("1.0")] public class ByKeyTemporaryFileController : TemporaryFileControllerBase { private readonly ITemporaryFileService _temporaryFileService; @@ -20,6 +21,8 @@ public class ByKeyTemporaryFileController : TemporaryFileControllerBase } [HttpGet($"{{{nameof(id)}}}")] + + [MapToApiVersion("1.0")] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/CreateTemporaryFileController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/CreateTemporaryFileController.cs index 303562ca2b..68f33acd69 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/CreateTemporaryFileController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/CreateTemporaryFileController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.TemporaryFile; using Umbraco.Cms.Core; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.TemporaryFile; +[ApiVersion("1.0")] public class CreateTemporaryFileController : TemporaryFileControllerBase { private readonly ITemporaryFileService _temporaryFileService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/DeleteTemporaryFileController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/DeleteTemporaryFileController.cs index 9af909e146..6f7e8004fb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/DeleteTemporaryFileController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/DeleteTemporaryFileController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Models.TemporaryFile; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.TemporaryFile; +[ApiVersion("1.0")] public class DeleteTemporaryFileController : TemporaryFileControllerBase { private readonly ITemporaryFileService _temporaryFileService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/TemporaryFileControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/TemporaryFileControllerBase.cs index 86e4e448b7..b9b36169e2 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/TemporaryFileControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TemporaryFile/TemporaryFileControllerBase.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; -using Umbraco.Cms.Core.Models.TemporaryFile; using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.TemporaryFile; @@ -10,7 +9,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.TemporaryFile; [ApiController] [VersionedApiBackOfficeRoute("temporaryfile")] [ApiExplorerSettings(GroupName = "Temporary File")] -[ApiVersion("1.0")] public abstract class TemporaryFileControllerBase : ManagementApiControllerBase { protected IActionResult TemporaryFileStatusResult(TemporaryFileOperationStatus operationStatus) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ByIdTrackedReferenceController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ByIdTrackedReferenceController.cs index da3e7ae6e8..e3ad8f3cc7 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ByIdTrackedReferenceController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ByIdTrackedReferenceController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -9,6 +10,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.TrackedReference; +[ApiVersion("1.0")] public class ByIdTrackedReferenceController : TrackedReferenceControllerBase { private readonly ITrackedReferencesService _trackedReferencesService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/DescendantsTrackedReferenceController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/DescendantsTrackedReferenceController.cs index 1aaee67b0a..b82e8d64b5 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/DescendantsTrackedReferenceController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/DescendantsTrackedReferenceController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -9,6 +10,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.TrackedReference; +[ApiVersion("1.0")] public class DescendantsTrackedReferenceController : TrackedReferenceControllerBase { private readonly ITrackedReferencesService _trackedReferencesSkipTakeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ItemsTrackedReferenceController.cs b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ItemsTrackedReferenceController.cs index bcf891da2f..01bf6670cb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ItemsTrackedReferenceController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/ItemsTrackedReferenceController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; @@ -9,6 +10,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.TrackedReference; +[ApiVersion("1.0")] public class ItemsTrackedReferenceController : TrackedReferenceControllerBase { private readonly ITrackedReferencesService _trackedReferencesSkipTakeService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/TrackedReferencesControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/TrackedReferencesControllerBase.cs index 68d7fb7c31..3b6eefcf64 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/TrackedReferencesControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/TrackedReference/TrackedReferencesControllerBase.cs @@ -6,7 +6,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.TrackedReference; [ApiController] [VersionedApiBackOfficeRoute("tracked-reference")] [ApiExplorerSettings(GroupName = "Tracked Reference")] -[ApiVersion("1.0")] public abstract class TrackedReferenceControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/AuthorizeUpgradeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/AuthorizeUpgradeController.cs index 713ae4224b..1d9c788639 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/AuthorizeUpgradeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/AuthorizeUpgradeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.New.Cms.Core.Services.Installer; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/SettingsUpgradeController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/SettingsUpgradeController.cs index 5466c91b58..e23218a199 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/SettingsUpgradeController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/Upgrade/SettingsUpgradeController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Api.Management.ViewModels.Installer; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/ByKeyUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/ByKeyUsersController.cs index f43abe833b..db5a620c40 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/ByKeyUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/ByKeyUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.User; @@ -8,6 +9,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class ByKeyUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/ChangePasswordUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/ChangePasswordUsersController.cs index 8b09f81881..77114a19d9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/ChangePasswordUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/ChangePasswordUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Mapping; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class ChangePasswordUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/ClearAvatarUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/ClearAvatarUsersController.cs index d3c1fb94f0..f489a98bf4 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/ClearAvatarUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/ClearAvatarUsersController.cs @@ -1,15 +1,18 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class ClearAvatarUserController : UserControllerBase { private readonly IUserService _userService; public ClearAvatarUserController(IUserService userService) => _userService = userService; + [MapToApiVersion("1.0")] [HttpDelete("avatar/{id:guid}")] public async Task ClearAvatar(Guid id) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/CreateUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/CreateUsersController.cs index 839f6e1fb3..1f540f664b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/CreateUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/CreateUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.User; @@ -12,6 +13,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class CreateUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/DeleteUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/DeleteUsersController.cs index 258830da03..73a615fbfb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/DeleteUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/DeleteUsersController.cs @@ -1,15 +1,18 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class DeleteUserController : UserControllerBase { public DeleteUserController(IUserService userService) => _userService = userService; private readonly IUserService _userService; + [MapToApiVersion("1.0")] [HttpDelete("{id:guid}")] public async Task DeleteUser(Guid id) { diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/DisableUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/DisableUsersController.cs index 6a72d99f95..9d74715e61 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/DisableUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/DisableUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Security; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class DisableUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/EnableUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/EnableUsersController.cs index a19b3e3fad..2aa6db542d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/EnableUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/EnableUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Security; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class EnableUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/FilterUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/FilterUsersController.cs index 53df39bc6e..5cbb7a609a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/FilterUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/FilterUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.User; @@ -11,6 +12,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class FilterUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/GetAllUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/GetAllUsersController.cs index 807b510ebd..686c2349d1 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/GetAllUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/GetAllUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -13,6 +14,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class GetAllUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/InviteUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/InviteUsersController.cs index 46714d2438..b8bc5385f0 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/InviteUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/InviteUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.User; @@ -11,6 +12,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class InviteUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/Item/ItemUserItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/Item/ItemUserItemController.cs index e5a1687d1c..fc04221cab 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/Item/ItemUserItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/Item/ItemUserItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.User.Item; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.User.Item; +[ApiVersion("1.0")] public class ItemUserItemController : UserItemControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/Item/UserItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/Item/UserItemControllerBase.cs index 3bd4c42eca..aa12890268 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/Item/UserItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/Item/UserItemControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.User.Item; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.User.Item; [ApiController] [VersionedApiBackOfficeRoute("user")] [ApiExplorerSettings(GroupName = "User")] -[ApiVersion("1.0")] public class UserItemControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/SetAvatarUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/SetAvatarUsersController.cs index 455bfa1396..497b123239 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/SetAvatarUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/SetAvatarUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Services; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class SetAvatarUserController : UserControllerBase { private readonly IUserService _userService; @@ -15,6 +17,7 @@ public class SetAvatarUserController : UserControllerBase _userService = userService; } + [MapToApiVersion("1.0")] [HttpPost("avatar/{id:guid}")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status400BadRequest)] diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/UnlockUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/UnlockUsersController.cs index 84499c05f0..231c6a72fd 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/UnlockUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/UnlockUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class UnlockUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUserGroupsUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUserGroupsUsersController.cs index 2aaf7596ce..eb0a7d0b4f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUserGroupsUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUserGroupsUsersController.cs @@ -1,10 +1,12 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class UpdateUserGroupsUserController : UserControllerBase { private readonly IUserGroupService _userGroupService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUsersController.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUsersController.cs index 0b15664461..a0daf50234 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUsersController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/UpdateUsersController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.User; using Umbraco.Cms.Core; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.User; +[ApiVersion("1.0")] public class UpdateUserController : UserControllerBase { private readonly IUserService _userService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/User/UsersControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/User/UsersControllerBase.cs index 74b359bf20..dfc0808c34 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/User/UsersControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/User/UsersControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -10,7 +11,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.User; [ApiController] [VersionedApiBackOfficeRoute("user")] [ApiExplorerSettings(GroupName = "User")] -[ApiVersion("1.0")] public abstract class UserControllerBase : ManagementApiControllerBase { protected IActionResult UserOperationStatusResult(UserOperationStatus status, ErrorMessageResult? errorMessageResult = null) => diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs index b047d53030..471436309a 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/ByKeyUserGroupController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.UserGroup; @@ -7,7 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; - +[ApiVersion("1.0")] public class ByKeyUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/CreateUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/CreateUserGroupController.cs index 4a9fd906ad..140590f44d 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/CreateUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/CreateUserGroupController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.UserGroup; @@ -10,6 +11,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; +[ApiVersion("1.0")] public class CreateUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/DeleteUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/DeleteUserGroupController.cs index 944e1a5157..1550d0c5b2 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/DeleteUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/DeleteUserGroupController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Services; @@ -6,6 +7,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; +[ApiVersion("1.0")] public class DeleteUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs index 1e6a12f035..4e71c94ceb 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/GetAllUserGroupController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.ViewModels.Pagination; using Umbraco.Cms.Api.Management.Factories; @@ -9,6 +10,7 @@ using Umbraco.New.Cms.Core.Models; namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; +[ApiVersion("1.0")] public class GetAllUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/ItemUserGroupItemController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/ItemUserGroupItemController.cs index c2ce07d2c6..6af4ad438b 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/ItemUserGroupItemController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/ItemUserGroupItemController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.ViewModels.UserGroup.Item; using Umbraco.Cms.Core.Mapping; @@ -7,6 +8,7 @@ using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Api.Management.Controllers.UserGroup.Item; +[ApiVersion("1.0")] public class ItemUserGroupItemController : UserGroupItemControllerBase { private readonly IUserGroupService _userGroupService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/UserGroupItemControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/UserGroupItemControllerBase.cs index d10e7bcad6..8e3ed25261 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/UserGroupItemControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/Item/UserGroupItemControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Asp.Versioning; +using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Routing; namespace Umbraco.Cms.Api.Management.Controllers.UserGroup.Item; @@ -6,7 +7,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.UserGroup.Item; [ApiController] [VersionedApiBackOfficeRoute("user-group")] [ApiExplorerSettings(GroupName = "User Group")] -[ApiVersion("1.0")] public class UserGroupItemControllerBase : ManagementApiControllerBase { } diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UpdateUserGroupController.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UpdateUserGroupController.cs index 32cf279040..726cce6609 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UpdateUserGroupController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UpdateUserGroupController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; using Umbraco.Cms.Api.Management.ViewModels.UserGroup; @@ -9,6 +10,7 @@ using Umbraco.Cms.Core.Services.OperationStatus; namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; +[ApiVersion("1.0")] public class UpdateUserGroupController : UserGroupControllerBase { private readonly IUserGroupService _userGroupService; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UserGroupsControllerBase.cs b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UserGroupsControllerBase.cs index f18985164e..97e9f37290 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UserGroupsControllerBase.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/UserGroup/UserGroupsControllerBase.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using Asp.Versioning; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Common.Builders; using Umbraco.Cms.Api.Management.Routing; @@ -11,7 +12,6 @@ namespace Umbraco.Cms.Api.Management.Controllers.UserGroup; [ApiController] [VersionedApiBackOfficeRoute("user-group")] [ApiExplorerSettings(GroupName = "User Group")] -[ApiVersion("1.0")] public class UserGroupControllerBase : ManagementApiControllerBase { protected IActionResult UserGroupOperationStatusResult(UserGroupOperationStatus status) =>