Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #57, fix #58: Emit initializers and attributes for default values #60

Merged
8 commits merged into from
Dec 28, 2018
Merged

Fix #57, fix #58: Emit initializers and attributes for default values #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fef7259
Introduce ClassGenerator.GenerateDefaultInitializations (empty).
Dec 27, 2018
df1b3fe
Add Default to PropertyInfo.
Dec 27, 2018
5747213
Emit default initializers for integer and string properties.
Dec 28, 2018
9259ce5
Emit default initializers for Boolean properties.
Dec 28, 2018
2b8cd14
Add initializers for number properties.
Dec 28, 2018
6ef6d4d
Emit System.ComponentModel.DefaultValue when needed.
Dec 28, 2018
38d8c45
Remove unnecessary test.
Dec 28, 2018
bf9479d
Address feedback from @michaelcfanning.
Dec 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 133 additions & 19 deletions src/Json.Schema.ToDotNet.UnitTests/DataModelGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,10 +871,43 @@ public void GeneratesCloningCode()
""type"": ""integer"",
""description"": ""An integer property.""
},
""intPropWithDefault"": {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intPropWithDefault [](start = 6, length = 18)

Add properties with default values for all JSON schema primitive types.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intPropWithDefault [](start = 6, length = 18)

I find the jschema test strategy unsatisfying in that there's no clear marker in tests of the real world impact of changes. Perhaps you could add some single practical example of the framework in use that would illustrate more effectively how updates alter code emit. TBD

""type"": ""integer"",
""description"": ""An integer property with a default value."",
""default"": 42
},
""numberProp"": {
""type"": ""number"",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

number [](start = 18, length = 6)

Add coverage for number properties, which we previously lacked.

""description"": ""A number property.""
},
""numberPropWithDefault"": {
""type"": ""number"",
""description"": ""A number property with a default value."",
""default"": 42.1
},
""stringProp"": {
""type"": ""string"",
""description"": ""A string property.""
},
""stringPropWithDefault"": {
""type"": ""string"",
""description"": ""A string property with a default value."",
""default"": ""42""
},
""boolProp"": {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

boolProp [](start = 6, length = 8)

We didn't cover bool properties before, either.

""type"": ""boolean"",
""description"": ""A Boolean property.""
},
""boolPropWithTrueDefault"": {
""type"": ""boolean"",
""description"": ""A Boolean property with a true default value."",
""default"": true
},
""boolPropWithFalseDefault"": {
""type"": ""boolean"",
""description"": ""A Boolean property with a false default value."",
""default"": false
},
""arrayProp"": {
""type"": ""array"",
""description"": ""An array property."",
Expand Down Expand Up @@ -1006,6 +1039,7 @@ public void GeneratesCloningCode()
@"using System;
using System.CodeDom.Compiler;
using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.Serialization;

namespace N
Expand All @@ -1031,12 +1065,59 @@ public SNodeKind SNodeKind
[DataMember(Name = ""intProp"", IsRequired = false, EmitDefaultValue = false)]
public int IntProp { get; set; }

/// <summary>
/// An integer property with a default value.
/// </summary>
[DataMember(Name = ""intPropWithDefault"", IsRequired = false, EmitDefaultValue = false)]
[DefaultValue(42)]
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[DefaultValue(42)] [](start = 8, length = 18)

Demonstrates fix for #58.

public int IntPropWithDefault { get; set; }

/// <summary>
/// A number property.
/// </summary>
[DataMember(Name = ""numberProp"", IsRequired = false, EmitDefaultValue = false)]
public double NumberProp { get; set; }

/// <summary>
/// A number property with a default value.
/// </summary>
[DataMember(Name = ""numberPropWithDefault"", IsRequired = false, EmitDefaultValue = false)]
[DefaultValue(42.1)]
public double NumberPropWithDefault { get; set; }

/// <summary>
/// A string property.
/// </summary>
[DataMember(Name = ""stringProp"", IsRequired = false, EmitDefaultValue = false)]
public string StringProp { get; set; }

/// <summary>
/// A string property with a default value.
/// </summary>
[DataMember(Name = ""stringPropWithDefault"", IsRequired = false, EmitDefaultValue = false)]
[DefaultValue(""42"")]
public string StringPropWithDefault { get; set; }

/// <summary>
/// A Boolean property.
/// </summary>
[DataMember(Name = ""boolProp"", IsRequired = false, EmitDefaultValue = false)]
public bool BoolProp { get; set; }

/// <summary>
/// A Boolean property with a true default value.
/// </summary>
[DataMember(Name = ""boolPropWithTrueDefault"", IsRequired = false, EmitDefaultValue = false)]
[DefaultValue(true)]
public bool BoolPropWithTrueDefault { get; set; }

/// <summary>
/// A Boolean property with a false default value.
/// </summary>
[DataMember(Name = ""boolPropWithFalseDefault"", IsRequired = false, EmitDefaultValue = false)]
[DefaultValue(false)]
public bool BoolPropWithFalseDefault { get; set; }

/// <summary>
/// An array property.
/// </summary>
Expand Down Expand Up @@ -1110,56 +1191,82 @@ public SNodeKind SNodeKind
/// </summary>
public C()
{
IntPropWithDefault = 42;
NumberPropWithDefault = 42.1;
StringPropWithDefault = ""42"";
BoolPropWithTrueDefault = true;
BoolPropWithFalseDefault = false;
}
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

} [](start = 8, length = 1)

Demonstrates fix for #57.


/// <summary>
/// Initializes a new instance of the <see cref=""C"" /> class from the supplied values.
/// </summary>
/// <param name=""intProp"">
/// An initialization value for the <see cref=""P: IntProp"" /> property.
/// An initialization value for the <see cref=""P:IntProp"" /> property.
/// </param>
/// <param name=""intPropWithDefault"">
/// An initialization value for the <see cref=""P:IntPropWithDefault"" /> property.
/// </param>
/// <param name=""numberProp"">
/// An initialization value for the <see cref=""P:NumberProp"" /> property.
/// </param>
/// <param name=""numberPropWithDefault"">
/// An initialization value for the <see cref=""P:NumberPropWithDefault"" /> property.
/// </param>
/// <param name=""stringProp"">
/// An initialization value for the <see cref=""P: StringProp"" /> property.
/// An initialization value for the <see cref=""P:StringProp"" /> property.
/// </param>
/// <param name=""stringPropWithDefault"">
/// An initialization value for the <see cref=""P:StringPropWithDefault"" /> property.
/// </param>
/// <param name=""boolProp"">
/// An initialization value for the <see cref=""P:BoolProp"" /> property.
/// </param>
/// <param name=""boolPropWithTrueDefault"">
/// An initialization value for the <see cref=""P:BoolPropWithTrueDefault"" /> property.
/// </param>
/// <param name=""boolPropWithFalseDefault"">
/// An initialization value for the <see cref=""P:BoolPropWithFalseDefault"" /> property.
/// </param>
/// <param name=""arrayProp"">
/// An initialization value for the <see cref=""P: ArrayProp"" /> property.
/// An initialization value for the <see cref=""P:ArrayProp"" /> property.
/// </param>
/// <param name=""uriProp"">
/// An initialization value for the <see cref=""P: UriProp"" /> property.
/// An initialization value for the <see cref=""P:UriProp"" /> property.
/// </param>
/// <param name=""dateTimeProp"">
/// An initialization value for the <see cref=""P: DateTimeProp"" /> property.
/// An initialization value for the <see cref=""P:DateTimeProp"" /> property.
/// </param>
/// <param name=""referencedTypeProp"">
/// An initialization value for the <see cref=""P: ReferencedTypeProp"" /> property.
/// An initialization value for the <see cref=""P:ReferencedTypeProp"" /> property.
/// </param>
/// <param name=""arrayOfRefProp"">
/// An initialization value for the <see cref=""P: ArrayOfRefProp"" /> property.
/// An initialization value for the <see cref=""P:ArrayOfRefProp"" /> property.
/// </param>
/// <param name=""arrayOfArrayProp"">
/// An initialization value for the <see cref=""P: ArrayOfArrayProp"" /> property.
/// An initialization value for the <see cref=""P:ArrayOfArrayProp"" /> property.
/// </param>
/// <param name=""dictionaryProp"">
/// An initialization value for the <see cref=""P: DictionaryProp"" /> property.
/// An initialization value for the <see cref=""P:DictionaryProp"" /> property.
/// </param>
/// <param name=""dictionaryWithPrimitiveSchemaProp"">
/// An initialization value for the <see cref=""P: DictionaryWithPrimitiveSchemaProp"" /> property.
/// An initialization value for the <see cref=""P:DictionaryWithPrimitiveSchemaProp"" /> property.
/// </param>
/// <param name=""dictionaryWithObjectSchemaProp"">
/// An initialization value for the <see cref=""P: DictionaryWithObjectSchemaProp"" /> property.
/// An initialization value for the <see cref=""P:DictionaryWithObjectSchemaProp"" /> property.
/// </param>
/// <param name=""dictionaryWithObjectArraySchemaProp"">
/// An initialization value for the <see cref=""P: DictionaryWithObjectArraySchemaProp"" /> property.
/// An initialization value for the <see cref=""P:DictionaryWithObjectArraySchemaProp"" /> property.
/// </param>
/// <param name=""dictionaryWithUriKeyProp"">
/// An initialization value for the <see cref=""P: DictionaryWithUriKeyProp"" /> property.
/// An initialization value for the <see cref=""P:DictionaryWithUriKeyProp"" /> property.
/// </param>
/// <param name=""dictionaryWithHintedValueProp"">
/// An initialization value for the <see cref=""P: DictionaryWithHintedValueProp"" /> property.
/// An initialization value for the <see cref=""P:DictionaryWithHintedValueProp"" /> property.
/// </param>
public C(int intProp, string stringProp, IEnumerable<double> arrayProp, Uri uriProp, DateTime dateTimeProp, D referencedTypeProp, IEnumerable<D> arrayOfRefProp, IEnumerable<IEnumerable<D>> arrayOfArrayProp, IDictionary<string, string> dictionaryProp, IDictionary<string, double> dictionaryWithPrimitiveSchemaProp, IDictionary<string, D> dictionaryWithObjectSchemaProp, IDictionary<string, IList<D>> dictionaryWithObjectArraySchemaProp, IDictionary<Uri, D> dictionaryWithUriKeyProp, IDictionary<string, V> dictionaryWithHintedValueProp)
public C(int intProp, int intPropWithDefault, double numberProp, double numberPropWithDefault, string stringProp, string stringPropWithDefault, bool boolProp, bool boolPropWithTrueDefault, bool boolPropWithFalseDefault, IEnumerable<double> arrayProp, Uri uriProp, DateTime dateTimeProp, D referencedTypeProp, IEnumerable<D> arrayOfRefProp, IEnumerable<IEnumerable<D>> arrayOfArrayProp, IDictionary<string, string> dictionaryProp, IDictionary<string, double> dictionaryWithPrimitiveSchemaProp, IDictionary<string, D> dictionaryWithObjectSchemaProp, IDictionary<string, IList<D>> dictionaryWithObjectArraySchemaProp, IDictionary<Uri, D> dictionaryWithUriKeyProp, IDictionary<string, V> dictionaryWithHintedValueProp)
{
Init(intProp, stringProp, arrayProp, uriProp, dateTimeProp, referencedTypeProp, arrayOfRefProp, arrayOfArrayProp, dictionaryProp, dictionaryWithPrimitiveSchemaProp, dictionaryWithObjectSchemaProp, dictionaryWithObjectArraySchemaProp, dictionaryWithUriKeyProp, dictionaryWithHintedValueProp);
Init(intProp, intPropWithDefault, numberProp, numberPropWithDefault, stringProp, stringPropWithDefault, boolProp, boolPropWithTrueDefault, boolPropWithFalseDefault, arrayProp, uriProp, dateTimeProp, referencedTypeProp, arrayOfRefProp, arrayOfArrayProp, dictionaryProp, dictionaryWithPrimitiveSchemaProp, dictionaryWithObjectSchemaProp, dictionaryWithObjectArraySchemaProp, dictionaryWithUriKeyProp, dictionaryWithHintedValueProp);
}

/// <summary>
Expand All @@ -1178,7 +1285,7 @@ public C(C other)
throw new ArgumentNullException(nameof(other));
}

Init(other.IntProp, other.StringProp, other.ArrayProp, other.UriProp, other.DateTimeProp, other.ReferencedTypeProp, other.ArrayOfRefProp, other.ArrayOfArrayProp, other.DictionaryProp, other.DictionaryWithPrimitiveSchemaProp, other.DictionaryWithObjectSchemaProp, other.DictionaryWithObjectArraySchemaProp, other.DictionaryWithUriKeyProp, other.DictionaryWithHintedValueProp);
Init(other.IntProp, other.IntPropWithDefault, other.NumberProp, other.NumberPropWithDefault, other.StringProp, other.StringPropWithDefault, other.BoolProp, other.BoolPropWithTrueDefault, other.BoolPropWithFalseDefault, other.ArrayProp, other.UriProp, other.DateTimeProp, other.ReferencedTypeProp, other.ArrayOfRefProp, other.ArrayOfArrayProp, other.DictionaryProp, other.DictionaryWithPrimitiveSchemaProp, other.DictionaryWithObjectSchemaProp, other.DictionaryWithObjectArraySchemaProp, other.DictionaryWithUriKeyProp, other.DictionaryWithHintedValueProp);
}

ISNode ISNode.DeepClone()
Expand All @@ -1199,10 +1306,17 @@ private ISNode DeepCloneCore()
return new C(this);
}

private void Init(int intProp, string stringProp, IEnumerable<double> arrayProp, Uri uriProp, DateTime dateTimeProp, D referencedTypeProp, IEnumerable<D> arrayOfRefProp, IEnumerable<IEnumerable<D>> arrayOfArrayProp, IDictionary<string, string> dictionaryProp, IDictionary<string, double> dictionaryWithPrimitiveSchemaProp, IDictionary<string, D> dictionaryWithObjectSchemaProp, IDictionary<string, IList<D>> dictionaryWithObjectArraySchemaProp, IDictionary<Uri, D> dictionaryWithUriKeyProp, IDictionary<string, V> dictionaryWithHintedValueProp)
private void Init(int intProp, int intPropWithDefault, double numberProp, double numberPropWithDefault, string stringProp, string stringPropWithDefault, bool boolProp, bool boolPropWithTrueDefault, bool boolPropWithFalseDefault, IEnumerable<double> arrayProp, Uri uriProp, DateTime dateTimeProp, D referencedTypeProp, IEnumerable<D> arrayOfRefProp, IEnumerable<IEnumerable<D>> arrayOfArrayProp, IDictionary<string, string> dictionaryProp, IDictionary<string, double> dictionaryWithPrimitiveSchemaProp, IDictionary<string, D> dictionaryWithObjectSchemaProp, IDictionary<string, IList<D>> dictionaryWithObjectArraySchemaProp, IDictionary<Uri, D> dictionaryWithUriKeyProp, IDictionary<string, V> dictionaryWithHintedValueProp)
{
IntProp = intProp;
IntPropWithDefault = intPropWithDefault;
NumberProp = numberProp;
NumberPropWithDefault = numberPropWithDefault;
StringProp = stringProp;
StringPropWithDefault = stringPropWithDefault;
BoolProp = boolProp;
BoolPropWithTrueDefault = boolPropWithTrueDefault;
BoolPropWithFalseDefault = boolPropWithFalseDefault;
if (arrayProp != null)
{
var destination_0 = new List<double>();
Expand Down Expand Up @@ -2450,7 +2564,7 @@ public C()
/// Initializes a new instance of the <see cref=""C"" /> class from the supplied values.
/// </summary>
/// <param name=""uriFormattedStrings"">
/// An initialization value for the <see cref=""P: UriFormattedStrings"" /> property.
/// An initialization value for the <see cref=""P:UriFormattedStrings"" /> property.
/// </param>
public C(IEnumerable<Uri> uriFormattedStrings)
{
Expand Down
Loading