Simplify extensions merge in `mergeOpenapiSchemas` #1424

Juneezee · 2024-01-12T10:33:59Z

From the Go specification ¹:

"3. If the map is nil, the number of iterations is 0."

Therefore, we don't need the nil checks for merging the Extensions. Just like how we did for Properties:

oapi-codegen/pkg/codegen/merge_schemas.go

Lines 202 to 210 in 66f9bb8

    
           // We merge all properties 
        
           result.Properties = make(map[string]*openapi3.SchemaRef) 
        
           for k, v := range s1.Properties { 
        
           	result.Properties[k] = v 
        
           } 
        
           for k, v := range s2.Properties { 
        
           	// TODO: detect conflicts 
        
           	result.Properties[k] = v 
        
           }

https://go.dev/ref/spec#For_range ↩

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 <engzerjun@gmail.com>

Simplify extensions merge in mergeOpenapiSchemas

798a070

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 <engzerjun@gmail.com>

Juneezee force-pushed the master branch from 454b9bb to 798a070 Compare January 26, 2024 02:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify extensions merge in `mergeOpenapiSchemas` #1424

Simplify extensions merge in `mergeOpenapiSchemas` #1424

Juneezee commented Jan 12, 2024 •

edited

	// We merge all properties
	result.Properties = make(map[string]*openapi3.SchemaRef)
	for k, v := range s1.Properties {
	result.Properties[k] = v
	}
	for k, v := range s2.Properties {
	// TODO: detect conflicts
	result.Properties[k] = v
	}

Simplify extensions merge in mergeOpenapiSchemas #1424

Are you sure you want to change the base?

Simplify extensions merge in mergeOpenapiSchemas #1424

Conversation

Juneezee commented Jan 12, 2024 • edited

Footnotes

Simplify extensions merge in `mergeOpenapiSchemas` #1424

Simplify extensions merge in `mergeOpenapiSchemas` #1424

Juneezee commented Jan 12, 2024 •

edited