Merge pull request #920 from WISNI4/patch-2

Update CSharpValueGenerator.cs
RicoSuter · Mar 5, 2019 · 1d77820 · 1d77820
2 parents 3b5d785 + 321f0aa
commit 1d77820
Showing 1 changed file with 17 additions and 2 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);
         }
     }
-}
+}