Merge pull request #926 from RSuter/master

Release v9.13.23
RicoSuter · Mar 14, 2019 · 52400b6 · 52400b6
2 parents 082b6e4 + 2f32e00
commit 52400b6
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 10 deletions.
diff --git a/src/NJsonSchema.CodeGeneration.CSharp/CSharpValueGenerator.cs b/src/NJsonSchema.CodeGeneration.CSharp/CSharpValueGenerator.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 
 namespace NJsonSchema.CodeGeneration.CSharp
@@ -15,6 +16,11 @@ namespace NJsonSchema.CodeGeneration.CSharp
     public class CSharpValueGenerator : ValueGeneratorBase
     {
         private readonly CSharpGeneratorSettings _settings;
+        private readonly List<string> _typesWithStringConstructor = new List<string>()
+        {
+            "System.Guid",
+            "System.Uri"
+        }; 
 
         /// <summary>Initializes a new instance of the <see cref="CSharpValueGenerator" /> class.</summary>
         /// <param name="settings">The settings.</param>
@@ -37,6 +43,15 @@ public override string GetDefaultValue(JsonSchema4 schema, bool allowsNull, stri
             var value = base.GetDefaultValue(schema, allowsNull, targetType, typeNameHint, useSchemaDefault, typeResolver);
             if (value == null)
             {
+                if (schema.Default != null && useSchemaDefault)
+                {
+                    if (_typesWithStringConstructor.Contains(targetType))
+                    {
+                        var stringLiteral = GetDefaultAsStringLiteral(schema);
+                        return $"new {targetType}({stringLiteral})";
+                    }
+                }
+
                 var isOptional = (schema as JsonProperty)?.IsRequired == false;
 
                 schema = schema.ActualSchema;
@@ -53,7 +68,7 @@ public override string GetDefaultValue(JsonSchema4 schema, bool allowsNull, stri
                             ? targetType.Replace(_settings.ArrayType + "<", _settings.ArrayInstanceType + "<")
                             : targetType;
 
-                        return "new " + targetType + "()";
+                        return $"new {targetType}()";
                     }
                 }
             }
@@ -105,4 +120,4 @@ protected override string GetEnumDefaultValue(JsonSchema4 schema, JsonSchema4 ac
             return _settings.Namespace + "." + base.GetEnumDefaultValue(schema, actualSchema, typeNameHint, typeResolver);
         }
     }
-}
+}
diff --git a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj b/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>9.13.22</Version>
+    <Version>9.13.23</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj b/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>9.13.22</Version>
+    <Version>9.13.23</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/Templates/ConvertToJavaScript.liquid b/src/NJsonSchema.CodeGeneration.TypeScript/Templates/ConvertToJavaScript.liquid
@@ -19,7 +19,7 @@ if ({{ Value }}) {
     {{ Variable }} = {};
     for (let key in {{ Value }}) {
         if ({{ Value }}.hasOwnProperty(key))
-{%     if IsDictionaryValueNewableObjec -%}
+{%     if IsDictionaryValueNewableObject -%}
             {{ Variable }}[key] = {{ Value }}[key] ? {{ Value }}[key].toJSON() : <any>{{ NullValue }};
 {%     elseif IsDictionaryValueDate -%}
             {{ Variable }}[key] = {{ Value }}[key] ? {% if UseJsDate %}formatDate({{ Value }}[key]){% else %}{{ Value }}[key].format('YYYY-MM-DD'){% endif %} : <any>{{ NullValue }};

diff --git a/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj b/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>9.13.22</Version>
+    <Version>9.13.23</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.Tests/Validation/FormatDateTimeTests.cs b/src/NJsonSchema.Tests/Validation/FormatDateTimeTests.cs
@@ -91,5 +91,22 @@ public void When_format_date_time_with_iso8601_with_timezone_then_validation_suc
             //// Assert
             Assert.Empty(errors);
         }
+
+        [Fact]
+        public void When_format_date_time_with_iso8601_and_fractional_seconds_then_validation_succeeds()
+        {
+            //// Arrange
+            var schema = new JsonSchema4();
+            schema.Type = JsonObjectType.String;
+            schema.Format = JsonFormatStrings.DateTime;
+
+            var token = new JValue("2015-01-25T15:43:30.1234567Z");
+
+            //// Act
+            var errors = schema.Validate(token);
+
+            //// Assert
+            Assert.Empty(errors);
+        }
     }
 }
diff --git a/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj b/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>9.13.22</Version>
+    <Version>9.13.23</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema/NJsonSchema.csproj b/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>9.13.22</Version>
+    <Version>9.13.23</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2018</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema/Validation/FormatValidators/DateTimeFormatValidator.cs b/src/NJsonSchema/Validation/FormatValidators/DateTimeFormatValidator.cs
@@ -15,8 +15,8 @@ namespace NJsonSchema.Validation.FormatValidators
     public class DateTimeFormatValidator : IFormatValidator
     {
         private readonly string[] _acceptableFormats = new [] {
-            "yyyy-MM-dd'T'HH:mm:ss.FFFK",
-            "yyyy-MM-dd' 'HH:mm:ss.FFFK",
+            "yyyy-MM-dd'T'HH:mm:ss.FFFFFFFK",
+            "yyyy-MM-dd' 'HH:mm:ss.FFFFFFFK",
             "yyyy-MM-dd'T'HH:mm:ssK",
             "yyyy-MM-dd' 'HH:mm:ssK",
             "yyyy-MM-dd'T'HH:mm:ss",