[ggj][codegen] fix: use Java packages for resname codegen

src/main/java/com/google/api/generator/gapic/protoparser/Parser.java

@@ -230,6 +230,7 @@ public static Map<String, Message> updateResourceNamesInMessages(
   }
 
   public static Map<String, ResourceName> parseResourceNames(CodeGeneratorRequest request) {
+    @VisibleForTesting String javaPackage = parseServiceJavaPackage(request);
     Map<String, FileDescriptor> fileDescriptors = getFilesToGenerate(request);
     Map<String, ResourceName> resourceNames = new HashMap<>();
     for (String fileToGenerate : request.getFileToGenerateList()) {
@@ -238,14 +239,19 @@ public static Map<String, ResourceName> parseResourceNames(CodeGeneratorRequest
               fileDescriptors.get(fileToGenerate),
               "Missing file descriptor for [%s]",
               fileToGenerate);
-      resourceNames.putAll(parseResourceNames(fileDescriptor));
+      resourceNames.putAll(parseResourceNames(fileDescriptor, javaPackage));
     }
     return resourceNames;
   }
 
-  // Convenience wrapper for package-external unit tests.
+  // Convenience wrapper for package-external unit tests. DO NOT ADD NEW FUNCTIONALITY HERE.
   public static Map<String, ResourceName> parseResourceNames(FileDescriptor fileDescriptor) {
-    return ResourceNameParser.parseResourceNames(fileDescriptor);
+    return parseResourceNames(fileDescriptor, TypeParser.getPackage(fileDescriptor));
+  }
+
+  public static Map<String, ResourceName> parseResourceNames(
+      FileDescriptor fileDescriptor, String javaPackage) {
+    return ResourceNameParser.parseResourceNames(fileDescriptor, javaPackage);
   }
 
   @VisibleForTesting
@@ -428,4 +434,32 @@ private static Map<String, FileDescriptor> getFilesToGenerate(CodeGeneratorReque
     }
     return fileDescriptors;
   }
+
+  private static String parseServiceJavaPackage(CodeGeneratorRequest request) {
+    Map<String, Integer> javaPackageCount = new HashMap<>();
+    Map<String, FileDescriptor> fileDescriptors = getFilesToGenerate(request);
+    for (String fileToGenerate : request.getFileToGenerateList()) {
+      FileDescriptor fileDescriptor =
+          Preconditions.checkNotNull(
+              fileDescriptors.get(fileToGenerate),
+              "Missing file descriptor for [%s]",
+              fileToGenerate);
+
+      String javaPackage = fileDescriptor.getOptions().getJavaPackage();
+      if (Strings.isNullOrEmpty(javaPackage)) {
+        continue;
+      }
+      if (javaPackageCount.containsKey(javaPackage)) {
+        javaPackageCount.put(javaPackage, javaPackageCount.get(javaPackage) + 1);
+      } else {
+        javaPackageCount.put(javaPackage, 1);
+      }
+    }
+
+    String finalJavaPackage =
+        javaPackageCount.entrySet().stream().max(Map.Entry.comparingByValue()).get().getKey();
+    Preconditions.checkState(
+        !Strings.isNullOrEmpty(finalJavaPackage), "No service Java package found");
+    return finalJavaPackage;
+  }
 }

src/main/java/com/google/api/generator/gapic/protoparser/ResourceNameParser.java

@@ -35,25 +35,44 @@
 
 public class ResourceNameParser {
   /** Returns a map of resource types (strings) to ResourceName POJOs. */
-  public static Map<String, ResourceName> parseResourceNames(FileDescriptor fileDescriptor) {
-    Map<String, ResourceName> resourceNames = parseResourceNamesFromFile(fileDescriptor);
-    String pakkage = TypeParser.getPackage(fileDescriptor);
+  public static Map<String, ResourceName> parseResourceNames(
+      FileDescriptor fileDescriptor, String javaPackage) {
+    Map<String, ResourceName> resourceNames =
+        parseResourceNamesFromFile(fileDescriptor, javaPackage);
+    String pakkage = fileDescriptor.getOptions().getJavaPackage();
+    if (Strings.isNullOrEmpty(pakkage)) {
+      pakkage = javaPackage;
+    }
     resourceNames.putAll(parseResourceNamesFromMessages(fileDescriptor.getMessageTypes(), pakkage));
     return resourceNames;
   }
 
+  // Convenience wrapper for uni tests. DO NOT ADD ANY NEW FUNCTIONALITY HERE.
+  @VisibleForTesting
+  public static Map<String, ResourceName> parseResourceNames(FileDescriptor fileDescriptor) {
+    String pakkage = TypeParser.getPackage(fileDescriptor);
+    return parseResourceNames(fileDescriptor, pakkage);
+  }
+
+  // Convenience wrapper for uni tests. DO NOT ADD ANY NEW FUNCTIONALITY HERE.
   @VisibleForTesting
   static Map<String, ResourceName> parseResourceNamesFromFile(FileDescriptor fileDescriptor) {
+    String pakkage = TypeParser.getPackage(fileDescriptor);
+    return parseResourceNamesFromFile(fileDescriptor, pakkage);
+  }
+
+  @VisibleForTesting
+  static Map<String, ResourceName> parseResourceNamesFromFile(
+      FileDescriptor fileDescriptor, String javaPackage) {
     Map<String, ResourceName> typeStringToResourceNames = new HashMap<>();
     FileOptions fileOptions = fileDescriptor.getOptions();
     if (fileOptions.getExtensionCount(ResourceProto.resourceDefinition) <= 0) {
       return typeStringToResourceNames;
     }
     List<ResourceDescriptor> protoResources =
         fileOptions.getExtension(ResourceProto.resourceDefinition);
-    String pakkage = TypeParser.getPackage(fileDescriptor);
     for (ResourceDescriptor protoResource : protoResources) {
-      Optional<ResourceName> resourceNameModelOpt = createResourceName(protoResource, pakkage);
+      Optional<ResourceName> resourceNameModelOpt = createResourceName(protoResource, javaPackage);
       if (!resourceNameModelOpt.isPresent()) {
         continue;
       }

src/main/java/com/google/api/generator/gapic/protoparser/ResourceReferenceParser.java

@@ -141,6 +141,7 @@ static Optional<ResourceName> parseParentResourceName(
             "%s/%s",
             resourceTypeString.substring(0, resourceTypeString.indexOf(SLASH)),
             JavaStyle.toUpperCamelCase(parentVariableName));
+
     ResourceName parentResourceName =
         ResourceName.builder()
             .setVariableName(parentVariableName)