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

Merge branch 'v10/feature/nullable-reference-types-in-Umbraco-Core' into v10/feature/nullable-reference-types-in-Umbraco-Infrastructure

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-02-21 12:51:49 +01:00
parent f69d264d8d 57f32100cb
commit 315e8d6fe6
13 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/AttemptOfTResult.cs
View File

@@ -133,7 +133,7 @@ namespace Umbraco.Cms.Core
/// </summary>
/// <param name="a"></param>
/// <returns></returns>
public static implicit operator bool?(Attempt<TResult> a)
public static implicit operator bool(Attempt<TResult> a)
{
return a.Success;
}

16
src/Umbraco.Core/DependencyInjection/ServiceCollectionExtensions.cs
View File

@@ -7,6 +7,20 @@ namespace Umbraco.Extensions
{
public static class ServiceCollectionExtensions
{
/// <summary>
/// Adds a service of type <typeparamref name="TService"/> with an implementation type of <typeparamref name="TImplementing"/> to the specified <see cref="IServiceCollection"/>.
/// </summary>
/// <remarks>
/// Removes all previous registrations for the type <typeparamref name="TService"/>.
/// </remarks>
public static void AddUnique<TService, TImplementing>(
this IServiceCollection services)
where TService : class
where TImplementing : class, TService
{
AddUnique<TService, TImplementing>(services, ServiceLifetime.Singleton);
}
/// <summary>
/// Adds a service of type <typeparamref name="TService"/> with an implementation type of <typeparamref name="TImplementing"/> to the specified <see cref="IServiceCollection"/>.
/// </summary>
@@ -15,7 +29,7 @@ namespace Umbraco.Extensions
/// </remarks>
public static void AddUnique<TService, TImplementing>(
this IServiceCollection services,
ServiceLifetime lifetime = ServiceLifetime.Singleton)
ServiceLifetime lifetime)
where TService : class
where TImplementing : class, TService
{

2
src/Umbraco.Core/Models/ContentEditing/PropertyTypeValidation.cs
View File

@@ -9,7 +9,7 @@ namespace Umbraco.Cms.Core.Models.ContentEditing
public class PropertyTypeValidation
{
[DataMember(Name = "mandatory")]
public bool? Mandatory { get; set; }
public bool Mandatory { get; set; }
[DataMember(Name = "mandatoryMessage")]
public string? MandatoryMessage { get; set; }

2
src/Umbraco.Core/Models/IPropertyType.cs
View File

@@ -46,7 +46,7 @@ namespace Umbraco.Cms.Core.Models
/// <summary>
/// Gets of sets a value indicating whether a value for this property type is required.
/// </summary>
bool? Mandatory { get; set; }
bool Mandatory { get; set; }
/// <summary>
/// Gets or sets a value indicating whether the label of this property type should be displayed on top.

4
src/Umbraco.Core/Models/Mapping/ContentPropertyDisplayMapper.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Cms.Core.Models.Mapping
{
base.Map(originalProp, dest, context);
var config = DataTypeService.GetDataType(originalProp.PropertyType?.DataTypeId).Configuration;
var config = originalProp.PropertyType is null ? null : DataTypeService.GetDataType(originalProp.PropertyType.DataTypeId).Configuration;
// TODO: IDataValueEditor configuration - general issue
// GetValueEditor() returns a non-configured IDataValueEditor
@@ -48,7 +48,7 @@ namespace Umbraco.Cms.Core.Models.Mapping
dest.LabelOnTop = originalProp.PropertyType?.LabelOnTop;
//add the validation information
dest.Validation.Mandatory = originalProp.PropertyType?.Mandatory;
dest.Validation.Mandatory = originalProp.PropertyType?.Mandatory ?? false;
dest.Validation.MandatoryMessage = originalProp.PropertyType?.MandatoryMessage;
dest.Validation.Pattern = originalProp.PropertyType?.ValidationRegExp;
dest.Validation.PatternMessage = originalProp.PropertyType?.ValidationRegExpMessage;

2
src/Umbraco.Core/Models/Mapping/ContentPropertyDtoMapper.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Cms.Core.Models.Mapping
dest.ValidationRegExpMessage = property.PropertyType?.ValidationRegExpMessage;
dest.Description = property.PropertyType?.Description;
dest.Label = property.PropertyType?.Name;
dest.DataType = DataTypeService.GetDataType(property.PropertyType?.DataTypeId);
dest.DataType = property.PropertyType is null ? null : DataTypeService.GetDataType(property.PropertyType.DataTypeId);
dest.LabelOnTop = property.PropertyType?.LabelOnTop;
}
}

2
src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -317,7 +317,7 @@ namespace Umbraco.Cms.Core.Models.Mapping
target.Name = source.Label;
target.DataTypeId = source.DataTypeId;
target.DataTypeKey = source.DataTypeKey;
target.Mandatory = source.Validation?.Mandatory;
target.Mandatory = source.Validation?.Mandatory ?? false;
target.MandatoryMessage = source.Validation?.MandatoryMessage;
target.ValidationRegExp = source.Validation?.Pattern;
target.ValidationRegExpMessage = source.Validation?.PatternMessage;

4
src/Umbraco.Core/Models/PropertyTagsExtensions.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
@@ -25,7 +25,7 @@ namespace Umbraco.Extensions
var tagAttribute = editor?.GetTagAttribute();
if (tagAttribute == null) return null;
var configurationObject = dataTypeService.GetDataType(property.PropertyType?.DataTypeId).Configuration;
var configurationObject = property.PropertyType is null ? null : dataTypeService.GetDataType(property.PropertyType.DataTypeId).Configuration;
var configuration = ConfigurationEditor.ConfigurationAs<TagConfiguration>(configurationObject);
if (configuration?.Delimiter == default && configuration?.Delimiter is not null)

4
src/Umbraco.Core/Models/PropertyType.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Cms.Core.Models
private Lazy<int>? _propertyGroupId;
private string _propertyEditorAlias;
private ValueStorageType _valueStorageType;
private bool? _mandatory;
private bool _mandatory;
private string? _mandatoryMessage;
private int _sortOrder;
private string? _validationRegExp;
@@ -179,7 +179,7 @@ namespace Umbraco.Cms.Core.Models
/// <inheritdoc />
[DataMember]
public bool? Mandatory
public bool Mandatory
{
get => _mandatory;
set => SetPropertyValueAndDetectChanges(value, ref _mandatory, nameof(Mandatory));

2
src/Umbraco.Core/Services/IDataTypeService.cs
View File

@@ -39,7 +39,7 @@ namespace Umbraco.Cms.Core.Services
/// </summary>
/// <param name="id">Id of the <see cref="IDataType"/></param>
/// <returns><see cref="IDataType"/></returns>
IDataType GetDataType(int? id);
IDataType GetDataType(int id);
/// <summary>
/// Gets a <see cref="IDataType"/> by its unique guid Id

4
src/Umbraco.Core/Services/PropertyValidationService.cs
View File

@@ -40,7 +40,7 @@ namespace Umbraco.Cms.Core.Services
var editor = _propertyEditors[propertyType.PropertyEditorAlias];
if (editor == null) throw new InvalidOperationException("No property editor found by alias " + propertyType.PropertyEditorAlias);
return ValidatePropertyValue(editor, dataType, postedValue, propertyType.Mandatory ?? false, propertyType.ValidationRegExp, propertyType.MandatoryMessage, propertyType.ValidationRegExpMessage);
return ValidatePropertyValue(editor, dataType, postedValue, propertyType.Mandatory, propertyType.ValidationRegExp, propertyType.MandatoryMessage, propertyType.ValidationRegExpMessage);
}
/// <inheritdoc />
@@ -192,7 +192,7 @@ namespace Umbraco.Cms.Core.Services
}
var configuration = _dataTypeService.GetDataType(propertyType.DataTypeId).Configuration;
var valueEditor = editor.GetValueEditor(configuration);
return !valueEditor.Validate(value, propertyType.Mandatory ?? false, propertyType.ValidationRegExp).Any();
return !valueEditor.Validate(value, propertyType.Mandatory, propertyType.ValidationRegExp).Any();
}
}
}

2
src/Umbraco.Infrastructure/Persistence/Factories/PropertyGroupFactory.cs
View File

@@ -131,7 +131,7 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Factories
ContentTypeId = contentTypeId,
DataTypeId = propertyType.DataTypeId,
Description = propertyType.Description,
Mandatory = propertyType.Mandatory ?? false,
Mandatory = propertyType.Mandatory,
MandatoryMessage = propertyType.MandatoryMessage,
Name = propertyType.Name,
SortOrder = propertyType.SortOrder,

8
src/Umbraco.Infrastructure/Services/Implement/DataTypeService.cs
View File

@@ -269,15 +269,11 @@ namespace Umbraco.Cms.Core.Services.Implement
/// </summary>
/// <param name="id">Id of the <see cref="IDataType"/></param>
/// <returns><see cref="IDataType"/></returns>
public IDataType GetDataType(int? id)
public IDataType GetDataType(int id)
{
if (id is null)
{
return null;
}
using (var scope = ScopeProvider.CreateScope(autoComplete: true))
{
var dataType = _dataTypeRepository.Get(id.Value);
var dataType = _dataTypeRepository.Get(id);
ConvertMissingEditorOfDataTypeToLabel(dataType);
return dataType;
}