[ggj][engx][codegen] fix: use gapic-remapped names in package-info.java (#600)

* fix: fix dep ordering in Bazel dedupe rules

* chore:  centralize all Gapic class name getters

* fix: use gapic-remapped names in package-info.java

* fix: revert unrelated changes

Author: miraleung

src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java

@@ -36,7 +36,6 @@ public class ClientLibraryPackageInfoComposer {
   private static final String PACKAGE_INFO_DESCRIPTION =
       "The interfaces provided are listed below, along with usage samples.";
 
-  private static final String CLIENT_PATTERN = "%sClient";
   private static final String PACKAGE_INFO_TITLE_PATTERN = "A client to %s";
   private static final String SAMPLE_CODE_HEADER_PATTERN = "Sample for %s:";
   private static final String SERVICE_DESCRIPTION_HEADER_PATTERN = "Service Description: %s";
@@ -71,7 +70,7 @@ private static CommentStatement createPackageInfoJavadoc(GapicContext context) {
     javaDocCommentBuilder = javaDocCommentBuilder.addParagraph(PACKAGE_INFO_DESCRIPTION);
 
     for (Service service : context.services()) {
-      String javaClientName = String.format(CLIENT_PATTERN, service.name());
+      String javaClientName = ClassNames.getServiceClientClassName(service);
       javaDocCommentBuilder =
           javaDocCommentBuilder.addParagraph(
               String.format("%s %s %s", DIVIDER, javaClientName, DIVIDER));
@@ -111,7 +110,6 @@ private static CommentStatement createPackageInfoJavadoc(GapicContext context) {
       javaDocCommentBuilder =
           javaDocCommentBuilder.addParagraph(
               String.format(SAMPLE_CODE_HEADER_PATTERN, javaClientName));
-
       // TODO(summerji): Add package-info.java sample code here.
     }
 

test/integration/goldens/logging/package-info.java

@@ -17,23 +17,23 @@
 /**
  * The interfaces provided are listed below, along with usage samples.
  *
- * <p>======================= LoggingServiceV2Client =======================
+ * <p>======================= LoggingClient =======================
  *
  * <p>Service Description: Service for ingesting and querying logs.
  *
- * <p>Sample for LoggingServiceV2Client:
+ * <p>Sample for LoggingClient:
  *
- * <p>======================= ConfigServiceV2Client =======================
+ * <p>======================= ConfigClient =======================
  *
  * <p>Service Description: Service for configuring sinks used to route log entries.
  *
- * <p>Sample for ConfigServiceV2Client:
+ * <p>Sample for ConfigClient:
  *
- * <p>======================= MetricsServiceV2Client =======================
+ * <p>======================= MetricsClient =======================
  *
  * <p>Service Description: Service for configuring logs-based metrics.
  *
- * <p>Sample for MetricsServiceV2Client:
+ * <p>Sample for MetricsClient:
  */
 @Generated("by gapic-generator-java")
 package com.google.cloud.logging.v2;