Skip to content

Include Id, from the chema to be used in the Property Model and Class model, #1036

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Include Id, from the chema to be used in the Property Model and Class model, #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12ddec3
Update PropertyModel.cs
eriksimonic Jul 23, 2019
bf8a7bc
Update ClassTemplateModel.cs
eriksimonic Jul 23, 2019
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
6 changes: 6 additions & 0 deletions src/NJsonSchema.CodeGeneration.CSharp/Models/ClassTemplateModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public ClassTemplateModel(string typeName, CSharpGeneratorSettings settings,
.Select(property => new PropertyModel(this, property, _resolver, _settings))
.ToArray();

Id = _schema.Id;
Copy link
Owner

@RicoSuter RicoSuter Jul 23, 2019

Choose a reason for hiding this comment

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

Use a derived/calculated property?

if (schema.InheritedSchema != null)
{
BaseClass = new ClassTemplateModel(BaseClassName, settings, resolver, schema.InheritedSchema, rootObject);
Expand All @@ -50,6 +51,11 @@ public ClassTemplateModel(string typeName, CSharpGeneratorSettings settings,
}
}

/// <summary>
/// Id for the class instance
/// </summary>
public string Id { get; set; }

/// <summary>Gets or sets the class name.</summary>
public override string ClassName { get; }

Expand Down
9 changes: 9 additions & 0 deletions src/NJsonSchema.CodeGeneration.CSharp/Models/PropertyModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,17 @@ public PropertyModel(
_property = property;
_settings = settings;
_resolver = typeResolver;

Id = property.Id;
Copy link
Owner

@RicoSuter RicoSuter Jul 23, 2019

Choose a reason for hiding this comment

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

Id = property.Id ?? property.ActualSchema.Id;

Can a property have its own id?
Maybe also use a derived property like the Name?

if (property.Reference != null && string.IsNullOrEmpty(Id))
Id = property.Reference.Id;
}

/// <summary>
/// Id for the property
/// </summary>
public string Id { get; }

/// <summary>Gets the name of the property.</summary>
public string Name => _property.Name;

Expand Down