fix#375 - removed check for existence of required/discriminator properties in the property list

Author: senthilkumarmohan

src/Microsoft.OpenApi/Properties/SRResource.Designer.cs

@@ -216,12 +216,6 @@
   <data name="Validation_RuleAddTwice" xml:space="preserve">
     <value>The same rule cannot be in the same rule set twice.</value>
   </data>
-  <data name="Validation_SchemaMustContainPropertySpecifiedInTheDiscriminator" xml:space="preserve">
-    <value>Schema {0} must contain property specified in the discriminator {1}.</value>
-  </data>
-  <data name="Validation_SchemaMustContainPropertySpecifiedInTheRequiredField" xml:space="preserve">
-    <value>Schema {0} must contain property specified in the required field {1}.</value>
-  </data>
   <data name="Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator" xml:space="preserve">
     <value>Schema {0} must contain property specified in the discriminator {1} in the required field list.</value>
   </data>

src/Microsoft.OpenApi/Properties/SRResource.resx

@@ -57,32 +57,6 @@ public static class OpenApiSchemaRules
                     context.Exit();
                 });
 
-        /// <summary>
-        /// Validates Schema Required Fields
-        /// </summary>
-        public static ValidationRule<OpenApiSchema> ValidateSchemaRequiredFields =>
-            new ValidationRule<OpenApiSchema>(
-                (context, schema) =>
-                {
-                    // discriminator
-                    context.Enter("required");
-
-                    if (schema.Reference != null)
-                    {
-                        foreach (var requiredField in schema.Required)
-                        {
-                            if (!schema.Properties.ContainsKey(requiredField))
-                            {
-                                context.CreateError(nameof(ValidateSchemaRequiredFields),
-                                                    string.Format(SRResource.Validation_SchemaMustContainPropertySpecifiedInTheRequiredField,
-                                                                                    schema.Reference.Id, requiredField));
-                            }
-                        }
-                    }
-
-                    context.Exit();
-                });
-
         /// <summary>
         /// Validates Schema Discriminator
         /// </summary>
@@ -95,13 +69,6 @@ public static class OpenApiSchemaRules
 
                     if(schema.Reference != null && schema.Discriminator != null)
                     {
-                        if (!schema.Properties.ContainsKey(schema.Discriminator.PropertyName))
-                        {
-                            context.CreateError(nameof(ValidateSchemaDiscriminator),
-                                                string.Format(SRResource.Validation_SchemaMustContainPropertySpecifiedInTheDiscriminator,
-                                                                                schema.Reference.Id, schema.Discriminator.PropertyName));
-                        }
-
                         if (!schema.Required.Contains(schema.Discriminator?.PropertyName))
                         {
                             context.CreateError(nameof(ValidateSchemaDiscriminator),

src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs

@@ -354,43 +354,7 @@ public void ValidateAnyOfCompositeSchemaMustContainPropertySpecifiedInTheDiscrim
         }
 
         [Fact]
-        public void ValidateSchemaMustContainPropertySpecifiedInTheRequiredFieldList()
-        {
-            IEnumerable<OpenApiError> errors;
-            var components = new OpenApiComponents
-            {
-                Schemas = {
-                    {
-                        "schema1",
-                        new OpenApiSchema
-                        {
-                            Type = "object",
-                            Required = { "property1" },
-                            Reference = new OpenApiReference { Id = "schema1" }
-                        }
-                    }
-                }
-            };
-            // Act
-            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
-            var walker = new OpenApiWalker(validator);
-            walker.Walk(components);
-
-            errors = validator.Errors;
-            bool result = !errors.Any();
-
-            // Assert
-            result.Should().BeFalse();
-            errors.ShouldAllBeEquivalentTo(new List<OpenApiValidatorError>
-            {
-                    new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateSchemaRequiredFields),"#/schemas/schema1/required",
-                        string.Format(SRResource.Validation_SchemaMustContainPropertySpecifiedInTheRequiredField,
-                                    "schema1", "property1")),
-            });
-        }
-
-        [Fact]
-        public void ValidateSchemaMustContainPropertySpecifiedInTheDiscriminator()
+        public void ValidateSchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator()
         {
             IEnumerable<OpenApiError> errors;
             var components = new OpenApiComponents
@@ -419,9 +383,6 @@ public void ValidateSchemaMustContainPropertySpecifiedInTheDiscriminator()
             result.Should().BeFalse();
             errors.ShouldAllBeEquivalentTo(new List<OpenApiValidatorError>
             {
-                    new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateSchemaDiscriminator),"#/schemas/schema1/discriminator",
-                        string.Format(SRResource.Validation_SchemaMustContainPropertySpecifiedInTheDiscriminator,
-                                    "schema1", "property1")),
                     new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateSchemaDiscriminator),"#/schemas/schema1/discriminator",
                         string.Format(SRResource.Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator,
                                     "schema1", "property1"))

test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs

@@ -43,7 +43,7 @@ public void DefaultRuleSetPropertyReturnsTheCorrectRules()
             Assert.NotEmpty(rules);
 
             // Update the number if you add new default rule(s).
-            Assert.Equal(24, rules.Count);
+            Assert.Equal(23, rules.Count);
         }
     }
 }