openapi3: sort extra fields only once, during deserialization (#773)

fenollp · web-flow · commit e53fe386960a · 2023-02-27T11:49:09.000+01:00
diff --git a/openapi3/refs.go b/openapi3/refs.go
@@ -46,6 +46,7 @@ func (x *CallbackRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -56,8 +57,6 @@ func (x *CallbackRef) UnmarshalJSON(data []byte) error {
 func (x *CallbackRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
@@ -123,6 +122,7 @@ func (x *ExampleRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -133,8 +133,6 @@ func (x *ExampleRef) UnmarshalJSON(data []byte) error {
 func (x *ExampleRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
@@ -200,6 +198,7 @@ func (x *HeaderRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -210,8 +209,6 @@ func (x *HeaderRef) UnmarshalJSON(data []byte) error {
 func (x *HeaderRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
@@ -277,6 +274,7 @@ func (x *LinkRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -287,8 +285,6 @@ func (x *LinkRef) UnmarshalJSON(data []byte) error {
 func (x *LinkRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
@@ -354,6 +350,7 @@ func (x *ParameterRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -364,8 +361,6 @@ func (x *ParameterRef) UnmarshalJSON(data []byte) error {
 func (x *ParameterRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
@@ -431,6 +426,7 @@ func (x *RequestBodyRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -441,8 +437,6 @@ func (x *RequestBodyRef) UnmarshalJSON(data []byte) error {
 func (x *RequestBodyRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
@@ -508,6 +502,7 @@ func (x *ResponseRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -518,8 +513,6 @@ func (x *ResponseRef) UnmarshalJSON(data []byte) error {
 func (x *ResponseRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
@@ -585,6 +578,7 @@ func (x *SchemaRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -595,8 +589,6 @@ func (x *SchemaRef) UnmarshalJSON(data []byte) error {
 func (x *SchemaRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
@@ -662,6 +654,7 @@ func (x *SecuritySchemeRef) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -672,8 +665,6 @@ func (x *SecuritySchemeRef) UnmarshalJSON(data []byte) error {
 func (x *SecuritySchemeRef) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {
diff --git a/refs.sh b/refs.sh
@@ -80,6 +80,7 @@ func (x *${type}Ref) UnmarshalJSON(data []byte) error {
 			for key := range extra {
 				x.extra = append(x.extra, key)
 			}
+			sort.Strings(x.extra)
 		}
 		return nil
 	}
@@ -90,8 +91,6 @@ func (x *${type}Ref) UnmarshalJSON(data []byte) error {
 func (x *${type}Ref) Validate(ctx context.Context, opts ...ValidationOption) error {
 	ctx = WithValidationOptions(ctx, opts...)
 	if extra := x.extra; len(extra) != 0 {
-		sort.Strings(extra)
-
 		extras := make([]string, 0, len(extra))
 		allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed
 		if allowed == nil {

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ func (x *CallbackRef) UnmarshalJSON(data []byte) error {`
`46`	`46`	`for key := range extra {`
`47`	`47`	`x.extra = append(x.extra, key)`
`48`	`48`	`}`
	`49`	`+ sort.Strings(x.extra)`
`49`	`50`	`}`
`50`	`51`	`return nil`
`51`	`52`	`}`
`@@ -56,8 +57,6 @@ func (x *CallbackRef) UnmarshalJSON(data []byte) error {`
`56`	`57`	`func (x *CallbackRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`57`	`58`	`ctx = WithValidationOptions(ctx, opts...)`
`58`	`59`	`if extra := x.extra; len(extra) != 0 {`
`59`		`- sort.Strings(extra)`
`60`		`-`
`61`	`60`	`extras := make([]string, 0, len(extra))`
`62`	`61`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`63`	`62`	`if allowed == nil {`
`@@ -123,6 +122,7 @@ func (x *ExampleRef) UnmarshalJSON(data []byte) error {`
`123`	`122`	`for key := range extra {`
`124`	`123`	`x.extra = append(x.extra, key)`
`125`	`124`	`}`
	`125`	`+ sort.Strings(x.extra)`
`126`	`126`	`}`
`127`	`127`	`return nil`
`128`	`128`	`}`
`@@ -133,8 +133,6 @@ func (x *ExampleRef) UnmarshalJSON(data []byte) error {`
`133`	`133`	`func (x *ExampleRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`134`	`134`	`ctx = WithValidationOptions(ctx, opts...)`
`135`	`135`	`if extra := x.extra; len(extra) != 0 {`
`136`		`- sort.Strings(extra)`
`137`		`-`
`138`	`136`	`extras := make([]string, 0, len(extra))`
`139`	`137`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`140`	`138`	`if allowed == nil {`
`@@ -200,6 +198,7 @@ func (x *HeaderRef) UnmarshalJSON(data []byte) error {`
`200`	`198`	`for key := range extra {`
`201`	`199`	`x.extra = append(x.extra, key)`
`202`	`200`	`}`
	`201`	`+ sort.Strings(x.extra)`
`203`	`202`	`}`
`204`	`203`	`return nil`
`205`	`204`	`}`
`@@ -210,8 +209,6 @@ func (x *HeaderRef) UnmarshalJSON(data []byte) error {`
`210`	`209`	`func (x *HeaderRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`211`	`210`	`ctx = WithValidationOptions(ctx, opts...)`
`212`	`211`	`if extra := x.extra; len(extra) != 0 {`
`213`		`- sort.Strings(extra)`
`214`		`-`
`215`	`212`	`extras := make([]string, 0, len(extra))`
`216`	`213`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`217`	`214`	`if allowed == nil {`
`@@ -277,6 +274,7 @@ func (x *LinkRef) UnmarshalJSON(data []byte) error {`
`277`	`274`	`for key := range extra {`
`278`	`275`	`x.extra = append(x.extra, key)`
`279`	`276`	`}`
	`277`	`+ sort.Strings(x.extra)`
`280`	`278`	`}`
`281`	`279`	`return nil`
`282`	`280`	`}`
`@@ -287,8 +285,6 @@ func (x *LinkRef) UnmarshalJSON(data []byte) error {`
`287`	`285`	`func (x *LinkRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`288`	`286`	`ctx = WithValidationOptions(ctx, opts...)`
`289`	`287`	`if extra := x.extra; len(extra) != 0 {`
`290`		`- sort.Strings(extra)`
`291`		`-`
`292`	`288`	`extras := make([]string, 0, len(extra))`
`293`	`289`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`294`	`290`	`if allowed == nil {`
`@@ -354,6 +350,7 @@ func (x *ParameterRef) UnmarshalJSON(data []byte) error {`
`354`	`350`	`for key := range extra {`
`355`	`351`	`x.extra = append(x.extra, key)`
`356`	`352`	`}`
	`353`	`+ sort.Strings(x.extra)`
`357`	`354`	`}`
`358`	`355`	`return nil`
`359`	`356`	`}`
`@@ -364,8 +361,6 @@ func (x *ParameterRef) UnmarshalJSON(data []byte) error {`
`364`	`361`	`func (x *ParameterRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`365`	`362`	`ctx = WithValidationOptions(ctx, opts...)`
`366`	`363`	`if extra := x.extra; len(extra) != 0 {`
`367`		`- sort.Strings(extra)`
`368`		`-`
`369`	`364`	`extras := make([]string, 0, len(extra))`
`370`	`365`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`371`	`366`	`if allowed == nil {`
`@@ -431,6 +426,7 @@ func (x *RequestBodyRef) UnmarshalJSON(data []byte) error {`
`431`	`426`	`for key := range extra {`
`432`	`427`	`x.extra = append(x.extra, key)`
`433`	`428`	`}`
	`429`	`+ sort.Strings(x.extra)`
`434`	`430`	`}`
`435`	`431`	`return nil`
`436`	`432`	`}`
`@@ -441,8 +437,6 @@ func (x *RequestBodyRef) UnmarshalJSON(data []byte) error {`
`441`	`437`	`func (x *RequestBodyRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`442`	`438`	`ctx = WithValidationOptions(ctx, opts...)`
`443`	`439`	`if extra := x.extra; len(extra) != 0 {`
`444`		`- sort.Strings(extra)`
`445`		`-`
`446`	`440`	`extras := make([]string, 0, len(extra))`
`447`	`441`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`448`	`442`	`if allowed == nil {`
`@@ -508,6 +502,7 @@ func (x *ResponseRef) UnmarshalJSON(data []byte) error {`
`508`	`502`	`for key := range extra {`
`509`	`503`	`x.extra = append(x.extra, key)`
`510`	`504`	`}`
	`505`	`+ sort.Strings(x.extra)`
`511`	`506`	`}`
`512`	`507`	`return nil`
`513`	`508`	`}`
`@@ -518,8 +513,6 @@ func (x *ResponseRef) UnmarshalJSON(data []byte) error {`
`518`	`513`	`func (x *ResponseRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`519`	`514`	`ctx = WithValidationOptions(ctx, opts...)`
`520`	`515`	`if extra := x.extra; len(extra) != 0 {`
`521`		`- sort.Strings(extra)`
`522`		`-`
`523`	`516`	`extras := make([]string, 0, len(extra))`
`524`	`517`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`525`	`518`	`if allowed == nil {`
`@@ -585,6 +578,7 @@ func (x *SchemaRef) UnmarshalJSON(data []byte) error {`
`585`	`578`	`for key := range extra {`
`586`	`579`	`x.extra = append(x.extra, key)`
`587`	`580`	`}`
	`581`	`+ sort.Strings(x.extra)`
`588`	`582`	`}`
`589`	`583`	`return nil`
`590`	`584`	`}`
`@@ -595,8 +589,6 @@ func (x *SchemaRef) UnmarshalJSON(data []byte) error {`
`595`	`589`	`func (x *SchemaRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`596`	`590`	`ctx = WithValidationOptions(ctx, opts...)`
`597`	`591`	`if extra := x.extra; len(extra) != 0 {`
`598`		`- sort.Strings(extra)`
`599`		`-`
`600`	`592`	`extras := make([]string, 0, len(extra))`
`601`	`593`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`602`	`594`	`if allowed == nil {`
`@@ -662,6 +654,7 @@ func (x *SecuritySchemeRef) UnmarshalJSON(data []byte) error {`
`662`	`654`	`for key := range extra {`
`663`	`655`	`x.extra = append(x.extra, key)`
`664`	`656`	`}`
	`657`	`+ sort.Strings(x.extra)`
`665`	`658`	`}`
`666`	`659`	`return nil`
`667`	`660`	`}`
`@@ -672,8 +665,6 @@ func (x *SecuritySchemeRef) UnmarshalJSON(data []byte) error {`
`672`	`665`	`func (x *SecuritySchemeRef) Validate(ctx context.Context, opts ...ValidationOption) error {`
`673`	`666`	`ctx = WithValidationOptions(ctx, opts...)`
`674`	`667`	`if extra := x.extra; len(extra) != 0 {`
`675`		`- sort.Strings(extra)`
`676`		`-`
`677`	`668`	`extras := make([]string, 0, len(extra))`
`678`	`669`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`679`	`670`	`if allowed == nil {`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ func (x *${type}Ref) UnmarshalJSON(data []byte) error {`
`80`	`80`	`for key := range extra {`
`81`	`81`	`x.extra = append(x.extra, key)`
`82`	`82`	`}`
	`83`	`+ sort.Strings(x.extra)`
`83`	`84`	`}`
`84`	`85`	`return nil`
`85`	`86`	`}`
`@@ -90,8 +91,6 @@ func (x *${type}Ref) UnmarshalJSON(data []byte) error {`
`90`	`91`	`func (x *${type}Ref) Validate(ctx context.Context, opts ...ValidationOption) error {`
`91`	`92`	`ctx = WithValidationOptions(ctx, opts...)`
`92`	`93`	`if extra := x.extra; len(extra) != 0 {`
`93`		`- sort.Strings(extra)`
`94`		`-`
`95`	`94`	`extras := make([]string, 0, len(extra))`
`96`	`95`	`allowed := getValidationOptions(ctx).extraSiblingFieldsAllowed`
`97`	`96`	`if allowed == nil {`