From bb0395349f2a66b8603397f56716fe3c499ddc57 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:11:11 +0100 Subject: [PATCH] V14: Fix composition endpoints namespaces (#15620) * Fix namespace in media type related classes * Fix namespace in document type composition related classes --- ...r.cs => AvailableCompositionDocumentTypeController.cs} | 8 ++++---- ...r.cs => CompositionReferenceDocumentTypeController.cs} | 8 ++++---- ...ller.cs => AvailableCompositionMediaTypeController.cs} | 8 ++++---- ...ller.cs => CompositionReferenceMediaTypeController.cs} | 8 ++++---- .../Factories/DocumentTypeEditingPresentationFactory.cs | 1 - .../Factories/IDocumentTypeEditingPresentationFactory.cs | 1 - .../Factories/IMediaTypeEditingPresentationFactory.cs | 1 - .../Factories/MediaTypeEditingPresentationFactory.cs | 1 - .../DocumentType/DocumentTypeCompositionMapDefinition.cs | 2 +- .../MediaType/MediaTypeCompositionMapDefinition.cs | 2 +- .../AvailableDocumentTypeCompositionResponseModel.cs | 2 +- .../DocumentTypeCompositionRequestModel.cs | 2 +- .../DocumentTypeCompositionResponseModel.cs | 2 +- .../AvailableMediaTypeCompositionResponseModel.cs | 2 +- .../{Composition => }/MediaTypeCompositionRequestModel.cs | 2 +- .../MediaTypeCompositionResponseModel.cs | 2 +- 16 files changed, 24 insertions(+), 28 deletions(-) rename src/Umbraco.Cms.Api.Management/Controllers/DocumentType/{Composition/AvailableCompositionController.cs => AvailableCompositionDocumentTypeController.cs} (78%) rename src/Umbraco.Cms.Api.Management/Controllers/DocumentType/{Composition/ReferencesCompositionController.cs => CompositionReferenceDocumentTypeController.cs} (80%) rename src/Umbraco.Cms.Api.Management/Controllers/MediaType/{Composition/AvailableCompositionController.cs => AvailableCompositionMediaTypeController.cs} (78%) rename src/Umbraco.Cms.Api.Management/Controllers/MediaType/{Composition/ReferencesCompositionController.cs => CompositionReferenceMediaTypeController.cs} (81%) rename src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/{Composition => }/AvailableDocumentTypeCompositionResponseModel.cs (70%) rename src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/{Composition => }/DocumentTypeCompositionRequestModel.cs (82%) rename src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/{Composition => }/DocumentTypeCompositionResponseModel.cs (67%) rename src/Umbraco.Cms.Api.Management/ViewModels/MediaType/{Composition => }/AvailableMediaTypeCompositionResponseModel.cs (70%) rename src/Umbraco.Cms.Api.Management/ViewModels/MediaType/{Composition => }/MediaTypeCompositionRequestModel.cs (67%) rename src/Umbraco.Cms.Api.Management/ViewModels/MediaType/{Composition => }/MediaTypeCompositionResponseModel.cs (68%) diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Composition/AvailableCompositionController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/AvailableCompositionDocumentTypeController.cs similarity index 78% rename from src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Composition/AvailableCompositionController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/DocumentType/AvailableCompositionDocumentTypeController.cs index 769f856f24..550c517b1f 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Composition/AvailableCompositionController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/AvailableCompositionDocumentTypeController.cs @@ -2,19 +2,19 @@ using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.DocumentType.Composition; +using Umbraco.Cms.Api.Management.ViewModels.DocumentType; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services.ContentTypeEditing; -namespace Umbraco.Cms.Api.Management.Controllers.DocumentType.Composition; +namespace Umbraco.Cms.Api.Management.Controllers.DocumentType; [ApiVersion("1.0")] -public class AvailableCompositionController : DocumentTypeControllerBase +public class AvailableCompositionDocumentTypeController : DocumentTypeControllerBase { private readonly IContentTypeEditingService _contentTypeEditingService; private readonly IDocumentTypeEditingPresentationFactory _presentationFactory; - public AvailableCompositionController(IContentTypeEditingService contentTypeEditingService, IDocumentTypeEditingPresentationFactory presentationFactory) + public AvailableCompositionDocumentTypeController(IContentTypeEditingService contentTypeEditingService, IDocumentTypeEditingPresentationFactory presentationFactory) { _contentTypeEditingService = contentTypeEditingService; _presentationFactory = presentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Composition/ReferencesCompositionController.cs b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/CompositionReferenceDocumentTypeController.cs similarity index 80% rename from src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Composition/ReferencesCompositionController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/DocumentType/CompositionReferenceDocumentTypeController.cs index cdf5b1e32b..f077b8baf9 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/Composition/ReferencesCompositionController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/DocumentType/CompositionReferenceDocumentTypeController.cs @@ -1,21 +1,21 @@ using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.DocumentType.Composition; +using Umbraco.Cms.Api.Management.ViewModels.DocumentType; 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.DocumentType.Composition; +namespace Umbraco.Cms.Api.Management.Controllers.DocumentType; [ApiVersion("1.0")] -public class ReferencesCompositionController : DocumentTypeControllerBase +public class CompositionReferenceDocumentTypeController : DocumentTypeControllerBase { private readonly IContentTypeService _contentTypeService; private readonly IUmbracoMapper _umbracoMapper; - public ReferencesCompositionController(IContentTypeService contentTypeService, IUmbracoMapper umbracoMapper) + public CompositionReferenceDocumentTypeController(IContentTypeService contentTypeService, IUmbracoMapper umbracoMapper) { _contentTypeService = contentTypeService; _umbracoMapper = umbracoMapper; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Composition/AvailableCompositionController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/AvailableCompositionMediaTypeController.cs similarity index 78% rename from src/Umbraco.Cms.Api.Management/Controllers/MediaType/Composition/AvailableCompositionController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/MediaType/AvailableCompositionMediaTypeController.cs index 05c9c25a9a..90e47f47ba 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Composition/AvailableCompositionController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/AvailableCompositionMediaTypeController.cs @@ -2,19 +2,19 @@ using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Cms.Api.Management.Factories; -using Umbraco.Cms.Api.Management.ViewModels.MediaType.Composition; +using Umbraco.Cms.Api.Management.ViewModels.MediaType; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services.ContentTypeEditing; -namespace Umbraco.Cms.Api.Management.Controllers.MediaType.Composition; +namespace Umbraco.Cms.Api.Management.Controllers.MediaType; [ApiVersion("1.0")] -public class AvailableCompositionController : MediaTypeControllerBase +public class AvailableCompositionMediaTypeController : MediaTypeControllerBase { private readonly IMediaTypeEditingService _mediaTypeEditingService; private readonly IMediaTypeEditingPresentationFactory _presentationFactory; - public AvailableCompositionController(IMediaTypeEditingService mediaTypeEditingService, IMediaTypeEditingPresentationFactory presentationFactory) + public AvailableCompositionMediaTypeController(IMediaTypeEditingService mediaTypeEditingService, IMediaTypeEditingPresentationFactory presentationFactory) { _mediaTypeEditingService = mediaTypeEditingService; _presentationFactory = presentationFactory; diff --git a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Composition/ReferencesCompositionController.cs b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/CompositionReferenceMediaTypeController.cs similarity index 81% rename from src/Umbraco.Cms.Api.Management/Controllers/MediaType/Composition/ReferencesCompositionController.cs rename to src/Umbraco.Cms.Api.Management/Controllers/MediaType/CompositionReferenceMediaTypeController.cs index 374e8862ed..cc77133b5e 100644 --- a/src/Umbraco.Cms.Api.Management/Controllers/MediaType/Composition/ReferencesCompositionController.cs +++ b/src/Umbraco.Cms.Api.Management/Controllers/MediaType/CompositionReferenceMediaTypeController.cs @@ -1,21 +1,21 @@ using Asp.Versioning; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Umbraco.Cms.Api.Management.ViewModels.MediaType.Composition; +using Umbraco.Cms.Api.Management.ViewModels.MediaType; 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.MediaType.Composition; +namespace Umbraco.Cms.Api.Management.Controllers.MediaType; [ApiVersion("1.0")] -public class ReferencesCompositionController : MediaTypeControllerBase +public class CompositionReferenceMediaTypeController : MediaTypeControllerBase { private readonly IMediaTypeService _mediaTypeService; private readonly IUmbracoMapper _umbracoMapper; - public ReferencesCompositionController(IMediaTypeService mediaTypeService, IUmbracoMapper umbracoMapper) + public CompositionReferenceMediaTypeController(IMediaTypeService mediaTypeService, IUmbracoMapper umbracoMapper) { _mediaTypeService = mediaTypeService; _umbracoMapper = umbracoMapper; diff --git a/src/Umbraco.Cms.Api.Management/Factories/DocumentTypeEditingPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DocumentTypeEditingPresentationFactory.cs index d11be5185e..aeff9e1c23 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/DocumentTypeEditingPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/DocumentTypeEditingPresentationFactory.cs @@ -1,5 +1,4 @@ using Umbraco.Cms.Api.Management.ViewModels.DocumentType; -using Umbraco.Cms.Api.Management.ViewModels.DocumentType.Composition; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentTypeEditing; using Umbraco.Cms.Core.Services; diff --git a/src/Umbraco.Cms.Api.Management/Factories/IDocumentTypeEditingPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/IDocumentTypeEditingPresentationFactory.cs index 4b6d3967fc..5156bf3001 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/IDocumentTypeEditingPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/IDocumentTypeEditingPresentationFactory.cs @@ -1,5 +1,4 @@ using Umbraco.Cms.Api.Management.ViewModels.DocumentType; -using Umbraco.Cms.Api.Management.ViewModels.DocumentType.Composition; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentTypeEditing; diff --git a/src/Umbraco.Cms.Api.Management/Factories/IMediaTypeEditingPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/IMediaTypeEditingPresentationFactory.cs index 8dc4352e35..a7feb3c15c 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/IMediaTypeEditingPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/IMediaTypeEditingPresentationFactory.cs @@ -1,5 +1,4 @@ using Umbraco.Cms.Api.Management.ViewModels.MediaType; -using Umbraco.Cms.Api.Management.ViewModels.MediaType.Composition; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentTypeEditing; diff --git a/src/Umbraco.Cms.Api.Management/Factories/MediaTypeEditingPresentationFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/MediaTypeEditingPresentationFactory.cs index f0bffc1858..cfec97cc90 100644 --- a/src/Umbraco.Cms.Api.Management/Factories/MediaTypeEditingPresentationFactory.cs +++ b/src/Umbraco.Cms.Api.Management/Factories/MediaTypeEditingPresentationFactory.cs @@ -1,5 +1,4 @@ using Umbraco.Cms.Api.Management.ViewModels.MediaType; -using Umbraco.Cms.Api.Management.ViewModels.MediaType.Composition; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentTypeEditing; using Umbraco.Cms.Core.Services; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeCompositionMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeCompositionMapDefinition.cs index 5c0852b9ee..169d869654 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeCompositionMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/DocumentType/DocumentTypeCompositionMapDefinition.cs @@ -1,4 +1,4 @@ -using Umbraco.Cms.Api.Management.ViewModels.DocumentType.Composition; +using Umbraco.Cms.Api.Management.ViewModels.DocumentType; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; diff --git a/src/Umbraco.Cms.Api.Management/Mapping/MediaType/MediaTypeCompositionMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/MediaType/MediaTypeCompositionMapDefinition.cs index 7052e88cd4..962468649a 100644 --- a/src/Umbraco.Cms.Api.Management/Mapping/MediaType/MediaTypeCompositionMapDefinition.cs +++ b/src/Umbraco.Cms.Api.Management/Mapping/MediaType/MediaTypeCompositionMapDefinition.cs @@ -1,4 +1,4 @@ -using Umbraco.Cms.Api.Management.ViewModels.MediaType.Composition; +using Umbraco.Cms.Api.Management.ViewModels.MediaType; using Umbraco.Cms.Core.Mapping; using Umbraco.Cms.Core.Models; diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/AvailableDocumentTypeCompositionResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/AvailableDocumentTypeCompositionResponseModel.cs similarity index 70% rename from src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/AvailableDocumentTypeCompositionResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/AvailableDocumentTypeCompositionResponseModel.cs index 83569fa4a2..02dc155e47 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/AvailableDocumentTypeCompositionResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/AvailableDocumentTypeCompositionResponseModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.ContentType; -namespace Umbraco.Cms.Api.Management.ViewModels.DocumentType.Composition; +namespace Umbraco.Cms.Api.Management.ViewModels.DocumentType; public class AvailableDocumentTypeCompositionResponseModel : AvailableContentTypeCompositionResponseModelBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/DocumentTypeCompositionRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeCompositionRequestModel.cs similarity index 82% rename from src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/DocumentTypeCompositionRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeCompositionRequestModel.cs index ca9cdf1c28..d6d79e0bd6 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/DocumentTypeCompositionRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeCompositionRequestModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.ContentType; -namespace Umbraco.Cms.Api.Management.ViewModels.DocumentType.Composition; +namespace Umbraco.Cms.Api.Management.ViewModels.DocumentType; public class DocumentTypeCompositionRequestModel : ContentTypeCompositionRequestModelBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/DocumentTypeCompositionResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeCompositionResponseModel.cs similarity index 67% rename from src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/DocumentTypeCompositionResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeCompositionResponseModel.cs index ff241da622..4f232fd838 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/Composition/DocumentTypeCompositionResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/DocumentType/DocumentTypeCompositionResponseModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.ContentType; -namespace Umbraco.Cms.Api.Management.ViewModels.DocumentType.Composition; +namespace Umbraco.Cms.Api.Management.ViewModels.DocumentType; public class DocumentTypeCompositionResponseModel : ContentTypeCompositionResponseModelBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/AvailableMediaTypeCompositionResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/AvailableMediaTypeCompositionResponseModel.cs similarity index 70% rename from src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/AvailableMediaTypeCompositionResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/MediaType/AvailableMediaTypeCompositionResponseModel.cs index 21cae2a15e..e96433b472 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/AvailableMediaTypeCompositionResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/AvailableMediaTypeCompositionResponseModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.ContentType; -namespace Umbraco.Cms.Api.Management.ViewModels.MediaType.Composition; +namespace Umbraco.Cms.Api.Management.ViewModels.MediaType; public class AvailableMediaTypeCompositionResponseModel : AvailableContentTypeCompositionResponseModelBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/MediaTypeCompositionRequestModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCompositionRequestModel.cs similarity index 67% rename from src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/MediaTypeCompositionRequestModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCompositionRequestModel.cs index 3f6d06b6b4..66ee616568 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/MediaTypeCompositionRequestModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCompositionRequestModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.ContentType; -namespace Umbraco.Cms.Api.Management.ViewModels.MediaType.Composition; +namespace Umbraco.Cms.Api.Management.ViewModels.MediaType; public class MediaTypeCompositionRequestModel : ContentTypeCompositionRequestModelBase { diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/MediaTypeCompositionResponseModel.cs b/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCompositionResponseModel.cs similarity index 68% rename from src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/MediaTypeCompositionResponseModel.cs rename to src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCompositionResponseModel.cs index bd62815be1..bc0ce61344 100644 --- a/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/Composition/MediaTypeCompositionResponseModel.cs +++ b/src/Umbraco.Cms.Api.Management/ViewModels/MediaType/MediaTypeCompositionResponseModel.cs @@ -1,6 +1,6 @@ using Umbraco.Cms.Api.Management.ViewModels.ContentType; -namespace Umbraco.Cms.Api.Management.ViewModels.MediaType.Composition; +namespace Umbraco.Cms.Api.Management.ViewModels.MediaType; public class MediaTypeCompositionResponseModel : ContentTypeCompositionResponseModelBase {