From 645bf786118d778f934520d08b51e33a6ebc1380 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Fri, 12 Jan 2024 18:24:10 +0800 Subject: [PATCH] Simplify extensions merge in `mergeOpenapiSchemas` From the Go specification [1]: "3. If the map is nil, the number of iterations is 0." Therefore, an additional nil check for before the loop is unnecessary. Signed-off-by: Eng Zer Jun --- pkg/codegen/merge_schemas.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkg/codegen/merge_schemas.go b/pkg/codegen/merge_schemas.go index 419d52bd9..ad3d3380c 100644 --- a/pkg/codegen/merge_schemas.go +++ b/pkg/codegen/merge_schemas.go @@ -86,19 +86,14 @@ func mergeAllOf(allOf []*openapi3.SchemaRef) (openapi3.Schema, error) { // all of whose fields are composed. func mergeOpenapiSchemas(s1, s2 openapi3.Schema, allOf bool) (openapi3.Schema, error) { var result openapi3.Schema - if s1.Extensions != nil || s2.Extensions != nil { - result.Extensions = make(map[string]interface{}) - if s1.Extensions != nil { - for k, v := range s1.Extensions { - result.Extensions[k] = v - } - } - if s2.Extensions != nil { - for k, v := range s2.Extensions { - // TODO: Check for collisions - result.Extensions[k] = v - } - } + + result.Extensions = make(map[string]interface{}) + for k, v := range s1.Extensions { + result.Extensions[k] = v + } + for k, v := range s2.Extensions { + // TODO: Check for collisions + result.Extensions[k] = v } result.OneOf = append(s1.OneOf, s2.OneOf...)