Merge pull request grpc-ecosystem#133 from ivucica/swagger_defs_type_…

…object Swagger definitions now have `type` set to `object`.
adasari · Apr 19, 2016 · 6c680f2 · 6c680f2
2 parents c080463 + 7c0125f
commit 6c680f2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -94,5 +94,6 @@ realclean: distclean
 	rm -f $(EXAMPLE_GWSRCS)
 	rm -f $(EXAMPLE_SWAGGERSRCS)
 	rm -f $(GO_PLUGIN)
+	rm -f $(SWAGGER_PLUGIN)
 
 .PHONY: generate examples test clean distclean realclean
diff --git a/examples/examplepb/echo_service.swagger.json b/examples/examplepb/echo_service.swagger.json
@@ -71,6 +71,7 @@
   },
   "definitions": {
     "examplepbSimpleMessage": {
+      "type": "object",
       "properties": {
         "id": {
           "type": "string",

diff --git a/examples/examplepb/streamless_everything.swagger.json b/examples/examplepb/streamless_everything.swagger.json
@@ -339,6 +339,7 @@
   },
   "definitions": {
     "ABitOfEverythingNested": {
+      "type": "object",
       "properties": {
         "amount": {
           "type": "integer",
@@ -362,6 +363,7 @@
       "default": "FALSE"
     },
     "examplepbABitOfEverything": {
+      "type": "object",
       "properties": {
         "bool_value": {
           "type": "boolean",
@@ -441,8 +443,11 @@
         }
       }
     },
-    "examplepbEmptyMessage": {},
+    "examplepbEmptyMessage": {
+      "type": "object"
+    },
     "examplepbIdMessage": {
+      "type": "object",
       "properties": {
         "uuid": {
           "type": "string",
@@ -459,6 +464,7 @@
       "default": "ZERO"
     },
     "subStringMessage": {
+      "type": "object",
       "properties": {
         "value": {
           "type": "string",

diff --git a/protoc-gen-swagger/genswagger/template.go b/protoc-gen-swagger/genswagger/template.go
@@ -51,6 +51,7 @@ func findNestedMessagesAndEnumerations(message *descriptor.Message, reg *descrip
 func renderMessagesAsDefinition(messages messageMap, d swaggerDefinitionsObject, reg *descriptor.Registry) {
 	for _, msg := range messages {
 		object := swaggerSchemaObject{
+			Type: "object",
 			Properties: map[string]swaggerSchemaObject{},
 		}
 		for _, field := range msg.Fields {