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

Further NRT amends (#12363)

Browse Source 
* Amended nullability of base Deploy classes.

* Ensured ContentItemDisplay.Variants is non-nullable.

* Set IArtifactSignature.Dependencies to be non-nullable.

* Update template collection retrieval to be non-nullable.

* IMediaService.GetRootMedia to be non-nullable.

* Non-nullable collection for IMemberService.GetMembersByMemberType.

* Non-nullable collection for member role retrieval.

* Non-nullable collection for root dictionary items.

* Non-nullable collection for child dictionary items.

* Applied suggestions from code review

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

* Remove extra dot

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
This commit is contained in:
Andy Butland
2022-05-06 10:13:58 +02:00
committed by GitHub
parent 948992cc75
commit 63b77b7743
20 changed files with 67 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs
View File

@@ -504,7 +504,7 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
public ITemplate? Get(string? alias) => GetAll(alias)?.FirstOrDefault();
public IEnumerable<ITemplate>? GetAll(params string?[] aliases)
public IEnumerable<ITemplate> GetAll(params string?[] aliases)
{
//We must call the base (normal) GetAll method
// which is cached. This is a specialized method and unfortunately with the params[] it
@@ -515,26 +515,26 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
}
//return from base.GetAll, this is all cached
return base.GetMany()?.Where(x => aliases.WhereNotNull().InvariantContains(x.Alias));
return base.GetMany().Where(x => aliases.WhereNotNull().InvariantContains(x.Alias));
}
public IEnumerable<ITemplate>? GetChildren(int masterTemplateId)
public IEnumerable<ITemplate> GetChildren(int masterTemplateId)
{
//return from base.GetAll, this is all cached
ITemplate[]? all = base.GetMany()?.ToArray();
ITemplate[] all = base.GetMany().ToArray();
if (masterTemplateId <= 0)
{
return all?.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace());
return all.Where(x => x.MasterTemplateAlias.IsNullOrWhiteSpace());
}
ITemplate? parent = all?.FirstOrDefault(x => x.Id == masterTemplateId);
ITemplate? parent = all.FirstOrDefault(x => x.Id == masterTemplateId);
if (parent == null)
{
return Enumerable.Empty<ITemplate>();
}
IEnumerable<ITemplate>? children = all?.Where(x => x.MasterTemplateAlias.InvariantEquals(parent.Alias));
IEnumerable<ITemplate> children = all.Where(x => x.MasterTemplateAlias.InvariantEquals(parent.Alias));
return children;
}