Add an Option to Match JSON Encoding (#3)

* use json encoding

* encode to binary by default

* update the example

* simplify

* fix the test assets as well

* refactor

* update examples

Author: alpancs

example/user_add_comment.proto

@@ -9,17 +9,19 @@ message UserAddComment {
   message User {
     string first_name = 1;
     string last_name = 2;
+    bytes avatar = 3;
 
     message Location {
       double longitude = 1;
       double latitude = 2;
     }
 
-    Location location = 3;
+    Location location = 4;
   }
 
   User user = 1;
   string comment = 2;
-  Label label = 3;
+  example.Label label = 3;
+
   google.protobuf.Timestamp timestamp = 101;
 }

example/user_add_comment.pubsub.proto

@@ -5,29 +5,30 @@ message UserAddComment {
   message User {
     string first_name = 1;
     string last_name = 2;
+    bytes avatar = 3;
 
     message Location {
       double longitude = 1;
       double latitude = 2;
     }
-    Location location = 3;
 
+    Location location = 4;
   }
-  User user = 1;
 
+  User user = 1;
   string comment = 2;
 
   message Label {
     string key = 1;
     string value = 2;
   }
-  Label label = 3;
 
+  Label label = 3;
 
   message Timestamp {
     int64 seconds = 1;
     int32 nanos = 2;
   }
-  Timestamp timestamp = 101;
 
+  Timestamp timestamp = 101;
 }

response_builder.go

@@ -91,10 +91,7 @@ func (b responseBuilder) buildField(output io.Writer, field *descriptorpb.FieldD
 	fieldType := strings.ToLower(strings.TrimPrefix(field.GetType().String(), "TYPE_"))
 
 	if field.GetType() == descriptorpb.FieldDescriptorProto_TYPE_MESSAGE {
-		fmt.Fprintln(output)
-		defer fmt.Fprintln(output)
-		b.buildMessage(output, b.messageTypes[field.GetTypeName()], level)
-		fieldType = getShortTypeName(field.GetTypeName())
+		fieldType = b.buildFieldType(output, field.GetTypeName(), level)
 	}
 
 	fmt.Fprint(output, buildIndent(level))
@@ -104,10 +101,21 @@ func (b responseBuilder) buildField(output io.Writer, field *descriptorpb.FieldD
 	fmt.Fprintf(output, "%s %s = %d;\n", fieldType, field.GetName(), field.GetNumber())
 }
 
-func buildIndent(level int) string {
-	return strings.Repeat("  ", level)
-}
+func (b responseBuilder) buildFieldType(output io.Writer, typeName string, level int) string {
+	if typeName, ok := wktMapping[typeName]; ok && b.hasJSONEncoding() {
+		return typeName
+	}
 
-func getShortTypeName(typeName string) string {
+	fmt.Fprintln(output)
+	b.buildMessage(output, b.messageTypes[typeName], level)
+	fmt.Fprintln(output)
 	return typeName[strings.LastIndexByte(typeName, '.')+1:]
 }
+
+func (b responseBuilder) hasJSONEncoding() bool {
+	return strings.Contains(b.request.GetParameter(), "encoding=json")
+}
+
+func buildIndent(level int) string {
+	return strings.Repeat("  ", level)
+}

test/user_add_comment.pubsub.protobuf

@@ -11,24 +11,24 @@ message UserAddComment {
       double longitude = 1;
       double latitude = 2;
     }
-    Location location = 3;
 
+    Location location = 3;
   }
-  User user = 1;
 
+  User user = 1;
   string comment = 2;
 
   message Label {
     string key = 1;
     string value = 2;
   }
-  Label label = 3;
 
+  Label label = 3;
 
   message Timestamp {
     int64 seconds = 1;
     int32 nanos = 2;
   }
-  Timestamp timestamp = 101;
 
+  Timestamp timestamp = 101;
 }

wkt.go

@@ -0,0 +1,15 @@
+package main
+
+var wktMapping = map[string]string{
+	".google.protobuf.Int32Value":  "int32",
+	".google.protobuf.Int64Value":  "int64",
+	".google.protobuf.UInt32Value": "uint32",
+	".google.protobuf.UInt64Value": "uint64",
+	".google.protobuf.DoubleValue": "double",
+	".google.protobuf.FloatValue":  "float",
+	".google.protobuf.BoolValue":   "bool",
+	".google.protobuf.StringValue": "string",
+	".google.protobuf.BytesValue":  "bytes",
+	".google.protobuf.Duration":    "string",
+	".google.protobuf.Timestamp":   "string",
+}