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

Merge remote-tracking branch 'origin/v13/dev' into release/13.0

Browse Source
This commit is contained in:
Bjarke Berg
2023-10-31 12:31:26 +01:00
parent 2cf839f686 eb355f4ab6
commit 5665ad2b75
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
View File

@@ -28,7 +28,7 @@ namespace Umbraco.Cms.Core.PropertyEditors;
Icon = "icon-thumbnail-list",
ValueEditorIsReusable = false,
IsDeprecated = true)]
[Obsolete("Nested content is obsolete, will be removed in V13")]
[Obsolete("Nested content is obsolete, will be removed in Umbraco 14")]
public class NestedContentPropertyEditor : DataEditor
{
public const string ContentTypeAliasPropertyKey = "ncContentTypeAlias";
@@ -36,7 +36,7 @@ public class NestedContentPropertyEditor : DataEditor
private readonly IIOHelper _ioHelper;
private readonly INestedContentPropertyIndexValueFactory _nestedContentPropertyIndexValueFactory;
[Obsolete("Use non-obsoleted ctor. This will be removed in Umbraco 12.")]
[Obsolete("Use non-obsoleted ctor. This will be removed in Umbraco 14.")]
public NestedContentPropertyEditor(
IDataValueEditorFactory dataValueEditorFactory,
IIOHelper ioHelper)
@@ -44,7 +44,7 @@ public class NestedContentPropertyEditor : DataEditor
{
}
[Obsolete("Use non-obsoleted ctor. This will be removed in Umbraco 13.")]
[Obsolete("Use non-obsoleted ctor. This will be removed in Umbraco 14.")]
public NestedContentPropertyEditor(
IDataValueEditorFactory dataValueEditorFactory,
IIOHelper ioHelper,

6
src/Umbraco.Infrastructure/Serialization/ConfigurationEditorJsonSerializer.cs
View File

@@ -10,10 +10,8 @@ public class ConfigurationEditorJsonSerializer : JsonNetSerializer, IConfigurati
{
public ConfigurationEditorJsonSerializer()
{
JsonSerializerSettings.Converters.Add(new FuzzyBooleanConverter());
JsonSerializerSettings.ContractResolver = new ConfigurationCustomContractResolver();
JsonSerializerSettings.Formatting = Formatting.None;
JsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore;
Settings.Converters.Add(new FuzzyBooleanConverter());
Settings.ContractResolver = new ConfigurationCustomContractResolver();
}
private class ConfigurationCustomContractResolver : DefaultContractResolver

11
src/Umbraco.Infrastructure/Serialization/JsonNetSerializer.cs
View File

@@ -7,23 +7,20 @@ namespace Umbraco.Cms.Infrastructure.Serialization;
public class JsonNetSerializer : IJsonSerializer
{
protected static readonly JsonSerializerSettings JsonSerializerSettings = new()
protected JsonSerializerSettings Settings { get; } = new()
{
Converters = new List<JsonConverter> { new StringEnumConverter() },
Formatting = Formatting.None,
NullValueHandling = NullValueHandling.Ignore,
};
public string Serialize(object? input) => JsonConvert.SerializeObject(input, JsonSerializerSettings);
public string Serialize(object? input) => JsonConvert.SerializeObject(input, Settings);
public T? Deserialize<T>(string input) => JsonConvert.DeserializeObject<T>(input, JsonSerializerSettings);
public T? Deserialize<T>(string input) => JsonConvert.DeserializeObject<T>(input, Settings);
public T? DeserializeSubset<T>(string input, string key)
{
if (key == null)
{
throw new ArgumentNullException(nameof(key));
}
ArgumentNullException.ThrowIfNull(key);
JObject? root = Deserialize<JObject>(input);
JToken? jToken = root?.SelectToken(key);

5
tests/Umbraco.Tests.Integration/Umbraco.Core/Services/WebhookLogServiceTests.cs
View File

@@ -1,4 +1,5 @@
using NUnit.Framework;
using System.Globalization;
using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
@@ -37,7 +38,7 @@ public class WebhookLogServiceTests : UmbracoIntegrationTest
Assert.IsNotEmpty(webhookLogsPaged.Items);
Assert.AreEqual(1, webhookLogsPaged.Items.Count());
var webHookLog = webhookLogsPaged.Items.First();
Assert.AreEqual(createdWebhookLog.Date, webHookLog.Date);
Assert.AreEqual(createdWebhookLog.Date.ToString(CultureInfo.InvariantCulture), webHookLog.Date.ToString(CultureInfo.InvariantCulture));
Assert.AreEqual(createdWebhookLog.EventName, webHookLog.EventName);
Assert.AreEqual(createdWebhookLog.RequestBody, webHookLog.RequestBody);
Assert.AreEqual(createdWebhookLog.ResponseBody, webHookLog.ResponseBody);