diff --git a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj b/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj index bf8735670..8136e0218 100644 --- a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj +++ b/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj @@ -2,7 +2,7 @@ netstandard1.3;netstandard2.0;net451 JSON Schema reader, generator and validator for .NET - 10.4.0 + 10.4.1 json schema validation generator .net Copyright © Rico Suter, 2020 http://NJsonSchema.org diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj b/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj index 1ac319277..fd1b3471f 100644 --- a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj +++ b/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj @@ -2,7 +2,7 @@ netstandard1.3;netstandard2.0;net451 JSON Schema reader, generator and validator for .NET - 10.4.0 + 10.4.1 json schema validation generator .net Copyright © Rico Suter, 2020 http://NJsonSchema.org diff --git a/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj b/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj index d70a4a0ed..7667606e7 100644 --- a/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj +++ b/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj @@ -2,7 +2,7 @@ netstandard1.3;netstandard2.0;net451 JSON Schema reader, generator and validator for .NET - 10.4.0 + 10.4.1 json schema validation generator .net Copyright © Rico Suter, 2020 http://NJsonSchema.org diff --git a/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj b/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj index c9f566cb8..8b75cfda7 100644 --- a/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj +++ b/src/NJsonSchema.Yaml/NJsonSchema.Yaml.csproj @@ -2,7 +2,7 @@ netstandard1.3;netstandard2.0;net45 JSON Schema reader, generator and validator for .NET - 10.4.0 + 10.4.1 json schema validation generator .net Copyright © Rico Suter, 2020 http://NJsonSchema.org diff --git a/src/NJsonSchema/Generation/JsonSchemaResolver.cs b/src/NJsonSchema/Generation/JsonSchemaResolver.cs index 9e948c680..4efb2e756 100644 --- a/src/NJsonSchema/Generation/JsonSchemaResolver.cs +++ b/src/NJsonSchema/Generation/JsonSchemaResolver.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; -using NJsonSchema.Generation; namespace NJsonSchema.Generation { @@ -33,7 +32,7 @@ public JsonSchemaResolver(object rootObject, JsonSchemaGeneratorSettings setting /// true when the mapping exists. public bool HasSchema(Type type, bool isIntegerEnumeration) { - return _mappings.ContainsKey(GetKey(type, isIntegerEnumeration)); + return _mappings.ContainsKey(GetTypeKey(type, isIntegerEnumeration)); } /// Gets the schema for a given type. @@ -42,7 +41,7 @@ public bool HasSchema(Type type, bool isIntegerEnumeration) /// The schema. public JsonSchema GetSchema(Type type, bool isIntegerEnumeration) { - return _mappings[GetKey(type, isIntegerEnumeration)]; + return _mappings[GetTypeKey(type, isIntegerEnumeration)]; } /// Adds a schema to type mapping. @@ -62,7 +61,7 @@ public virtual void AddSchema(Type type, bool isIntegerEnumeration, JsonSchema s AppendSchema(schema, _settings.SchemaNameGenerator.Generate(type)); } - _mappings.Add(GetKey(type, isIntegerEnumeration), schema); + _mappings.Add(GetTypeKey(type, isIntegerEnumeration), schema); } /// Gets all the schemas. @@ -74,7 +73,7 @@ public virtual void AddSchema(Type type, bool isIntegerEnumeration, JsonSchema s /// The type. /// Specifies whether the type is an integer enum. /// The mapping key. - protected virtual string GetKey(Type type, bool isIntegerEnum) + protected virtual string GetTypeKey(Type type, bool isIntegerEnum) { return type.FullName + (isIntegerEnum ? ":Integer" : string.Empty); } diff --git a/src/NJsonSchema/NJsonSchema.csproj b/src/NJsonSchema/NJsonSchema.csproj index 79d8e993f..7060186d1 100644 --- a/src/NJsonSchema/NJsonSchema.csproj +++ b/src/NJsonSchema/NJsonSchema.csproj @@ -2,7 +2,7 @@ netstandard1.0;netstandard2.0;net40;net45 JSON Schema reader, generator and validator for .NET - 10.4.0 + 10.4.1 json schema validation generator .net Copyright © Rico Suter, 2020 http://NJsonSchema.org