V14: Deleted code marked as obsolete for V14

src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByIdContentApiController.cs

@@ -1,12 +1,9 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.DeliveryApi;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Services;
 
 namespace Umbraco.Cms.Api.Delivery.Controllers.Content;
 
@@ -16,32 +13,6 @@ public class ByIdContentApiController : ContentApiItemControllerBase
 {
     private readonly IRequestMemberAccessService _requestMemberAccessService;
 
-    [Obsolete($"Please use the constructor that does not accept {nameof(IPublicAccessService)}. Will be removed in V14.")]
-    public ByIdContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilder,
-        IPublicAccessService publicAccessService)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilder,
-            StaticServiceProvider.Instance.GetRequiredService<IRequestMemberAccessService>())
-    {
-    }
-
-    [Obsolete($"Please use the constructor that does not accept {nameof(IPublicAccessService)}. Will be removed in V14.")]
-    public ByIdContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilder,
-        IPublicAccessService publicAccessService,
-        IRequestMemberAccessService requestMemberAccessService)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilder,
-            requestMemberAccessService)
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
     public ByIdContentApiController(
         IApiPublishedContentCache apiPublishedContentCache,
         IApiContentResponseBuilder apiContentResponseBuilder,

src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByIdsContentApiController.cs

@@ -1,12 +1,9 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.DeliveryApi;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Services;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Api.Delivery.Controllers.Content;
@@ -17,32 +14,6 @@ public class ByIdsContentApiController : ContentApiItemControllerBase
 {
     private readonly IRequestMemberAccessService _requestMemberAccessService;
 
-    [Obsolete($"Please use the constructor that does not accept {nameof(IPublicAccessService)}. Will be removed in V14.")]
-    public ByIdsContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilder,
-        IPublicAccessService publicAccessService)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilder,
-            StaticServiceProvider.Instance.GetRequiredService<IRequestMemberAccessService>())
-    {
-    }
-
-    [Obsolete($"Please use the constructor that does not accept {nameof(IPublicAccessService)}. Will be removed in V14.")]
-    public ByIdsContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilder,
-        IPublicAccessService publicAccessService,
-        IRequestMemberAccessService requestMemberAccessService)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilder,
-            requestMemberAccessService)
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
     public ByIdsContentApiController(
         IApiPublishedContentCache apiPublishedContentCache,
         IApiContentResponseBuilder apiContentResponseBuilder,

src/Umbraco.Cms.Api.Delivery/Controllers/Content/ByRouteContentApiController.cs

@@ -1,4 +1,4 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
@@ -20,44 +20,7 @@
     private readonly IRequestPreviewService _requestPreviewService;
     private readonly IRequestMemberAccessService _requestMemberAccessService;
     private const string PreviewContentRequestPathPrefix = $"/{Constants.DeliveryApi.Routing.PreviewContentPathPrefix}";
 
-    [Obsolete($"Please use the constructor that does not accept {nameof(IPublicAccessService)}. Will be removed in V14.")]
-    public ByRouteContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilder,
-        IPublicAccessService publicAccessService,
-        IRequestRoutingService requestRoutingService,
-        IRequestRedirectService requestRedirectService,
-        IRequestPreviewService requestPreviewService)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilder,
-            requestRoutingService,
-            requestRedirectService,
-            requestPreviewService,
-            StaticServiceProvider.Instance.GetRequiredService<IRequestMemberAccessService>())
-    {
-    }
-
-    [Obsolete($"Please use the constructor that does not accept {nameof(IPublicAccessService)}. Will be removed in V14.")]
-    public ByRouteContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilder,
-        IPublicAccessService publicAccessService,
-        IRequestRoutingService requestRoutingService,
-        IRequestRedirectService requestRedirectService,
-        IRequestPreviewService requestPreviewService,
-        IRequestMemberAccessService requestMemberAccessService)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilder,
-            requestRoutingService,
-            requestRedirectService,
-            requestPreviewService,
-            requestMemberAccessService)
-    {
-    }
-
     [Obsolete($"Please use the constructor that accepts {nameof(IApiContentPathResolver)}. Will be removed in V15.")]
     public ByRouteContentApiController(
         IApiPublishedContentCache apiPublishedContentCache,

src/Umbraco.Cms.Api.Delivery/Controllers/Content/QueryContentApiController.cs

@@ -1,11 +1,9 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Api.Common.ViewModels.Pagination;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DeliveryApi;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
@@ -21,20 +19,6 @@ public class QueryContentApiController : ContentApiControllerBase
     private readonly IRequestMemberAccessService _requestMemberAccessService;
     private readonly IApiContentQueryService _apiContentQueryService;
 
-    [Obsolete($"Please use the constructor that accepts {nameof(IRequestMemberAccessService)}. Will be removed in V14.")]
-    public QueryContentApiController(
-        IApiPublishedContentCache apiPublishedContentCache,
-        IApiContentResponseBuilder apiContentResponseBuilderBuilder,
-        IApiContentQueryService apiContentQueryService)
-        : this(
-            apiPublishedContentCache,
-            apiContentResponseBuilderBuilder,
-            apiContentQueryService,
-            StaticServiceProvider.Instance.GetRequiredService<IRequestMemberAccessService>())
-    {
-    }
-
-    [ActivatorUtilitiesConstructor]
     public QueryContentApiController(
         IApiPublishedContentCache apiPublishedContentCache,
         IApiContentResponseBuilder apiContentResponseBuilderBuilder,

src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryProvider.cs

@@ -1,4 +1,4 @@
 using Examine;
 using Examine.Search;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -47,18 +47,7 @@
         _sortBuilder = new ApiContentQuerySortBuilder(fieldTypes, _logger);
 
     }
 
-    [Obsolete($"Use the {nameof(ExecuteQuery)} method that accepts {nameof(ProtectedAccess)}. Will be removed in V14.")]
-    public PagedModel<Guid> ExecuteQuery(
-        SelectorOption selectorOption,
-        IList<FilterOption> filterOptions,
-        IList<SortOption> sortOptions,
-        string culture,
-        bool preview,
-        int skip,
-        int take)
-        => ExecuteQuery(selectorOption, filterOptions, sortOptions, culture, ProtectedAccess.None, preview, skip, take);
-
     /// <inheritdoc/>
     public PagedModel<Guid> ExecuteQuery(
         SelectorOption selectorOption,

src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryService.cs

@@ -1,4 +1,4 @@
 using Umbraco.Cms.Api.Delivery.Indexing.Selectors;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DeliveryApi;
 using Umbraco.Cms.Core.Models;
@@ -36,16 +36,7 @@
         _apiContentQueryProvider = apiContentQueryProvider;
         _requestPreviewService = requestPreviewService;
     }
 
-    [Obsolete($"Use the {nameof(ExecuteQuery)} method that accepts {nameof(ProtectedAccess)}. Will be removed in V14.")]
-    public Attempt<PagedModel<Guid>, ApiContentQueryOperationStatus> ExecuteQuery(
-        string? fetch,
-        IEnumerable<string> filters,
-        IEnumerable<string> sorts,
-        int skip,
-        int take)
-        => ExecuteQuery(fetch, filters, sorts, ProtectedAccess.None, skip, take);
-
     /// <inheritdoc/>
     public Attempt<PagedModel<Guid>, ApiContentQueryOperationStatus> ExecuteQuery(
         string? fetch,

src/Umbraco.Core/Composing/TypeFinder.cs

@@ -1,4 +1,4 @@
 using System.Collections.Concurrent;
 using System.Reflection;
 using System.Security;
 using System.Text;
@@ -49,11 +49,6 @@
     private string[]? _assembliesAcceptingLoadExceptions;
     private volatile HashSet<Assembly>? _localFilteredAssemblyCache;
 
-    [Obsolete("Please use the constructor taking all parameters. This constructor will be removed in V14.")]
-    public TypeFinder(ILogger<TypeFinder> logger, IAssemblyProvider assemblyProvider, ITypeFinderConfig? typeFinderConfig = null)
-        : this(logger, assemblyProvider, null, typeFinderConfig)
-    { }
-
     public TypeFinder(ILogger<TypeFinder> logger, IAssemblyProvider assemblyProvider, string[]? additionalExlusionAssemblies, ITypeFinderConfig? typeFinderConfig = null)
     {
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));

src/Umbraco.Core/Configuration/Models/ContentErrorPage.cs

@@ -21,13 +21,6 @@ public class ContentErrorPage : ValidatableEntryBase
     /// </summary>
     public Guid ContentKey { get; set; }
 
-    /// <summary>
-    ///     Gets or sets a value for the content XPath.
-    /// </summary>
-
-    [Obsolete("The current implementation of XPath is suboptimal and will be removed entirely in a future version. Scheduled for removal in v14")]
-    public string? ContentXPath { get; set; }
-
     /// <summary>
     ///     Gets a value indicating whether the <see cref="ContentId" /> field is populated.
     /// </summary>
@@ -38,12 +31,6 @@ public class ContentErrorPage : ValidatableEntryBase
     /// </summary>
     public bool HasContentKey => ContentKey != Guid.Empty;
 
-    /// <summary>
-    ///     Gets a value indicating whether the <see cref="ContentXPath" /> field is populated.
-    /// </summary>
-    [Obsolete("The current implementation of XPath is suboptimal and will be removed entirely in a future version. Scheduled for removal in v14")]
-    public bool HasContentXPath => !string.IsNullOrEmpty(ContentXPath);
-
     /// <summary>
     ///     Gets or sets a value for the content culture.
     /// </summary>
@@ -52,5 +39,5 @@ public class ContentErrorPage : ValidatableEntryBase
 
     internal override bool IsValid() =>
         base.IsValid() &&
-        (HasContentId ? 1 : 0) + (HasContentKey ? 1 : 0) + (HasContentXPath ? 1 : 0) == 1;
+        (HasContentId ^ HasContentKey);
 }

src/Umbraco.Core/DeliveryApi/IApiContentQueryService.cs

@@ -9,9 +9,6 @@ namespace Umbraco.Cms.Core.DeliveryApi;
 /// </summary>
 public interface IApiContentQueryService
 {
-    [Obsolete($"Use the {nameof(ExecuteQuery)} method that accepts {nameof(ProtectedAccess)}. Will be removed in V14.")]
-    Attempt<PagedModel<Guid>, ApiContentQueryOperationStatus> ExecuteQuery(string? fetch, IEnumerable<string> filters, IEnumerable<string> sorts, int skip, int take);
-
     /// <summary>
     ///     Returns an attempt with a collection of item ids that passed the search criteria as a paged model.
     /// </summary>

src/Umbraco.Core/DeliveryApi/NoopApiContentQueryService.cs

@@ -1,15 +1,11 @@
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Services.OperationStatus;
 
 namespace Umbraco.Cms.Core.DeliveryApi;
 
 public sealed class NoopApiContentQueryService : IApiContentQueryService
 {
-    [Obsolete($"Use the {nameof(ExecuteQuery)} method that accepts {nameof(ProtectedAccess)}. Will be removed in V14.")]
-    public Attempt<PagedModel<Guid>, ApiContentQueryOperationStatus> ExecuteQuery(string? fetch, IEnumerable<string> filters, IEnumerable<string> sorts, int skip, int take)
-        => Attempt.SucceedWithStatus(ApiContentQueryOperationStatus.Success, new PagedModel<Guid>());
-
     /// <inheritdoc />
     public Attempt<PagedModel<Guid>, ApiContentQueryOperationStatus> ExecuteQuery(string? fetch, IEnumerable<string> filters, IEnumerable<string> sorts, ProtectedAccess protectedAccess, int skip, int take)
         => Attempt.SucceedWithStatus(ApiContentQueryOperationStatus.Success, new PagedModel<Guid>());

src/Umbraco.Core/Deploy/IFileSource.cs

@@ -77,38 +77,13 @@ public interface IFileSource
     /// </returns>
     Task<long> GetFileLengthAsync(StringUdi udi, CancellationToken token);
 
-    // TODO (V14): Remove obsolete methods and default implementations for GetFiles and GetFilesAsync overloads.
-
-    /// <summary>
-    /// Gets files and store them using a file store.
-    /// </summary>
-    /// <param name="udis">The UDIs of the files to get.</param>
-    /// <param name="fileTypes">A collection of file types which can store the files.</param>
-    [Obsolete("Please use the method overload taking all parameters. This method overload will be removed in Umbraco 14.")]
-    void GetFiles(IEnumerable<StringUdi> udis, IFileTypeCollection fileTypes);
-
     /// <summary>
     /// Gets files and store them using a file store.
     /// </summary>
     /// <param name="udis">The UDIs of the files to get.</param>
     /// <param name="continueOnFileNotFound">A flag indicating whether to continue if a file isn't found or to stop and throw a FileNotFoundException.</param>
     /// <param name="fileTypes">A collection of file types which can store the files.</param>
-    void GetFiles(IEnumerable<StringUdi> udis, bool continueOnFileNotFound, IFileTypeCollection fileTypes)
-#pragma warning disable CS0618 // Type or member is obsolete
-        => GetFiles(udis, fileTypes);
-#pragma warning restore CS0618 // Type or member is obsolete
-
-    /// <summary>
-    /// Gets files and store them using a file store.
-    /// </summary>
-    /// <param name="udis">The UDIs of the files to get.</param>
-    /// <param name="fileTypes">A collection of file types which can store the files.</param>
-    /// <param name="token">A cancellation token.</param>
-    /// <returns>
-    /// The task object representing the asynchronous operation.
-    /// </returns>
-    [Obsolete("Please use the method overload taking all parameters. This method overload will be removed in Umbraco 14.")]
-    Task GetFilesAsync(IEnumerable<StringUdi> udis, IFileTypeCollection fileTypes, CancellationToken token);
+    void GetFiles(IEnumerable<StringUdi> udis, bool continueOnFileNotFound, IFileTypeCollection fileTypes);
 
     /// <summary>
     /// Gets files and store them using a file store.
@@ -120,8 +95,5 @@ void GetFiles(IEnumerable<StringUdi> udis, bool continueOnFileNotFound, IFileTyp
     /// <returns>
     /// The task object representing the asynchronous operation.
     /// </returns>
-    Task GetFilesAsync(IEnumerable<StringUdi> udis, IFileTypeCollection fileTypes, bool continueOnFileNotFound, CancellationToken token)
-#pragma warning disable CS0618 // Type or member is obsolete
-        => GetFilesAsync(udis, fileTypes, token);
-#pragma warning restore CS0618 // Type or member is obsolete
+    Task GetFilesAsync(IEnumerable<StringUdi> udis, IFileTypeCollection fileTypes, bool continueOnFileNotFound, CancellationToken token);
 }

src/Umbraco.Core/Deploy/IFileTypeCollection.cs

@@ -27,18 +27,7 @@ public interface IFileTypeCollection
     /// <returns>
     ///   <c>true</c> if the file type associated with the specified entity type was found; otherwise, <c>false</c>.
     /// </returns>
-    bool TryGetValue(string entityType, [NotNullWhen(true)] out IFileType? fileType)
-    {
-        // TODO (V14): Remove default implementation
-        if (Contains(entityType))
-        {
-            fileType = this[entityType];
-            return true;
-        }
-
-        fileType = null;
-        return false;
-    }
+    bool TryGetValue(string entityType, [NotNullWhen(true)] out IFileType? fileType);
 
     /// <summary>
     /// Determines whether this collection contains a file type for the specified entity type.
@@ -55,5 +44,5 @@ bool TryGetValue(string entityType, [NotNullWhen(true)] out IFileType? fileType)
     /// <returns>
     /// The entity types.
     /// </returns>
-    ICollection<string> GetEntityTypes() => Array.Empty<string>(); // TODO (V14): Remove default implementation
+    ICollection<string> GetEntityTypes();
 }