From 4e5067ad1babe4ffe136b4cd4110b1e9e38a90b2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 21 May 2018 22:39:40 +0200 Subject: [PATCH] Use interface when possible. --- .../EnrichContent/ContentEnricher.cs | 2 +- .../EnrichContent/DefaultValueFactory.cs | 2 +- .../GenerateJsonSchema/JsonSchemaExtensions.cs | 2 +- .../ValidateContent/FieldExtensions.cs | 4 ++-- .../ValidateContent/ValidatorsFactory.cs | 2 +- .../Operations/ValidateContent/ValidationTestExtensions.cs | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/ContentEnricher.cs b/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/ContentEnricher.cs index ab618c783..2460a2c00 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/ContentEnricher.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/ContentEnricher.cs @@ -50,7 +50,7 @@ namespace Squidex.Domain.Apps.Core.EnrichContent } } - private static void Enrich(Field field, ContentFieldData fieldData, IFieldPartitionItem partitionItem) + private static void Enrich(IField field, ContentFieldData fieldData, IFieldPartitionItem partitionItem) { Guard.NotNull(fieldData, nameof(fieldData)); diff --git a/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/DefaultValueFactory.cs b/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/DefaultValueFactory.cs index 879473fbc..898a98431 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/DefaultValueFactory.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/DefaultValueFactory.cs @@ -22,7 +22,7 @@ namespace Squidex.Domain.Apps.Core.EnrichContent this.now = now; } - public static JToken CreateDefaultValue(Field field, Instant now) + public static JToken CreateDefaultValue(IField field, Instant now) { Guard.NotNull(field, nameof(field)); diff --git a/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs b/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs index ff78f3e64..74f1d00fb 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs @@ -47,7 +47,7 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema return jsonSchema; } - public static JsonProperty CreateProperty(Field field) + public static JsonProperty CreateProperty(IField field) { var jsonProperty = new JsonProperty { IsRequired = field.RawProperties.IsRequired, Type = JsonObjectType.Object }; diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/FieldExtensions.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/FieldExtensions.cs index 7106971e1..ac2c46ca3 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/FieldExtensions.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/FieldExtensions.cs @@ -17,7 +17,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent { public static class FieldExtensions { - public static void AddError(this ConcurrentBag errors, string message, Field field, IFieldPartitionItem partitionItem = null) + public static void AddError(this ConcurrentBag errors, string message, IField field, IFieldPartitionItem partitionItem = null) { AddError(errors, message, !string.IsNullOrWhiteSpace(field.RawProperties.Label) ? field.RawProperties.Label : field.Name, field.Name, partitionItem); } @@ -37,7 +37,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent errors.Add(new ValidationError(message.Replace("", displayName), fieldName)); } - public static async Task ValidateAsync(this Field field, JToken value, ValidationContext context, Action addError) + public static async Task ValidateAsync(this IField field, JToken value, ValidationContext context, Action addError) { try { diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidatorsFactory.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidatorsFactory.cs index f6166a617..330c3f1bb 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidatorsFactory.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidatorsFactory.cs @@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent { } - public static IEnumerable CreateValidators(Field field) + public static IEnumerable CreateValidators(IField field) { Guard.NotNull(field, nameof(field)); diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ValidationTestExtensions.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ValidationTestExtensions.cs index 8904fa3df..acbd2c373 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ValidationTestExtensions.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ValidationTestExtensions.cs @@ -33,12 +33,12 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return validator.ValidateAsync(value, (context ?? ValidContext).Optional(true), errors.Add); } - public static Task ValidateAsync(this Field field, JToken value, IList errors, ValidationContext context = null) + public static Task ValidateAsync(this IField field, JToken value, IList errors, ValidationContext context = null) { return field.ValidateAsync(value, context ?? ValidContext, errors.Add); } - public static Task ValidateOptionalAsync(this Field field, JToken value, IList errors, ValidationContext context = null) + public static Task ValidateOptionalAsync(this IField field, JToken value, IList errors, ValidationContext context = null) { return field.ValidateAsync(value, (context ?? ValidContext).Optional(true), errors.Add); }