Browse Source

Converter simplified.

release/4.x
Sebastian 5 years ago
parent
commit
f42d16422d
  1. 10
      backend/src/Squidex.Domain.Apps.Core.Model/Apps/Json/AppPatternsConverter.cs
  2. 38
      backend/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonAppPattern.cs

10
backend/src/Squidex.Domain.Apps.Core.Model/Apps/Json/AppPatternsConverter.cs

@ -17,11 +17,11 @@ namespace Squidex.Domain.Apps.Core.Apps.Json
{
protected override void WriteValue(JsonWriter writer, AppPatterns value, JsonSerializer serializer)
{
var json = new Dictionary<Guid, JsonAppPattern>(value.Count);
var json = new Dictionary<Guid, AppPattern>(value.Count);
foreach (var (key, appPattern) in value)
foreach (var (key, pattern) in value)
{
json.Add(key, new JsonAppPattern(appPattern));
json.Add(key, pattern);
}
serializer.Serialize(writer, json);
@ -29,9 +29,9 @@ namespace Squidex.Domain.Apps.Core.Apps.Json
protected override AppPatterns ReadValue(JsonReader reader, Type objectType, JsonSerializer serializer)
{
var json = serializer.Deserialize<Dictionary<Guid, JsonAppPattern>>(reader)!;
var json = serializer.Deserialize<Dictionary<Guid, AppPattern>>(reader)!;
return new AppPatterns(json.ToDictionary(x => x.Key, x => x.Value.ToPattern()));
return new AppPatterns(json);
}
}
}

38
backend/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonAppPattern.cs

@ -1,38 +0,0 @@
// ==========================================================================
// Squidex Headless CMS
// ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschränkt)
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using Newtonsoft.Json;
using Squidex.Infrastructure.Reflection;
namespace Squidex.Domain.Apps.Core.Apps.Json
{
public class JsonAppPattern
{
[JsonProperty]
public string Name { get; set; }
[JsonProperty]
public string Pattern { get; set; }
[JsonProperty]
public string? Message { get; set; }
public JsonAppPattern()
{
}
public JsonAppPattern(AppPattern pattern)
{
SimpleMapper.Map(pattern, this);
}
public AppPattern ToPattern()
{
return new AppPattern(Name, Pattern, Message);
}
}
}
Loading…
Cancel
Save