use expaneded Analyzer for some validators

go-openapi · May 19, 2022 · b68537f · b68537f
1 parent c5b9514
commit b68537f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/default_validator.go b/default_validator.go
@@ -92,7 +92,12 @@ func (d *defaultValidator) validateDefaultValueValidAgainstSchema() *Result {
 	res := new(Result)
 	s := d.SpecValidator
 
-	for method, pathItem := range s.analyzer.Operations() {
+	a := s.analyzer
+	if s.expanded != nil && s.expanded.Analyzer != nil {
+		a = s.expanded.Analyzer
+	}
+
+	for method, pathItem := range a.Operations() {
 		for path, op := range pathItem {
 			// parameters
 			for _, param := range paramHelp.safeExpandedParamsFor(path, method, op.ID, res, s) {

diff --git a/example_validator.go b/example_validator.go
@@ -68,7 +68,12 @@ func (ex *exampleValidator) validateExampleValueValidAgainstSchema() *Result {
 	res := new(Result)
 	s := ex.SpecValidator
 
-	for method, pathItem := range s.analyzer.Operations() {
+	a := s.analyzer
+	if s.expanded != nil && s.expanded.Analyzer != nil {
+		a = s.expanded.Analyzer
+	}
+
+	for method, pathItem := range a.Operations() {
 		for path, op := range pathItem {
 			// parameters
 			for _, param := range paramHelp.safeExpandedParamsFor(path, method, op.ID, res, s) {