Merge pull request #147 from gengo/feature/map-swagger

Support map types in swagger generator
grpc-ecosystem · May 9, 2016 · 8205819 · 8205819
2 parents ad33b2f + 4fa18b9
commit 8205819
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 268 deletions.
diff --git a/examples/examplepb/a_bit_of_everything.pb.go b/examples/examplepb/a_bit_of_everything.pb.go
diff --git a/examples/examplepb/a_bit_of_everything.proto b/examples/examplepb/a_bit_of_everything.proto
@@ -36,12 +36,14 @@ message ABitOfEverything {
 	sint32 sint32_value = 17;
 	sint64 sint64_value = 18;
 	repeated string repeated_string_value = 19;
-
 	oneof oneof_value {
 		EmptyMessage oneof_empty = 20;
 		string oneof_string = 21;
 	}
+
 	map<string, NumericEnum> map_value = 22;
+	map<string, string> mapped_string_value = 23;
+	map<string, Nested> mapped_nested_value = 24;
 }
 
 message EmptyMessage {

diff --git a/examples/examplepb/streamless_everything.proto b/examples/examplepb/streamless_everything.proto
@@ -35,6 +35,14 @@ message ABitOfEverything {
 	sint32 sint32_value = 17;
 	sint64 sint64_value = 18;
 	repeated string repeated_string_value = 19;
+	oneof oneof_value {
+		EmptyMessage oneof_empty = 20;
+		string oneof_string = 21;
+	}
+
+	map<string, NumericEnum> map_value = 22;
+	map<string, string> mapped_string_value = 23;
+	map<string, Nested> mapped_nested_value = 24;
 }
 
 message EmptyMessage {

diff --git a/examples/examplepb/streamless_everything.swagger.json b/examples/examplepb/streamless_everything.swagger.json
@@ -396,12 +396,38 @@
           "type": "integer",
           "format": "int64"
         },
+        "map_value": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/examplepbNumericEnum"
+          }
+        },
+        "mapped_nested_value": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/ABitOfEverythingNested"
+          }
+        },
+        "mapped_string_value": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string",
+            "format": "string"
+          }
+        },
         "nested": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/ABitOfEverythingNested"
           }
         },
+        "oneof_empty": {
+          "$ref": "#/definitions/examplepbEmptyMessage"
+        },
+        "oneof_string": {
+          "type": "string",
+          "format": "string"
+        },
         "repeated_string_value": {
           "type": "array",
           "items": {