yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add nullability to nucache & lucene projects

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-03-30 13:34:56 +02:00
parent b52c4e50cf
commit 05a08bef63
105 changed files with 736 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.PublishedCache.NuCache/Navigable/INavigableData.cs
View File

@@ -5,7 +5,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable
{
internal interface INavigableData
{
IPublishedContent GetById(bool preview, int contentId);
IPublishedContent? GetById(bool preview, int contentId);
IEnumerable<IPublishedContent> GetAtRoot(bool preview);
}
}

8
src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContent.cs
View File

@@ -8,7 +8,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable
internal class NavigableContent : INavigableContent
{
private readonly PublishedContent _content;
private readonly string[] _builtInValues;
private readonly string?[] _builtInValues;
public NavigableContent(IPublishedContent content)
{
@@ -33,7 +33,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable
};
}
private string XmlString(int index, object value)
private string? XmlString(int index, object? value)
{
if (value == null) return string.Empty;
var field = Type.FieldTypes[index];
@@ -51,9 +51,9 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable
public INavigableContentType Type => NavigableContentType.GetContentType(_content.ContentType);
// returns all child ids, will be filtered by the source
public IList<int> ChildIds => _content.ChildIds;
public IList<int>? ChildIds => _content.ChildIds;
public object Value(int index)
public object? Value(int index)
{
if (index < 0)
throw new ArgumentOutOfRangeException(nameof(index));

2
src/Umbraco.PublishedCache.NuCache/Navigable/NavigableContentType.cs
View File

@@ -14,7 +14,9 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable
// called by the conditional weak table -- must be public
// ReSharper disable EmptyConstructor
#pragma warning disable CS8618
public NavigableContentType()
#pragma warning restore CS8618
// ReSharper restore EmptyConstructor
{ }

4
src/Umbraco.PublishedCache.NuCache/Navigable/NavigablePropertyType.cs
View File

@@ -5,13 +5,13 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable
{
internal class NavigablePropertyType : INavigableFieldType
{
public NavigablePropertyType(string name, Func<object, string> xmlStringConverter = null)
public NavigablePropertyType(string name, Func<object, string>? xmlStringConverter = null)
{
Name = name;
XmlStringConverter = xmlStringConverter;
}
public string Name { get; }
public Func<object, string> XmlStringConverter { get; }
public Func<object, string>? XmlStringConverter { get; }
}
}

2
src/Umbraco.PublishedCache.NuCache/Navigable/RootContent.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable
public IList<int> ChildIds => _childIds;
public object Value(int index)
public object? Value(int index)
{
// only id has a value
return index == 0 ? "-1" : null;

2
src/Umbraco.PublishedCache.NuCache/Navigable/Source.cs
View File

@@ -18,7 +18,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Navigable
_root = new RootContent(contentAtRoot.Select(x => x.Id));
}
public INavigableContent Get(int id)
public INavigableContent? Get(int id)
{
// wrap in a navigable content