bugfix#383 - removed check for existence of discriminator property in the property list

senthilkumarmohan · senthilkumarmohan · commit fcd74c49dfc2 · 2019-02-18T12:57:08.000Z
diff --git a/src/Microsoft.OpenApi/Properties/SRResource.Designer.cs b/src/Microsoft.OpenApi/Properties/SRResource.Designer.cs
diff --git a/src/Microsoft.OpenApi/Properties/SRResource.resx b/src/Microsoft.OpenApi/Properties/SRResource.resx
@@ -198,9 +198,6 @@
   <data name="Validation_ComponentsKeyMustMatchRegularExpr" xml:space="preserve">
     <value>The key '{0}' in '{1}' of components MUST match the regular expression '{2}'.</value>
   </data>
-  <data name="Validation_CompositeSchemaMustContainPropertySpecifiedInTheDiscriminator" xml:space="preserve">
-    <value>Composite Schema {0} must contain property specified in the discriminator {1}.</value>
-  </data>
   <data name="Validation_CompositeSchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator" xml:space="preserve">
     <value>Composite schema {0} must contain property specified in the discriminator {1} in the required field list.</value>
   </data>
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs
@@ -122,19 +122,13 @@ public static class OpenApiSchemaRules
 
 
         /// <summary>
-        /// Checks if the schemas in the list contain a property with the property name specified by the discriminator.
+        /// Checks if the schemas in the list contain a required field with the property name specified by the discriminator.
         /// </summary>
         private static void ValidateSchemaListDiscriminator(IValidationContext context, string ruleName,
                         IList<OpenApiSchema> schemas, OpenApiDiscriminator discriminator)
         {
             foreach (var schema in schemas)
             {
-                if (schema.Reference != null && !schema.Properties.ContainsKey(discriminator.PropertyName))
-                {
-                    context.CreateError(ruleName, 
-                        string.Format(SRResource.Validation_CompositeSchemaMustContainPropertySpecifiedInTheDiscriminator,
-                                                        schema.Reference.Id, discriminator.PropertyName));
-                }
                 if (schema.Reference != null && !schema.Required.Contains(discriminator.PropertyName))
                 {
                     context.CreateError(ruleName,
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs
@@ -282,10 +282,6 @@ public void ValidateOneOfCompositeSchemaMustContainPropertySpecifiedInTheDiscrim
                         string.Format(SRResource.Validation_CompositeSchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator, 
                                     "schema1", "property2")),
 
-                    new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateOneOfDiscriminator),"#/oneOf",
-                        string.Format(SRResource.Validation_CompositeSchemaMustContainPropertySpecifiedInTheDiscriminator, 
-                                     "schema2", "property2")),
-
                     new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateOneOfDiscriminator),"#/oneOf",
                         string.Format(SRResource.Validation_CompositeSchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator, 
                                     "schema2", "property2")),
@@ -342,10 +338,6 @@ public void ValidateAnyOfCompositeSchemaMustContainPropertySpecifiedInTheDiscrim
                         string.Format(SRResource.Validation_CompositeSchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator,
                                     "schema1", "property2")),
 
-                    new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateAnyOfDiscriminator),"#/anyOf",
-                        string.Format(SRResource.Validation_CompositeSchemaMustContainPropertySpecifiedInTheDiscriminator,
-                                     "schema2", "property2")),
-
                     new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateAnyOfDiscriminator),"#/anyOf",
                         string.Format(SRResource.Validation_CompositeSchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator,
                                     "schema2", "property2")),

Original file line number	Diff line number	Diff line change
`@@ -122,19 +122,13 @@ public static class OpenApiSchemaRules`
`122`	`122`
`123`	`123`
`124`	`124`	`/// <summary>`
`125`		`- /// Checks if the schemas in the list contain a property with the property name specified by the discriminator.`
	`125`	`+ /// Checks if the schemas in the list contain a required field with the property name specified by the discriminator.`
`126`	`126`	`/// </summary>`
`127`	`127`	`private static void ValidateSchemaListDiscriminator(IValidationContext context, string ruleName,`
`128`	`128`	`IList<OpenApiSchema> schemas, OpenApiDiscriminator discriminator)`
`129`	`129`	`{`
`130`	`130`	`foreach (var schema in schemas)`
`131`	`131`	`{`
`132`		`- if (schema.Reference != null && !schema.Properties.ContainsKey(discriminator.PropertyName))`
`133`		`- {`
`134`		`- context.CreateError(ruleName,`
`135`		`- string.Format(SRResource.Validation_CompositeSchemaMustContainPropertySpecifiedInTheDiscriminator,`
`136`		`- schema.Reference.Id, discriminator.PropertyName));`
`137`		`- }`
`138`	`132`	`if (schema.Reference != null && !schema.Required.Contains(discriminator.PropertyName))`
`139`	`133`	`{`
`140`	`134`	`context.CreateError(ruleName,`