Merge branch 'master' of https://github.com/RicoSuter/NJsonSchema

src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.IO;
+using System.Reflection;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -132,5 +133,33 @@ public async Task When_property_references_any_schema_with_inheritance_then_prop
             //// Assert
             Assert.Contains("public Dog Dog { get; set; }", code);
         }
+
+        [Fact]
+        public async Task When_definitions_inherit_from_root_schema()
+        {
+            //// Arrange
+            var path = GetTestDirectory() + "/References/Animal.json";
+
+            //// Act
+            var schema = await JsonSchema.FromFileAsync(path);
+            var generator = new CSharpGenerator(schema, new CSharpGeneratorSettings { ClassStyle = CSharpClassStyle.Record });
+
+            //// Act
+            var code = generator.GenerateFile();
+
+            //// Assert
+            Assert.Contains("public abstract partial class Animal", code);
+            Assert.Contains("public partial class Cat : Animal", code);
+            Assert.Contains("public partial class PersianCat : Cat", code);
+            Assert.Contains("[JsonInheritanceAttribute(\"Cat\", typeof(Cat))]", code);
+            Assert.Contains("[JsonInheritanceAttribute(\"PersianCat\", typeof(PersianCat))]", code);
+        }
+
+        private string GetTestDirectory()
+        {
+            var codeBase = Assembly.GetExecutingAssembly().CodeBase;
+            var uri = new UriBuilder(codeBase);
+            return Path.GetDirectoryName(Uri.UnescapeDataString(uri.Path));
+        }
     }
 }

src/NJsonSchema.CodeGeneration.CSharp.Tests/NJsonSchema.CodeGeneration.CSharp.Tests.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Remove="References\A.json" />
+    <None Remove="References\Animal.json" />
     <None Remove="References\B.json" />
     <None Remove="References\C.json" />
     <None Remove="References\D.json" />
@@ -16,6 +17,9 @@
     <Content Include="References\A.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="References\Animal.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="References\B.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

src/NJsonSchema.CodeGeneration.CSharp.Tests/References/Animal.json

@@ -0,0 +1,25 @@
+{
+    "title": "Animal",
+    "type": "object",
+    "x-abstract": true,
+    "discriminator": "discriminator",
+
+    "definitions": {
+        "Cat": {
+            "type": "object",
+            "allOf": [
+                {
+                    "$ref": "Animal.json"
+                }
+            ]
+        },
+        "PersianCat": {
+            "type": "object",
+            "allOf": [
+                {
+                    "$ref": "#/definitions/Cat"
+                }
+            ]
+        }
+    }
+}

src/NJsonSchema.CodeGeneration.CSharp/CSharpTypeResolver.cs

@@ -78,6 +78,7 @@ schema is JsonSchemaProperty property &&
             var markAsNullableType = Settings.GenerateNullableReferenceTypes && isNullable;
 
             if (schema.ActualTypeSchema.IsAnyType &&
+                schema.ActualDiscriminator == null &&
                 schema.InheritedSchema == null && // not in inheritance hierarchy
                 schema.AllOf.Count == 0 &&
                 !Types.Keys.Contains(schema) &&

src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>10.3.7</Version>
+    <Version>10.3.8</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2020</Copyright>
     <PackageProjectUrl>http://NJsonSchema.org</PackageProjectUrl>

src/NJsonSchema.CodeGeneration.CSharp/Templates/Class.liquid

@@ -49,7 +49,7 @@
     /// <summary>{{ property.Description | csharpdocs }}</summary>
 {%   endif -%}
 {% if UseSystemTextJson -%}
-    [System.Text.Json.Serialization.JsonPropertyName("{{ property.Name }}"]
+    [System.Text.Json.Serialization.JsonPropertyName("{{ property.Name }}")]
 {%   if property.IsStringEnumArray -%}
     // TODO(system.text.json): Add string enum item converter
 {%   endif -%}
@@ -76,7 +76,7 @@
 {%   endif -%}
 {%   if property.IsStringEnum -%}
 {%     if UseSystemTextJson -%}
-    [System.Text.Json.Serialization.JsonConverter(System.Text.Json.Serialization.JsonStringEnumConverter)]
+    [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.JsonStringEnumConverter))]
 {%     else -%}
     [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
 {%     endif -%}
@@ -98,11 +98,11 @@
         get { return {{ property.FieldName }}; }
 {%     if property.HasSetter -%}
 {%         if RenderInpc -%}
-        {{PropertySetterAccessModifier}}set 
+        {{PropertySetterAccessModifier}}set
         {
             if ({{ property.FieldName }} != value)
             {
-                {{ property.FieldName }} = value; 
+                {{ property.FieldName }} = value;
                 RaisePropertyChanged();
             }
         }

src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>10.3.7</Version>
+    <Version>10.3.8</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2020</Copyright>
     <PackageProjectUrl>http://NJsonSchema.org</PackageProjectUrl>

src/NJsonSchema.CodeGeneration/Models/ClassTemplateModelBase.cs

@@ -27,10 +27,17 @@ protected ClassTemplateModelBase(TypeResolverBase resolver, JsonSchema schema, o
             _schema = schema;
             _rootObject = rootObject;
             _resolver = resolver;
+
+            SchemaTitle = _schema?.Title;
         }
 
         /// <summary>Gets the class.</summary>
         public abstract string ClassName { get; }
+
+        /// <summary>
+        /// Gets the original title of the class (schema title).
+        /// </summary>
+        public string SchemaTitle { get; }
 
         /// <summary>Gets a value indicating whether this class represents a JSON object with fixed amount of properties.</summary>
         public bool IsObject => _schema.ActualTypeSchema.IsObject;

src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0;net451</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>10.3.7</Version>
+    <Version>10.3.8</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2020</Copyright>
     <PackageProjectUrl>http://NJsonSchema.org</PackageProjectUrl>

src/NJsonSchema.Tests/Validation/FormatUuidTests.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+using NJsonSchema.Validation;
+using Xunit;
+
+namespace NJsonSchema.Tests.Validation
+{
+    public class FormatUuidTests
+    {
+        [Fact]
+        public void When_format_uuid_incorrect_then_validation_succeeds()
+        {
+            //// Arrange
+            var schema = new JsonSchema();
+            schema.Type = JsonObjectType.String;
+            schema.Format = JsonFormatStrings.Uuid;
+
+            var token = new JValue("test");
+
+            //// Act
+            var errors = schema.Validate(token);
+
+            //// Assert
+            Assert.Equal(ValidationErrorKind.UuidExpected, errors.First().Kind);
+        }
+
+        [Fact]
+        public void When_format_uuid_correct_then_validation_succeeds()
+        {
+            //// Arrange
+            var schema = new JsonSchema();
+            schema.Type = JsonObjectType.String;
+            schema.Format = JsonFormatStrings.Uuid;
+
+            var uuid = Guid.NewGuid().ToString(); 
+            var token = new JValue(uuid);
+
+            //// Act
+            var errors = schema.Validate(token);
+
+            //// Assert
+            Assert.Empty(errors);
+        }
+    }
+}

src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;netstandard2.0;net45</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>10.3.7</Version>
+    <Version>10.3.8</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2020</Copyright>
     <PackageProjectUrl>http://NJsonSchema.org</PackageProjectUrl>

src/NJsonSchema/JsonSchemaAppender.cs

@@ -44,7 +44,7 @@ public virtual void AppendSchema(JsonSchema schema, string typeNameHint)
 
             if (schema == RootObject)
             {
-                throw new ArgumentException("The root schema cannot be appended.");
+                return;
             }
 
             if (!RootSchema.Definitions.Values.Contains(schema))

src/NJsonSchema/NJsonSchema.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard2.0;net40;net45</TargetFrameworks>
     <Description>JSON Schema reader, generator and validator for .NET</Description>
-    <Version>10.3.7</Version>
+    <Version>10.3.8</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2020</Copyright>
     <PackageProjectUrl>http://NJsonSchema.org</PackageProjectUrl>

src/NJsonSchema/Validation/FormatValidators/UuidFormatValidator.cs

@@ -0,0 +1,34 @@
+//-----------------------------------------------------------------------
+// <copyright file="UuidFormatValidator.cs" company="NJsonSchema">
+//     Copyright (c) Rico Suter. All rights reserved.
+// </copyright>
+// <license>https://github.com/RicoSuter/NJsonSchema/blob/master/LICENSE.md</license>
+// <author>Rico Suter, [email protected]</author>
+//-----------------------------------------------------------------------
+
+using Newtonsoft.Json.Linq;
+using System;
+
+namespace NJsonSchema.Validation.FormatValidators
+{
+    /// <summary>Validator for "Uuid" format.</summary>
+    public class UuidFormatValidator : IFormatValidator
+    {
+        /// <summary>Gets the format attribute's value.</summary>
+        #pragma warning disable CS0618 // Type or member is obsolete
+        public string Format { get; } = JsonFormatStrings.Uuid;
+        #pragma warning restore CS0618 // Type or member is obsolete
+
+        /// <summary>Gets the kind of error produced by validator.</summary>
+        public ValidationErrorKind ValidationErrorKind { get; } = ValidationErrorKind.UuidExpected;
+
+        /// <summary>Validates format of given value.</summary>
+        /// <param name="value">String value.</param>
+        /// <param name="tokenType">Type of token holding the value.</param>
+        /// <returns>True if value is correct for given format, False - if not.</returns>
+        public bool IsValid(string value, JTokenType tokenType)
+        {
+            return Guid.TryParse(value, out Guid guid);
+        }
+    }
+}

src/NJsonSchema/Validation/JsonSchemaValidator.cs

@@ -33,7 +33,8 @@ public class JsonSchemaValidator
             new TimeSpanFormatValidator(),
             new UriFormatValidator(),
             new ByteFormatValidator(),
-            new Base64FormatValidator()
+            new Base64FormatValidator(),
+            new UuidFormatValidator()
         };
 
         private readonly IDictionary<string, IFormatValidator[]> _formatValidatorsMap;

src/NJsonSchema/Validation/ValidationErrorKind.cs

@@ -141,6 +141,9 @@ public enum ValidationErrorKind
         Base64Expected,
 
         /// <summary>No type of the types does validate (check error details in <see cref="MultiTypeValidationError"/>). </summary>
-        NoTypeValidates
+        NoTypeValidates,
+
+        /// <summary>A valid UUID is expected. </summary>
+        UuidExpected,
     }
 }