if the top type name is any or interface{}, don't use allOf (#1421)

Signed-off-by: sdghchj <sdghchj@qq.com>
swaggo · Feb 22, 2023 · 566b8af · 566b8af
1 parent 4795c60
commit 566b8af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/operation.go b/operation.go
@@ -894,6 +894,11 @@ func parseCombinedObjectSchema(parser *Parser, refType string, astFile *ast.File
 		return schema, nil
 	}
 
+	if schema.Ref.GetURL() == nil && len(schema.Type) > 0 && schema.Type[0] == OBJECT && len(schema.Properties) == 0 && schema.AdditionalProperties == nil {
+		schema.Properties = props
+		return schema, nil
+	}
+
 	return spec.ComposedSchema(*schema, spec.Schema{
 		SchemaProps: spec.SchemaProps{
 			Type:       []string{OBJECT},

diff --git a/operation_test.go b/operation_test.go
@@ -2273,6 +2273,10 @@ func TestParseObjectSchema(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, schema, PrimitiveSchema(OBJECT))
 
+	schema, err = operation.parseObjectSchema("any{data=string}", nil)
+	assert.NoError(t, err)
+	assert.Equal(t, schema, PrimitiveSchema(OBJECT).SetProperty("data", *PrimitiveSchema("string")))
+
 	schema, err = operation.parseObjectSchema("int", nil)
 	assert.NoError(t, err)
 	assert.Equal(t, schema, PrimitiveSchema(INTEGER))