Merge pull request #149 from koron/validation-extremely-slow-146

use expanded Analyzer for some validators for speed

Author: casualjim

default_validator.go

@@ -92,7 +92,7 @@ func (d *defaultValidator) validateDefaultValueValidAgainstSchema() *Result {
 res := new(Result)
 s := d.SpecValidator
 
-for method, pathItem := range s.analyzer.Operations() {
+for method, pathItem := range s.expandedAnalyzer().Operations() {
 for path, op := range pathItem {
 // parameters
 for _, param := range paramHelp.safeExpandedParamsFor(path, method, op.ID, res, s) {

example_validator.go

@@ -68,7 +68,7 @@ func (ex *exampleValidator) validateExampleValueValidAgainstSchema() *Result {
 res := new(Result)
 s := ex.SpecValidator
 
-for method, pathItem := range s.analyzer.Operations() {
+for method, pathItem := range s.expandedAnalyzer().Operations() {
 for path, op := range pathItem {
 // parameters
 for _, param := range paramHelp.safeExpandedParamsFor(path, method, op.ID, res, s) {

helpers.go

@@ -210,7 +210,7 @@ type paramHelper struct {
 }
 
 func (h *paramHelper) safeExpandedParamsFor(path, method, operationID string, res *Result, s *SpecValidator) (params []spec.Parameter) {
-operation, ok := s.analyzer.OperationFor(method, path)
+operation, ok := s.expandedAnalyzer().OperationFor(method, path)
 if ok {
 // expand parameters first if necessary
 resolvedParams := []spec.Parameter{}
@@ -224,7 +224,7 @@ func (h *paramHelper) safeExpandedParamsFor(path, method, operationID string, re
 // remove params with invalid expansion from Slice
 operation.Parameters = resolvedParams
 
-for _, ppr := range s.analyzer.SafeParamsFor(method, path,
+for _, ppr := range s.expandedAnalyzer().SafeParamsFor(method, path,
 func(p spec.Parameter, err error) bool {
 // since params have already been expanded, there are few causes for error
 res.AddErrors(someParametersBrokenMsg(path, method, operationID))

spec.go

@@ -624,7 +624,7 @@ func (s *SpecValidator) validateParameters() *Result {
 // - path param must be required
 res := new(Result)
 rexGarbledPathSegment := mustCompileRegexp(`.*[{}\s]+.*`)
-for method, pi := range s.analyzer.Operations() {
+for method, pi := range s.expandedAnalyzer().Operations() {
 methodPaths := make(map[string]map[string]string)
 for path, op := range pi {
 pathToAdd := pathHelp.stripParametersInPath(path)
@@ -793,3 +793,12 @@ func (s *SpecValidator) checkUniqueParams(path, method string, op *spec.Operatio
 func (s *SpecValidator) SetContinueOnErrors(c bool) {
 s.Options.ContinueOnErrors = c
 }
+
+// expandedAnalyzer returns expanded.Analyzer when it is available.
+// otherwise just analyzer.
+func (s *SpecValidator) expandedAnalyzer() *analysis.Spec {
+if s.expanded != nil && s.expanded.Analyzer != nil {
+return s.expanded.Analyzer
+}
+return s.analyzer
+}