Skip to content

Commit 031a42d

Browse files
authored
Optional second parameter when using object in swaggertype (#844)
1 parent ee29e2b commit 031a42d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

schema.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,12 @@ func BuildCustomSchema(types []string) (*spec.Schema, error) {
155155
}
156156

157157
switch types[0] {
158-
case "primitive":
158+
case PRIMITIVE:
159159
if len(types) == 1 {
160160
return nil, errors.New("need primitive type after primitive")
161161
}
162162
return BuildCustomSchema(types[1:])
163-
case "array":
163+
case ARRAY:
164164
if len(types) == 1 {
165165
return nil, errors.New("need array item type after array")
166166
}
@@ -169,9 +169,9 @@ func BuildCustomSchema(types []string) (*spec.Schema, error) {
169169
return nil, err
170170
}
171171
return spec.ArrayProperty(schema), nil
172-
case "object":
172+
case OBJECT:
173173
if len(types) == 1 {
174-
return nil, errors.New("need object item type after object")
174+
return PrimitiveSchema(types[0]), nil
175175
}
176176
schema, err := BuildCustomSchema(types[1:])
177177
if err != nil {

schema_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ func TestBuildCustomSchema(t *testing.T) {
106106
assert.Equal(t, schema.SchemaProps.Items.Schema.SchemaProps.Type, spec.StringOrArray{"string"})
107107

108108
schema, err = BuildCustomSchema([]string{"object"})
109-
assert.Error(t, err)
110-
assert.Nil(t, schema)
109+
assert.NoError(t, err)
110+
assert.Equal(t, schema.SchemaProps.Type, spec.StringOrArray{"object"})
111111

112112
schema, err = BuildCustomSchema([]string{"object", "oops"})
113113
assert.Error(t, err)

0 commit comments

Comments
 (0)