feature: Always show more specific error message

getkin · Aug 4, 2021 · 0b6e029 · 0b6e029
1 parent 0b13715
commit 0b6e029
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 34 deletions.
diff --git a/openapi3/schema.go b/openapi3/schema.go
@@ -825,10 +825,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
 		if v == nil {
 			return foundUnresolvedRef(ref.Ref)
 		}
-		var oldfailfast bool
-		oldfailfast, settings.failfast = settings.failfast, true
 		err := v.visitJSON(settings, value)
-		settings.failfast = oldfailfast
 		if err == nil {
 			if settings.failfast {
 				return errSchema
@@ -869,10 +866,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
 				continue
 			}
 
-			var oldfailfast bool
-			oldfailfast, settings.failfast = settings.failfast, true
 			err := v.visitJSON(settings, value)
-			settings.failfast = oldfailfast
 			if err != nil {
 				validationErrors = append(validationErrors, err)
 				continue
@@ -914,10 +908,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
 			if v == nil {
 				return foundUnresolvedRef(item.Ref)
 			}
-			var oldfailfast bool
-			oldfailfast, settings.failfast = settings.failfast, true
 			err := v.visitJSON(settings, value)
-			settings.failfast = oldfailfast
 			if err == nil {
 				ok = true
 				break
@@ -940,10 +931,7 @@ func (schema *Schema) visitSetOperations(settings *schemaValidationSettings, val
 		if v == nil {
 			return foundUnresolvedRef(item.Ref)
 		}
-		var oldfailfast bool
-		oldfailfast, settings.failfast = settings.failfast, false
 		err := v.visitJSON(settings, value)
-		settings.failfast = oldfailfast
 		if err != nil {
 			if settings.failfast {
 				return errSchema

diff --git a/routers/legacy/validate_request_test.go b/routers/legacy/validate_request_test.go
@@ -107,26 +107,6 @@ func Example() {
 		fmt.Println(err)
 	}
 	// Output:
-	// request body has an error: doesn't match the schema: Doesn't match schema "oneOf"
-	// Schema:
-	//   {
-	//     "discriminator": {
-	//       "propertyName": "pet_type"
-	//     },
-	//     "oneOf": [
-	//       {
-	//         "$ref": "#/components/schemas/Cat"
-	//       },
-	//       {
-	//         "$ref": "#/components/schemas/Dog"
-	//       }
-	//     ]
-	//   }
-	//
-	// Value:
-	//   {
-	//     "bark": true,
-	//     "breed": "Dingo",
-	//     "pet_type": "Cat"
-	//   }
+	// request body has an error: doesn't match the schema: input matches more than one oneOf schemas
+
 }