Properties and validators, removing obsoleted code

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

@@ -66,7 +66,12 @@ private IPublishedMediaCache GetRequiredPublishedMediaCache()
     private IPublishedContent? TryGetByPath(string path, IPublishedMediaCache mediaCache)
     {
         var segments = path.Split(Constants.CharArrays.ForwardSlash, StringSplitOptions.RemoveEmptyEntries);
-        IEnumerable<IPublishedContent> currentChildren = mediaCache.GetAtRoot();
+        if (_mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys) is false)
+        {
+            return null;
+        }
+
+        IEnumerable<IPublishedContent> currentChildren = rootKeys.Select(x => mediaCache.GetById(false, x)).WhereNotNull();
         IPublishedContent? resolvedMedia = null;
 
         foreach (var segment in segments)
@@ -101,9 +106,9 @@ private IPublishedMediaCache GetRequiredPublishedMediaCache()
         }
 
         IPublishedMediaCache mediaCache = GetRequiredPublishedMediaCache();
-        if (childrenOf.Trim(Constants.CharArrays.ForwardSlash).Length == 0)
+        if (childrenOf.Trim(Constants.CharArrays.ForwardSlash).Length == 0 && _mediaNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys))
         {
-            return mediaCache.GetAtRoot();
+            return rootKeys.Select(x => mediaCache.GetById(false, x)).WhereNotNull();
         }
 
         IPublishedContent? parent = Guid.TryParse(childrenOf, out Guid parentKey)

src/Umbraco.Core/Cache/Refreshers/Implement/ContentCacheRefresher.cs

@@ -1,4 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
@@ -27,39 +27,6 @@
     private readonly IPublishStatusManagementService _publishStatusManagementService;
     private readonly IIdKeyMap _idKeyMap;
 
-    [Obsolete("Use the constructor with ICacheManager instead, scheduled for removal in V17.")]
-    public ContentCacheRefresher(
-        AppCaches appCaches,
-        IJsonSerializer serializer,
-        IIdKeyMap idKeyMap,
-        IDomainService domainService,
-        IEventAggregator eventAggregator,
-        ICacheRefresherNotificationFactory factory,
-        IDocumentUrlService documentUrlService,
-        IDomainCacheService domainCacheService,
-        IDocumentNavigationQueryService documentNavigationQueryService,
-        IDocumentNavigationManagementService documentNavigationManagementService,
-        IContentService contentService,
-        IPublishStatusManagementService publishStatusManagementService,
-        IDocumentCacheService documentCacheService)
-        : this(
-            appCaches,
-            serializer,
-            idKeyMap,
-            domainService,
-            eventAggregator,
-            factory,
-            documentUrlService,
-            domainCacheService,
-            documentNavigationQueryService,
-            documentNavigationManagementService,
-            contentService,
-            publishStatusManagementService,
-            documentCacheService,
-            StaticServiceProvider.Instance.GetRequiredService<ICacheManager>())
-    {
-    }
-
     public ContentCacheRefresher(
         AppCaches appCaches,
         IJsonSerializer serializer,

src/Umbraco.Core/Cache/Refreshers/Implement/MediaCacheRefresher.cs

@@ -1,4 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
@@ -22,31 +22,6 @@
     private readonly IMediaCacheService _mediaCacheService;
     private readonly ICacheManager _cacheManager;
 
-    [Obsolete("Use the constructor with ICacheManager instead, scheduled for removal in V17.")]
-    public MediaCacheRefresher(
-        AppCaches appCaches,
-        IJsonSerializer serializer,
-        IIdKeyMap idKeyMap,
-        IEventAggregator eventAggregator,
-        ICacheRefresherNotificationFactory factory,
-        IMediaNavigationQueryService mediaNavigationQueryService,
-        IMediaNavigationManagementService mediaNavigationManagementService,
-        IMediaService mediaService,
-        IMediaCacheService mediaCacheService)
-        : this(
-            appCaches,
-            serializer,
-            idKeyMap,
-            eventAggregator,
-            factory,
-            mediaNavigationQueryService,
-            mediaNavigationManagementService,
-            mediaService,
-            mediaCacheService,
-            StaticServiceProvider.Instance.GetRequiredService<ICacheManager>())
-    {
-    }
-
     public MediaCacheRefresher(
         AppCaches appCaches,
         IJsonSerializer serializer,

src/Umbraco.Core/DeliveryApi/ApiContentBuilderBase.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Models.DeliveryApi;
+using Umbraco.Cms.Core.Models.DeliveryApi;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Extensions;
 
@@ -12,19 +10,6 @@ public abstract class ApiContentBuilderBase<T>
     private readonly IApiContentNameProvider _apiContentNameProvider;
     private readonly IOutputExpansionStrategyAccessor _outputExpansionStrategyAccessor;
 
-    [Obsolete("Please use the constructor that takes all parameters. Scheduled for removal in Umbraco 17.")]
-    protected ApiContentBuilderBase(
-        IApiContentNameProvider apiContentNameProvider,
-        IApiContentRouteBuilder apiContentRouteBuilder,
-        IOutputExpansionStrategyAccessor outputExpansionStrategyAccessor)
-        : this(
-              apiContentNameProvider,
-              apiContentRouteBuilder,
-              outputExpansionStrategyAccessor,
-              StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>())
-    {
-    }
-
     protected ApiContentBuilderBase(
         IApiContentNameProvider apiContentNameProvider,
         IApiContentRouteBuilder apiContentRouteBuilder,

src/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollection.cs

@@ -1,7 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Editors;
 
@@ -17,17 +15,6 @@ public class DataValueReferenceFactoryCollection : BuilderCollectionBase<IDataVa
 
     private readonly ILogger<DataValueReferenceFactoryCollection> _logger;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DataValueReferenceFactoryCollection" /> class.
-    /// </summary>
-    /// <param name="items">The items.</param>
-    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 17.")]
-    public DataValueReferenceFactoryCollection(Func<IEnumerable<IDataValueReferenceFactory>> items)
-        : this(
-              items,
-              StaticServiceProvider.Instance.GetRequiredService<ILogger<DataValueReferenceFactoryCollection>>())
-    { }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="DataValueReferenceFactoryCollection" /> class.
     /// </summary>
@@ -159,17 +146,6 @@ private IEnumerable<UmbracoEntityReference> GetReferencesFromPropertyValues(IEnu
         return result;
     }
 
-    /// <summary>
-    /// Gets all relation type aliases that are automatically tracked.
-    /// </summary>
-    /// <param name="propertyEditors">The property editors.</param>
-    /// <returns>
-    /// All relation type aliases that are automatically tracked.
-    /// </returns>
-    [Obsolete("Use GetAllAutomaticRelationTypesAliases. This will be removed in Umbraco 15.")]
-    public ISet<string> GetAutomaticRelationTypesAliases(PropertyEditorCollection propertyEditors) =>
-        GetAllAutomaticRelationTypesAliases(propertyEditors);
-
     public ISet<string> GetAllAutomaticRelationTypesAliases(PropertyEditorCollection propertyEditors)
     {
         // Always add default automatic relation types

src/Umbraco.Core/PropertyEditors/Validators/EmailValidator.cs

@@ -14,15 +14,6 @@ public sealed class EmailValidator : IValueValidator
 {
     private readonly ILocalizedTextService _localizedTextService;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="EmailValidator"/> class.
-    /// </summary>
-    [Obsolete("Please use the constructor taking all parameters. Scheduled for removal in Umbraco 17.")]
-    public EmailValidator()
-        : this(StaticServiceProvider.Instance.GetRequiredService<ILocalizedTextService>())
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="EmailValidator"/> class.
     /// </summary>

src/Umbraco.Core/PropertyEditors/Validators/MultipleValueValidator.cs

@@ -14,15 +14,6 @@ public class MultipleValueValidator : IValueValidator
 {
     private readonly ILocalizedTextService _localizedTextService;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MultipleValueValidator"/> class.
-    /// </summary>
-    [Obsolete("Please use the constructor that takes all parameters. Scheduled for removal in Umbraco 17.")]
-    public MultipleValueValidator()
-        : this(StaticServiceProvider.Instance.GetRequiredService<ILocalizedTextService>())
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="MultipleValueValidator"/> class.
     /// </summary>

src/Umbraco.Core/PublishedCache/IPublishedCache.cs

@@ -25,16 +25,6 @@ public interface IPublishedCache
     /// <remarks>The value of <paramref name="preview" /> overrides defaults.</remarks>
     IPublishedContent? GetById(bool preview, Guid contentId);
 
-    /// <summary>
-    ///     Gets a content identified by its Udi identifier.
-    /// </summary>
-    /// <param name="preview">A value indicating whether to consider unpublished content.</param>
-    /// <param name="contentId">The content Udi identifier.</param>
-    /// <returns>The content, or null.</returns>
-    /// <remarks>The value of <paramref name="preview" /> overrides defaults.</remarks>
-    [Obsolete] // FIXME: Remove when replacing nucache
-    IPublishedContent? GetById(bool preview, Udi contentId);
-
     /// <summary>
     ///     Gets a content identified by its unique identifier.
     /// </summary>
@@ -50,49 +40,4 @@ public interface IPublishedCache
     /// <returns>The content, or null.</returns>
     /// <remarks>Considers published or unpublished content depending on defaults.</remarks>
     IPublishedContent? GetById(Guid contentId);
-
-    /// <summary>
-    ///     Gets a content identified by its unique identifier.
-    /// </summary>
-    /// <param name="contentId">The content unique identifier.</param>
-    /// <returns>The content, or null.</returns>
-    /// <remarks>Considers published or unpublished content depending on defaults.</remarks>
-    [Obsolete] // FIXME: Remove when replacing nucache
-    IPublishedContent? GetById(Udi contentId);
-
-    /// <summary>
-    ///     Gets contents at root.
-    /// </summary>
-    /// <param name="preview">A value indicating whether to consider unpublished content.</param>
-    /// <param name="culture">A culture.</param>
-    /// <returns>The contents.</returns>
-    /// <remarks>The value of <paramref name="preview" /> overrides defaults.</remarks>
-    [Obsolete("Scheduled for removal, use IDocumentNavigationQueryService instead in v17")]
-    IEnumerable<IPublishedContent> GetAtRoot(bool preview, string? culture = null);
-
-    /// <summary>
-    ///     Gets contents at root.
-    /// </summary>
-    /// <param name="culture">A culture.</param>
-    /// <returns>The contents.</returns>
-    /// <remarks>Considers published or unpublished content depending on defaults.</remarks>
-    [Obsolete("Scheduled for removal, use IDocumentNavigationQueryService instead in v17")]
-    IEnumerable<IPublishedContent> GetAtRoot(string? culture = null);
-
-    /// <summary>
-    ///     Gets a value indicating whether the cache contains published content.
-    /// </summary>
-    /// <param name="preview">A value indicating whether to consider unpublished content.</param>
-    /// <returns>A value indicating whether the cache contains published content.</returns>
-    /// <remarks>The value of <paramref name="preview" /> overrides defaults.</remarks>
-    [Obsolete("Scheduled for removal in v17")]
-    bool HasContent(bool preview);
-
-    /// <summary>
-    ///     Gets a value indicating whether the cache contains published content.
-    /// </summary>
-    /// <returns>A value indicating whether the cache contains published content.</returns>
-    /// <remarks>Considers published or unpublished content depending on defaults.</remarks>
-    [Obsolete("Scheduled for removal in v17")]
-    bool HasContent();
 }

src/Umbraco.Core/PublishedCache/IPublishedContentCache.cs

@@ -44,46 +44,6 @@ public interface IPublishedContentCache : IPublishedCache
     ///     <para>The value of <paramref name="preview" /> overrides defaults.</para>
     /// </remarks>
     [Obsolete]
-    IPublishedContent? GetByRoute(bool preview, string route, bool? hideTopLevelNode = null, string? culture = null);
-
-    /// <summary>
-    ///     Gets content identified by a route.
-    /// </summary>
-    /// <param name="route">The route</param>
-    /// <param name="hideTopLevelNode">A value forcing the HideTopLevelNode setting.</param>
-    /// <param name="culture">The culture</param>
-    /// <returns>The content, or null.</returns>
-    /// <remarks>
-    ///     <para>
-    ///         A valid route is either a simple path eg <c>/foo/bar/nil</c> or a root node id and a path, eg
-    ///         <c>123/foo/bar/nil</c>.
-    ///     </para>
-    ///     <para>
-    ///         If
-    ///         <paramref name="hideTopLevelNode" />
-    ///         is <c>null</c> then the settings value is used.
-    ///     </para>
-    ///     <para>Considers published or unpublished content depending on defaults.</para>
-    /// </remarks>
-    [Obsolete]
-    IPublishedContent? GetByRoute(string route, bool? hideTopLevelNode = null, string? culture = null);
-
-    /// <summary>
-    ///     Gets the route for a content identified by its unique identifier.
-    /// </summary>
-    /// <param name="preview">A value indicating whether to consider unpublished content.</param>
-    /// <param name="contentId">The content unique identifier.</param>
-    /// <param name="culture">The culture</param>
-    /// <returns>A special string formatted route path.</returns>
-    /// <remarks>
-    ///     <para>
-    ///         The resulting string is a special encoded route string that may contain the domain ID
-    ///         for the current route. If a domain is present the string will be prefixed with the domain ID integer, example:
-    ///         {domainId}/route-path-of-item
-    ///     </para>
-    ///     <para>The value of <paramref name="preview" /> overrides defaults.</para>
-    /// </remarks>
-    [Obsolete]
     string? GetRouteById(bool preview, int contentId, string? culture = null);
 
     /// <summary>

src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs

@@ -24,21 +24,10 @@ public PublishedCacheBase(IVariationContextAccessor variationContextAccessor, bo
     public IPublishedContent? GetById(Guid contentId)
         => GetById(PreviewDefault, contentId);
 
-    public abstract IPublishedContent? GetById(bool preview, Udi contentId);
-
-    public IPublishedContent? GetById(Udi contentId)
-        => GetById(PreviewDefault, contentId);
-
     public abstract bool HasById(bool preview, int contentId);
 
     public bool HasById(int contentId)
         => HasById(PreviewDefault, contentId);
 
     public abstract IEnumerable<IPublishedContent> GetAtRoot(bool preview, string? culture = null);
-
-    public IEnumerable<IPublishedContent> GetAtRoot(string? culture = null) => GetAtRoot(PreviewDefault, culture);
-
-    public abstract bool HasContent(bool preview);
-
-    public bool HasContent() => HasContent(PreviewDefault);
 }