test(serializer): add test for complex msg obj

Author: diegomarquezp

gax-httpjson/src/main/java/com/google/api/gax/httpjson/JsonSerializableMessages.java

@@ -63,6 +63,9 @@
 @BetaApi
 public class ProtoRestSerializer<RequestT extends Message> {
   private final TypeRegistry registry;
+  
+  // well-known values obtained from
+  // https://github.com/googleapis/gapic-showcase/blob/fe414784c18878d704b884348d84c68fd6b87466/util/genrest/resttools/populatefield.go#L27
   private static final Set<Class<GeneratedMessageV3>> jsonSerializableMessages = new HashSet(
       Arrays.asList(
           com.google.protobuf.BoolValue.class,
@@ -227,7 +230,8 @@ public String toBody(String fieldName, RequestT fieldValue, boolean numericEnum)
    * @param fieldValue a field value to serialize
    */
   public String toQueryParamValue(Object fieldValue) {
-    if (fieldValue instanceof GeneratedMessageV3) {
+    // This will match with message types that are serializable (e.g. FieldMask)
+    if (fieldValue instanceof GeneratedMessageV3 && !isNonSerializableMessageValue(fieldValue)) {
       return toJson(((GeneratedMessageV3) fieldValue).toBuilder(), false)
           .replaceAll("^\"", "")
           .replaceAll("\"$", "");

gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoRestSerializer.java

@@ -31,6 +31,9 @@
 package com.google.api.gax.httpjson;
 
 import com.google.common.truth.Truth;
+import com.google.longrunning.Operation;
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
 import com.google.protobuf.Duration;
 import com.google.protobuf.Field;
 import com.google.protobuf.Field.Cardinality;
@@ -39,8 +42,10 @@
 import com.google.protobuf.Int32Value;
 import com.google.protobuf.Option;
 import com.google.protobuf.Timestamp;
+import com.google.rpc.Status;
 import java.io.IOException;
 import java.io.StringReader;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -183,6 +188,16 @@ public void putQueryParam() {
         fields, "optName8", FieldMask.newBuilder().addPaths("a.b").addPaths("c.d").build());
     requestSerializer.putQueryParam(fields, "optName9", Int32Value.of(1));
     requestSerializer.putQueryParam(fields, "optName10", FloatValue.of(1.1f));
+    com.google.longrunning.Operation operation = Operation.newBuilder()
+        .setDone(true)
+        .setError(Status.newBuilder()
+            .addDetails(Any.newBuilder().setValue(ByteString.copyFrom("error-1",
+              Charset.defaultCharset())).build())
+            .addDetails(Any.newBuilder().setValue(ByteString.copyFrom("error-2",
+              Charset.defaultCharset())).build()))
+        .setName("test")
+        .build();
+    requestSerializer.putQueryParam(fields, "optName11", operation);
 
     Map<String, List<String>> expectedFields = new HashMap<>();
     expectedFields.put("optName1", Arrays.asList("1"));
@@ -195,6 +210,9 @@ public void putQueryParam() {
     expectedFields.put("optName8", Arrays.asList("a.b,c.d"));
     expectedFields.put("optName9", Arrays.asList("1"));
     expectedFields.put("optName10", Arrays.asList("1.1"));
+    expectedFields.put("optName11.name", Arrays.asList("test"));
+    expectedFields.put("optName11.done", Arrays.asList("true"));
+    expectedFields.put("optName11.error.details.value", Arrays.asList("error-1", "error-2"));
 
     Truth.assertThat(fields).isEqualTo(expectedFields);
   }