swagger: report golang type []byte as json type string

emicklei · Aug 8, 2016 · 3cae443 · 3cae443
1 parent b14c3a9
commit 3cae443
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/swagger/model_builder.go b/swagger/model_builder.go
@@ -65,8 +65,12 @@ func (b modelBuilder) addModel(st reflect.Type, nameOverride string) *Model {
 
 	// check for slice or array
 	if st.Kind() == reflect.Slice || st.Kind() == reflect.Array {
-		b.addModel(st.Elem(), "")
-		return &sm
+		if st.Elem().Kind() == reflect.Uint8 {
+			return nil
+		} else {
+			b.addModel(st.Elem(), "")
+			return &sm
+		}
 	}
 	// check for structure or primitive type
 	if st.Kind() != reflect.Struct {
@@ -276,6 +280,11 @@ func (b modelBuilder) buildArrayTypeProperty(field reflect.StructField, jsonName
 		return jsonName, prop
 	}
 	fieldType := field.Type
+	if fieldType.Elem().Kind() == reflect.Uint8 {
+		stringt := "string"
+		prop.Type = &stringt
+		return jsonName, prop
+	}
 	var pType = "array"
 	prop.Type = &pType
 	isPrimitive := b.isPrimitiveType(fieldType.Elem().Name())

diff --git a/swagger/model_builder_test.go b/swagger/model_builder_test.go
@@ -869,10 +869,7 @@ func TestRegion_Issue113(t *testing.T) {
    ],
    "properties": {
     "id": {
-     "type": "array",
-     "items": {
-      "type": "integer"
-     }
+     "type": "string"
     },
     "name": {
      "type": "string"