Fix nullability of return types that can be non-null (#15927)

* Fix nullability of Children extension

* Fix nullability of methods throughout the CMS

* Fix return types of some methods that cannot return null

* Revert nullable changes to result of ConvertSourceToIntermediate for property editors (whilst some property editors we know won't return null, it seems more consistent to adhere to the base class and interface nullability definition).

* Updated new webhook events to align with new nullability definitions.

* Reverted content editing service updates to align with base classes.

* Applied collection nullability updates on content repository to interface.

* Reverted value converter updates to match interface.

* Applied further collection updates to interface.

* Aligned media service interface with implementation for nullability.

* Update from code review.

---------

Co-authored-by: Ivo van der Bruggen <[email protected]>
Co-authored-by: Ivo van der Bruggen <[email protected]>
Co-authored-by: Andy Butland <[email protected]>

Author: 4 people

src/Umbraco.Cms.Api.Common/Extensions/MethodInfoApiCommonExtensions.cs

@@ -8,11 +8,11 @@ namespace Umbraco.Extensions;
 public static class MethodInfoApiCommonExtensions
 {
 
-    public static string? GetMapToApiVersionAttributeValue(this MethodInfo methodInfo)
+    public static string GetMapToApiVersionAttributeValue(this MethodInfo methodInfo)
     {
         MapToApiVersionAttribute[] mapToApis = methodInfo.GetCustomAttributes(typeof(MapToApiVersionAttribute), inherit: true).Cast<MapToApiVersionAttribute>().ToArray();
 
-        return string.Join("|", mapToApis.SelectMany(x=>x.Versions));
+        return string.Join("|", mapToApis.SelectMany(x => x.Versions));
     }
 
     public static string? GetMapToApiAttributeValue(this MethodInfo methodInfo)

src/Umbraco.Core/DeliveryApi/ApiContentPathProvider.cs

@@ -11,6 +11,6 @@ public class ApiContentPathProvider : IApiContentPathProvider
     public ApiContentPathProvider(IPublishedUrlProvider publishedUrlProvider)
         => _publishedUrlProvider = publishedUrlProvider;
 
-    public virtual string? GetContentPath(IPublishedContent content, string? culture)
+    public virtual string GetContentPath(IPublishedContent content, string? culture)
         => _publishedUrlProvider.GetUrl(content, UrlMode.Relative, culture);
 }

src/Umbraco.Core/Dictionary/UmbracoCultureDictionary.cs

@@ -81,7 +81,7 @@ public DefaultCultureDictionary(CultureInfo specificCulture, ILocalizationServic
     /// </summary>
     /// <param name="key"></param>
     /// <returns></returns>
-    public string? this[string key]
+    public string this[string key]
     {
         get
         {

src/Umbraco.Core/Extensions/UriExtensions.cs

@@ -181,7 +181,7 @@ public static Uri MakeAbsolute(this Uri uri, Uri baseUri)
     public static Uri WithoutPort(this Uri uri) =>
         new Uri(uri.GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped));
 
-    private static string? GetSafeQuery(this Uri uri)
+    private static string GetSafeQuery(this Uri uri)
     {
         if (uri.IsAbsoluteUri)
         {

src/Umbraco.Core/Models/DictionaryItemExtensions.cs

@@ -10,7 +10,7 @@ public static class DictionaryItemExtensions
     /// <param name="d"></param>
     /// <param name="isoCode"></param>
     /// <returns></returns>
-    public static string? GetTranslatedValue(this IDictionaryItem d, string isoCode)
+    public static string GetTranslatedValue(this IDictionaryItem d, string isoCode)
     {
         IDictionaryTranslation? trans = d.Translations.FirstOrDefault(x => x.LanguageIsoCode == isoCode);
         return trans == null ? string.Empty : trans.Value;

src/Umbraco.Core/Models/ReadOnlyContentBaseAdapter.cs

@@ -25,7 +25,7 @@ private ReadOnlyContentBaseAdapter(IContentBase content) =>
 
     public int Level => _content.Level;
 
-    public string? Path => _content.Path;
+    public string Path => _content.Path;
 
     public int SortOrder => _content.SortOrder;
 

src/Umbraco.Core/Models/UserExtensions.cs

@@ -143,7 +143,7 @@ public static bool HasAccessToSensitiveData(this IUser user)
     /// <summary>
     ///     Calculate start nodes, combining groups' and user's, and excluding what's in the bin
     /// </summary>
-    public static int[]? CalculateAllowedLanguageIds(this IUser user, ILocalizationService localizationService)
+    public static int[] CalculateAllowedLanguageIds(this IUser user, ILocalizationService localizationService)
     {
         var hasAccessToAllLanguages = user.Groups.Any(x => x.HasAccessToAllLanguages);
 

src/Umbraco.Core/Persistence/Repositories/IContentRepository.cs

@@ -52,7 +52,7 @@ public interface IContentRepository<in TId, TEntity> : IReadWriteQueryRepository
     /// <summary>
     ///     Gets the recycle bin content.
     /// </summary>
-    IEnumerable<TEntity>? GetRecycleBin();
+    IEnumerable<TEntity> GetRecycleBin();
 
     /// <summary>
     ///     Gets the count of content items of a given content type.

src/Umbraco.Core/PropertyEditors/TextStringValueConverter.cs

@@ -57,6 +57,6 @@ public PropertyCacheLevel GetDeliveryApiPropertyCacheLevel(IPublishedPropertyTyp
     public Type GetDeliveryApiPropertyValueType(IPublishedPropertyType propertyType)
         => GetPropertyValueType(propertyType);
 
-    public object ConvertIntermediateToDeliveryApiObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview, bool expanding)
+    public object? ConvertIntermediateToDeliveryApiObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview, bool expanding)
         => ConvertIntermediateToObject(owner, propertyType, referenceCacheLevel, inter, preview);
 }

src/Umbraco.Core/PropertyEditors/ValueConverters/BigintValueTypeConverter.cs

@@ -1,4 +1,4 @@
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters;