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

Add nullability to core project

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-02-09 13:24:35 +01:00
parent 936dd38c55
commit b75eae01f3
259 changed files with 1219 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Extensions/ObjectExtensions.cs
View File

@@ -79,7 +79,7 @@ namespace Umbraco.Extensions
{
Attempt<object?> result = TryConvertTo(input, typeof(T));
if (result.Success.HasValue && result.Success.Value)
if (result.Success)
{
return Attempt<T>.Succeed((T?)result.Result);
}
@@ -173,7 +173,7 @@ namespace Umbraco.Extensions
var inner = input.TryConvertTo(underlying);
// And if successful, fall on through to rewrap in a nullable; if failed, pass on the exception
if (inner.Success.HasValue && inner.Success.Value)
if (inner.Success)
{
input = inner.Result; // Now fall on through...
}
@@ -608,10 +608,10 @@ namespace Umbraco.Extensions
/// <param name="value"></param>
/// <param name="type">The Type can only be a primitive type or Guid and byte[] otherwise an exception is thrown</param>
/// <returns></returns>
public static string? ToXmlString(this object value, Type type)
public static string ToXmlString(this object value, Type type)
{
if (value == null) return string.Empty;
if (type == typeof(string)) return (value.ToString().IsNullOrWhiteSpace() ? "" : value.ToString());
if (type == typeof(string)) return (value.ToString().IsNullOrWhiteSpace() ? "" : value.ToString()!);
if (type == typeof(bool)) return XmlConvert.ToString((bool)value);
if (type == typeof(byte)) return XmlConvert.ToString((byte)value);
if (type == typeof(char)) return XmlConvert.ToString((char)value);
@@ -640,7 +640,7 @@ namespace Umbraco.Extensions
/// <typeparam name="T"></typeparam>
/// <param name="value"></param>
/// <returns></returns>
public static string? ToXmlString<T>(this object value)
public static string ToXmlString<T>(this object value)
{
return value.ToXmlString(typeof (T));
}