-Added PatternProperties, ExclusiveMinimum and ExclusiveMaximum support to JSON schema
This commit is contained in:
@@ -89,9 +89,9 @@ namespace Newtonsoft.Json.Schema
|
||||
/// <value>The maximum length.</value>
|
||||
public int? MaximumLength { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the maximum decimals.
|
||||
/// Gets or sets a number that the value should be divisble by.
|
||||
/// </summary>
|
||||
/// <value>The maximum decimals.</value>
|
||||
/// <value>A number that the value should be divisble by.</value>
|
||||
public double? DivisibleBy { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the minimum.
|
||||
@@ -104,6 +104,16 @@ namespace Newtonsoft.Json.Schema
|
||||
/// <value>The maximum.</value>
|
||||
public double? Maximum { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets a flag indicating whether the value can not equal the number defined by the "minimum" attribute.
|
||||
/// </summary>
|
||||
/// <value>A flag indicating whether the value can not equal the number defined by the "minimum" attribute.</value>
|
||||
public bool? ExclusiveMinimum { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets a flag indicating whether the value can not equal the number defined by the "maximum" attribute.
|
||||
/// </summary>
|
||||
/// <value>A flag indicating whether the value can not equal the number defined by the "maximum" attribute.</value>
|
||||
public bool? ExclusiveMaximum { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the minimum number of items.
|
||||
/// </summary>
|
||||
/// <value>The minimum number of items.</value>
|
||||
@@ -129,6 +139,11 @@ namespace Newtonsoft.Json.Schema
|
||||
/// <value>The <see cref="JsonSchema"/> of additional properties.</value>
|
||||
public JsonSchema AdditionalProperties { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the pattern properties.
|
||||
/// </summary>
|
||||
/// <value>The pattern properties.</value>
|
||||
public IDictionary<string, JsonSchema> PatternProperties { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether additional properties are allowed.
|
||||
/// </summary>
|
||||
/// <value>
|
||||
|
||||
@@ -146,6 +146,9 @@ namespace Newtonsoft.Json.Schema
|
||||
case JsonSchemaConstants.AdditionalPropertiesPropertyName:
|
||||
ProcessAdditionalProperties();
|
||||
break;
|
||||
case JsonSchemaConstants.PatternPropertiesPropertyName:
|
||||
ProcessPatternProperties();
|
||||
break;
|
||||
case JsonSchemaConstants.RequiredPropertyName:
|
||||
CurrentSchema.Required = (bool)_reader.Value;
|
||||
break;
|
||||
@@ -161,6 +164,12 @@ namespace Newtonsoft.Json.Schema
|
||||
case JsonSchemaConstants.MaximumPropertyName:
|
||||
CurrentSchema.Maximum = Convert.ToDouble(_reader.Value, CultureInfo.InvariantCulture);
|
||||
break;
|
||||
case JsonSchemaConstants.ExclusiveMinimumPropertyName:
|
||||
CurrentSchema.ExclusiveMinimum = (bool)_reader.Value;
|
||||
break;
|
||||
case JsonSchemaConstants.ExclusiveMaximumPropertyName:
|
||||
CurrentSchema.ExclusiveMaximum = (bool)_reader.Value;
|
||||
break;
|
||||
case JsonSchemaConstants.MaximumLengthPropertyName:
|
||||
CurrentSchema.MaximumLength = Convert.ToInt32(_reader.Value, CultureInfo.InvariantCulture);
|
||||
break;
|
||||
@@ -311,6 +320,27 @@ namespace Newtonsoft.Json.Schema
|
||||
CurrentSchema.AdditionalProperties = BuildSchema();
|
||||
}
|
||||
|
||||
private void ProcessPatternProperties()
|
||||
{
|
||||
Dictionary<string, JsonSchema> patternProperties = new Dictionary<string, JsonSchema>();
|
||||
|
||||
if (_reader.TokenType != JsonToken.StartObject)
|
||||
throw new Exception("Expected start object token.");
|
||||
|
||||
while (_reader.Read() && _reader.TokenType != JsonToken.EndObject)
|
||||
{
|
||||
string propertyName = Convert.ToString(_reader.Value, CultureInfo.InvariantCulture);
|
||||
_reader.Read();
|
||||
|
||||
if (patternProperties.ContainsKey(propertyName))
|
||||
throw new Exception("Property {0} has already been defined in schema.".FormatWith(CultureInfo.InvariantCulture, propertyName));
|
||||
|
||||
patternProperties.Add(propertyName, BuildSchema());
|
||||
}
|
||||
|
||||
CurrentSchema.PatternProperties = patternProperties;
|
||||
}
|
||||
|
||||
private void ProcessItems()
|
||||
{
|
||||
CurrentSchema.Items = new List<JsonSchema>();
|
||||
|
||||
@@ -36,11 +36,14 @@ namespace Newtonsoft.Json.Schema
|
||||
public const string PropertiesPropertyName = "properties";
|
||||
public const string ItemsPropertyName = "items";
|
||||
public const string RequiredPropertyName = "required";
|
||||
public const string PatternPropertiesPropertyName = "patternProperties";
|
||||
public const string AdditionalPropertiesPropertyName = "additionalProperties";
|
||||
public const string RequiresPropertyName = "requires";
|
||||
public const string IdentityPropertyName = "identity";
|
||||
public const string MinimumPropertyName = "minimum";
|
||||
public const string MaximumPropertyName = "maximum";
|
||||
public const string ExclusiveMinimumPropertyName = "exclusiveMinimum";
|
||||
public const string ExclusiveMaximumPropertyName = "exclusiveMaximum";
|
||||
public const string MinimumItemsPropertyName = "minItems";
|
||||
public const string MaximumItemsPropertyName = "maxItems";
|
||||
public const string PatternPropertyName = "pattern";
|
||||
|
||||
@@ -40,11 +40,14 @@ namespace Newtonsoft.Json.Schema
|
||||
public double? DivisibleBy { get; set; }
|
||||
public double? Minimum { get; set; }
|
||||
public double? Maximum { get; set; }
|
||||
public bool ExclusiveMinimum { get; set; }
|
||||
public bool ExclusiveMaximum { get; set; }
|
||||
public int? MinimumItems { get; set; }
|
||||
public int? MaximumItems { get; set; }
|
||||
public IList<string> Patterns { get; set; }
|
||||
public IList<JsonSchemaModel> Items { get; set; }
|
||||
public IDictionary<string, JsonSchemaModel> Properties { get; set; }
|
||||
public IDictionary<string, JsonSchemaModel> PatternProperties { get; set; }
|
||||
public JsonSchemaModel AdditionalProperties { get; set; }
|
||||
public bool AllowAdditionalProperties { get; set; }
|
||||
public IList<JToken> Enum { get; set; }
|
||||
@@ -83,6 +86,9 @@ namespace Newtonsoft.Json.Schema
|
||||
|
||||
model.Minimum = MathUtils.Max(model.Minimum, schema.Minimum);
|
||||
model.Maximum = MathUtils.Max(model.Maximum, schema.Maximum);
|
||||
model.ExclusiveMinimum = model.ExclusiveMinimum || (schema.ExclusiveMinimum ?? false);
|
||||
model.ExclusiveMaximum = model.ExclusiveMaximum || (schema.ExclusiveMaximum ?? false);
|
||||
|
||||
model.MinimumItems = MathUtils.Max(model.MinimumItems, schema.MinimumItems);
|
||||
model.MaximumItems = MathUtils.Min(model.MaximumItems, schema.MaximumItems);
|
||||
model.AllowAdditionalProperties = model.AllowAdditionalProperties && schema.AllowAdditionalProperties;
|
||||
|
||||
@@ -71,13 +71,9 @@ namespace Newtonsoft.Json.Schema
|
||||
|
||||
_nodes.Add(currentNode);
|
||||
|
||||
if (schema.Properties != null)
|
||||
{
|
||||
foreach (KeyValuePair<string, JsonSchema> property in schema.Properties)
|
||||
{
|
||||
AddProperty(currentNode, property.Key, property.Value);
|
||||
}
|
||||
}
|
||||
AddProperties(schema.Properties, currentNode.Properties);
|
||||
|
||||
AddProperties(schema.PatternProperties, currentNode.PatternProperties);
|
||||
|
||||
if (schema.Items != null)
|
||||
{
|
||||
@@ -96,12 +92,23 @@ namespace Newtonsoft.Json.Schema
|
||||
return currentNode;
|
||||
}
|
||||
|
||||
public void AddProperty(JsonSchemaNode parentNode, string propertyName, JsonSchema schema)
|
||||
public void AddProperties(IDictionary<string, JsonSchema> source, IDictionary<string, JsonSchemaNode> target)
|
||||
{
|
||||
if (source != null)
|
||||
{
|
||||
foreach (KeyValuePair<string, JsonSchema> property in source)
|
||||
{
|
||||
AddProperty(target, property.Key, property.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void AddProperty(IDictionary<string, JsonSchemaNode> target, string propertyName, JsonSchema schema)
|
||||
{
|
||||
JsonSchemaNode propertyNode;
|
||||
parentNode.Properties.TryGetValue(propertyName, out propertyNode);
|
||||
target.TryGetValue(propertyName, out propertyNode);
|
||||
|
||||
parentNode.Properties[propertyName] = AddSchema(propertyNode, schema);
|
||||
target[propertyName] = AddSchema(propertyNode, schema);
|
||||
}
|
||||
|
||||
public void AddItem(JsonSchemaNode parentNode, int index, JsonSchema schema)
|
||||
@@ -143,6 +150,13 @@ namespace Newtonsoft.Json.Schema
|
||||
|
||||
model.Properties[property.Key] = BuildNodeModel(property.Value);
|
||||
}
|
||||
foreach (KeyValuePair<string, JsonSchemaNode> property in node.PatternProperties)
|
||||
{
|
||||
if (model.PatternProperties == null)
|
||||
model.PatternProperties = new Dictionary<string, JsonSchemaModel>();
|
||||
|
||||
model.PatternProperties[property.Key] = BuildNodeModel(property.Value);
|
||||
}
|
||||
for (int i = 0; i < node.Items.Count; i++)
|
||||
{
|
||||
if (model.Items == null)
|
||||
|
||||
@@ -35,6 +35,7 @@ namespace Newtonsoft.Json.Schema
|
||||
public string Id { get; private set; }
|
||||
public ReadOnlyCollection<JsonSchema> Schemas { get; private set; }
|
||||
public Dictionary<string, JsonSchemaNode> Properties { get; private set; }
|
||||
public Dictionary<string, JsonSchemaNode> PatternProperties { get; private set; }
|
||||
public List<JsonSchemaNode> Items { get; private set; }
|
||||
public JsonSchemaNode AdditionalProperties { get; set; }
|
||||
|
||||
@@ -42,6 +43,7 @@ namespace Newtonsoft.Json.Schema
|
||||
{
|
||||
Schemas = new ReadOnlyCollection<JsonSchema>(new []{ schema });
|
||||
Properties = new Dictionary<string, JsonSchemaNode>();
|
||||
PatternProperties = new Dictionary<string, JsonSchemaNode>();
|
||||
Items = new List<JsonSchemaNode>();
|
||||
|
||||
Id = GetId(Schemas);
|
||||
@@ -51,6 +53,7 @@ namespace Newtonsoft.Json.Schema
|
||||
{
|
||||
Schemas = new ReadOnlyCollection<JsonSchema>(source.Schemas.Union(new[] { schema }).ToList());
|
||||
Properties = new Dictionary<string, JsonSchemaNode>(source.Properties);
|
||||
PatternProperties = new Dictionary<string, JsonSchemaNode>(source.PatternProperties);
|
||||
Items = new List<JsonSchemaNode>(source.Items);
|
||||
AdditionalProperties = source.AdditionalProperties;
|
||||
|
||||
|
||||
@@ -89,20 +89,13 @@ namespace Newtonsoft.Json.Schema
|
||||
ReferenceOrWriteSchema(schema.AdditionalProperties);
|
||||
}
|
||||
}
|
||||
if (schema.Properties != null)
|
||||
{
|
||||
_writer.WritePropertyName(JsonSchemaConstants.PropertiesPropertyName);
|
||||
_writer.WriteStartObject();
|
||||
foreach (KeyValuePair<string, JsonSchema> property in schema.Properties)
|
||||
{
|
||||
_writer.WritePropertyName(property.Key);
|
||||
ReferenceOrWriteSchema(property.Value);
|
||||
}
|
||||
_writer.WriteEndObject();
|
||||
}
|
||||
WriteSchemaDictionaryIfNotNull(_writer, JsonSchemaConstants.PropertiesPropertyName, schema.Properties);
|
||||
WriteSchemaDictionaryIfNotNull(_writer, JsonSchemaConstants.PatternPropertiesPropertyName, schema.PatternProperties);
|
||||
WriteItems(schema);
|
||||
WritePropertyIfNotNull(_writer, JsonSchemaConstants.MinimumPropertyName, schema.Minimum);
|
||||
WritePropertyIfNotNull(_writer, JsonSchemaConstants.MaximumPropertyName, schema.Maximum);
|
||||
WritePropertyIfNotNull(_writer, JsonSchemaConstants.ExclusiveMinimumPropertyName, schema.ExclusiveMinimum);
|
||||
WritePropertyIfNotNull(_writer, JsonSchemaConstants.ExclusiveMaximumPropertyName, schema.ExclusiveMaximum);
|
||||
WritePropertyIfNotNull(_writer, JsonSchemaConstants.MinimumLengthPropertyName, schema.MinimumLength);
|
||||
WritePropertyIfNotNull(_writer, JsonSchemaConstants.MaximumLengthPropertyName, schema.MaximumLength);
|
||||
WritePropertyIfNotNull(_writer, JsonSchemaConstants.MinimumItemsPropertyName, schema.MinimumItems);
|
||||
@@ -153,6 +146,21 @@ namespace Newtonsoft.Json.Schema
|
||||
_writer.WriteEndObject();
|
||||
}
|
||||
|
||||
private void WriteSchemaDictionaryIfNotNull(JsonWriter writer, string propertyName, IDictionary<string, JsonSchema> properties)
|
||||
{
|
||||
if (properties != null)
|
||||
{
|
||||
writer.WritePropertyName(propertyName);
|
||||
writer.WriteStartObject();
|
||||
foreach (KeyValuePair<string, JsonSchema> property in properties)
|
||||
{
|
||||
writer.WritePropertyName(property.Key);
|
||||
ReferenceOrWriteSchema(property.Value);
|
||||
}
|
||||
writer.WriteEndObject();
|
||||
}
|
||||
}
|
||||
|
||||
private void WriteItems(JsonSchema schema)
|
||||
{
|
||||
if (CollectionUtils.IsNullOrEmpty(schema.Items))
|
||||
|
||||
Reference in New Issue
Block a user