[ggj][protos] fix: prevent descension into map types in nested messag…

…e parsing (#426) * fix: support non-name fields with res-refs in resname def parsing * fix: add workaround for missing default_host and oauth_scopes annotation * [ggj][infra][3/5]feat: add goldens update bazel rules for Redis API (#396) * goldens update bazel rules * clean up * [ggj][infra][4/5]feat: add goldens update bazel rules for Asset API (#397) * goldens update bazel rules * clean up * goldens update rule for asset API * update goldens * [ggj][infra][3/5]feat: add goldens update bazel rules for Redis API (#396) * goldens update bazel rules * clean up * [ggj][infra][4/5]feat: add goldens update bazel rules for Asset API (#397) * goldens update bazel rules * clean up * goldens update rule for asset API * update goldens * [ggj][infra][3/5]feat: add goldens update bazel rules for Redis API (#396) * goldens update bazel rules * clean up * [ggj][infra][4/5]feat: add goldens update bazel rules for Asset API (#397) * goldens update bazel rules * clean up * goldens update rule for asset API * update goldens * fix: clarify LRO parsing error messages * feat: support deeply-nested types in AST and proto message parsing * fix: prevent resname tokens from matching subcomponents * fix: use TypeParser for proto message parsing * fix: merge master * fix: use generic types in field instantiation in ServiceClientTest * fix: prevent descension into map types in nested message parsing * fix: merge master * fix: merge master * fix: merge master * fix: merge master Co-authored-by: Xiaozhen Liu <[email protected]>
googleapis · Oct 31, 2020 · 6993a34 · 6993a34
1 parent 080aa25
commit 6993a34
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
@@ -232,6 +232,9 @@ private static Map<String, Message> parseMessages(
     String messageName = messageDescriptor.getName();
     if (!messageDescriptor.getNestedTypes().isEmpty()) {
       for (Descriptor nestedMessage : messageDescriptor.getNestedTypes()) {
+        if (isMapType(nestedMessage)) {
+          continue;
+        }
         outerNestedTypes.add(messageName);
         messages.putAll(parseMessages(nestedMessage, outerNestedTypes));
       }
@@ -248,6 +251,16 @@ private static Map<String, Message> parseMessages(
     return messages;
   }
 
+  private static boolean isMapType(Descriptor messageDescriptor) {
+    List<String> fieldNames =
+        messageDescriptor.getFields().stream().map(f -> f.getName()).collect(Collectors.toList());
+    // Ends in "Entry" and has exactly two fields, named "key" and "value".
+    return messageDescriptor.getName().endsWith("Entry")
+        && fieldNames.size() == 2
+        && fieldNames.get(0).equals("key")
+        && fieldNames.get(1).equals("value");
+  }
+
   /**
    * Populates ResourceName objects in Message POJOs.
    *

diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/SourceCodeInfoParser.java b/src/main/java/com/google/api/generator/gapic/protoparser/SourceCodeInfoParser.java
@@ -76,7 +76,8 @@ public SourceCodeInfoLocation getLocation(FieldDescriptor field) {
     if (!file.toProto().hasSourceCodeInfo()) {
       return null;
     }
-    return SourceCodeInfoLocation.create(getLocation(file, buildPath(field)));
+    Location fieldLocation = getLocation(file, buildPath(field));
+    return SourceCodeInfoLocation.create(fieldLocation);
   }
 
   /** Gets the location of a service, if available. */

diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel
@@ -86,6 +86,7 @@ java_gapic_library(
     ],
 )
 
+# Logging API
 java_gapic_library(
     name = "logging_java_gapic",
     srcs = ["@com_google_googleapis//google/logging/v2:logging_proto_with_info"],