PR feedback

googleapis · Nov 2, 2021 · 8c8ab88 · 8c8ab88
1 parent bde778e
commit 8c8ab88
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 235 deletions.
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
@@ -882,10 +882,8 @@ static String parsePageSizeFieldName(
     String pagedFieldName = null;
 
     if (inputMessage != null
-        && inputMessage.fieldMap() != null
         && inputMessage.fieldMap().containsKey("page_token")
         && outputMessage != null
-        && outputMessage.fieldMap() != null
         && outputMessage.fieldMap().containsKey("next_page_token")) {
       // List of potential field names representing page size.
       // page_size gets priority over max_results if both are present

diff --git a/src/main/java/com/google/api/generator/gapic/utils/ResourceReferenceUtils.java b/src/main/java/com/google/api/generator/gapic/utils/ResourceReferenceUtils.java
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/src/test/java/com/google/api/generator/gapic/composer/common/TestProtoLoader.java b/src/test/java/com/google/api/generator/gapic/composer/common/TestProtoLoader.java
@@ -179,14 +179,6 @@ public GapicContext parseShowcaseMessaging() {
 
     Map<String, Message> messageTypes = Parser.parseMessages(fileDescriptor);
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(fileDescriptor);
-
-    FileDescriptor identityFileDescriptor = IdentityOuterClass.getDescriptor();
-    Map<String, ResourceName> identityResourceNames = Parser
-        .parseResourceNames(identityFileDescriptor);
-
-    resourceNames.put("showcase.googleapis.com/User",
-        identityResourceNames.get("showcase.googleapis.com/User"));
-
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(

diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MessagingClient.golden b/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MessagingClient.golden
@@ -483,26 +483,20 @@ public class MessagingClient implements BackgroundResource {
    * <pre>{@code
    * try (MessagingClient messagingClient = MessagingClient.create()) {
    *   ProfileName parent = ProfileName.of("[USER]");
-   *   UserName user = UserName.of("[USER]");
    *   ByteString image = ByteString.EMPTY;
-   *   Blurb response = messagingClient.createBlurb(parent, user, image);
+   *   Blurb response = messagingClient.createBlurb(parent, image);
    * }
    * }</pre>
    *
    * @param parent
-   * @param user
    * @param image
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Blurb createBlurb(ProfileName parent, UserName user, ByteString image) {
+  public final Blurb createBlurb(ProfileName parent, ByteString image) {
     CreateBlurbRequest request =
         CreateBlurbRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
-            .setBlurb(
-                Blurb.newBuilder()
-                    .setUser(user == null ? null : user.toString())
-                    .setImage(image)
-                    .build())
+            .setBlurb(Blurb.newBuilder().setImage(image).build())
             .build();
     return createBlurb(request);
   }
@@ -514,111 +508,20 @@ public class MessagingClient implements BackgroundResource {
    * <pre>{@code
    * try (MessagingClient messagingClient = MessagingClient.create()) {
    *   ProfileName parent = ProfileName.of("[USER]");
-   *   UserName user = UserName.of("[USER]");
    *   String text = "text3556653";
-   *   Blurb response = messagingClient.createBlurb(parent, user, text);
+   *   Blurb response = messagingClient.createBlurb(parent, text);
    * }
    * }</pre>
    *
    * @param parent
-   * @param user
    * @param text
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Blurb createBlurb(ProfileName parent, UserName user, String text) {
+  public final Blurb createBlurb(ProfileName parent, String text) {
     CreateBlurbRequest request =
         CreateBlurbRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
-            .setBlurb(
-                Blurb.newBuilder()
-                    .setUser(user == null ? null : user.toString())
-                    .setText(text)
-                    .build())
-            .build();
-    return createBlurb(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD.
-  /**
-   * Sample code:
-   *
-   * <pre>{@code
-   * try (MessagingClient messagingClient = MessagingClient.create()) {
-   *   ProfileName parent = ProfileName.of("[USER]");
-   *   String user = UserName.of("[USER]").toString();
-   *   ByteString image = ByteString.EMPTY;
-   *   Blurb response = messagingClient.createBlurb(parent, user, image);
-   * }
-   * }</pre>
-   *
-   * @param parent
-   * @param user
-   * @param image
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Blurb createBlurb(ProfileName parent, String user, ByteString image) {
-    CreateBlurbRequest request =
-        CreateBlurbRequest.newBuilder()
-            .setParent(parent == null ? null : parent.toString())
-            .setBlurb(Blurb.newBuilder().setUser(user).setImage(image).build())
-            .build();
-    return createBlurb(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD.
-  /**
-   * Sample code:
-   *
-   * <pre>{@code
-   * try (MessagingClient messagingClient = MessagingClient.create()) {
-   *   ProfileName parent = ProfileName.of("[USER]");
-   *   String user = UserName.of("[USER]").toString();
-   *   String text = "text3556653";
-   *   Blurb response = messagingClient.createBlurb(parent, user, text);
-   * }
-   * }</pre>
-   *
-   * @param parent
-   * @param user
-   * @param text
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Blurb createBlurb(ProfileName parent, String user, String text) {
-    CreateBlurbRequest request =
-        CreateBlurbRequest.newBuilder()
-            .setParent(parent == null ? null : parent.toString())
-            .setBlurb(Blurb.newBuilder().setUser(user).setText(text).build())
-            .build();
-    return createBlurb(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD.
-  /**
-   * Sample code:
-   *
-   * <pre>{@code
-   * try (MessagingClient messagingClient = MessagingClient.create()) {
-   *   RoomName parent = RoomName.of("[ROOM]");
-   *   UserName user = UserName.of("[USER]");
-   *   ByteString image = ByteString.EMPTY;
-   *   Blurb response = messagingClient.createBlurb(parent, user, image);
-   * }
-   * }</pre>
-   *
-   * @param parent
-   * @param user
-   * @param image
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Blurb createBlurb(RoomName parent, UserName user, ByteString image) {
-    CreateBlurbRequest request =
-        CreateBlurbRequest.newBuilder()
-            .setParent(parent == null ? null : parent.toString())
-            .setBlurb(
-                Blurb.newBuilder()
-                    .setUser(user == null ? null : user.toString())
-                    .setImage(image)
-                    .build())
+            .setBlurb(Blurb.newBuilder().setText(text).build())
             .build();
     return createBlurb(request);
   }
@@ -630,53 +533,20 @@ public class MessagingClient implements BackgroundResource {
    * <pre>{@code
    * try (MessagingClient messagingClient = MessagingClient.create()) {
    *   RoomName parent = RoomName.of("[ROOM]");
-   *   UserName user = UserName.of("[USER]");
-   *   String text = "text3556653";
-   *   Blurb response = messagingClient.createBlurb(parent, user, text);
-   * }
-   * }</pre>
-   *
-   * @param parent
-   * @param user
-   * @param text
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Blurb createBlurb(RoomName parent, UserName user, String text) {
-    CreateBlurbRequest request =
-        CreateBlurbRequest.newBuilder()
-            .setParent(parent == null ? null : parent.toString())
-            .setBlurb(
-                Blurb.newBuilder()
-                    .setUser(user == null ? null : user.toString())
-                    .setText(text)
-                    .build())
-            .build();
-    return createBlurb(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD.
-  /**
-   * Sample code:
-   *
-   * <pre>{@code
-   * try (MessagingClient messagingClient = MessagingClient.create()) {
-   *   RoomName parent = RoomName.of("[ROOM]");
-   *   String user = UserName.of("[USER]").toString();
    *   ByteString image = ByteString.EMPTY;
-   *   Blurb response = messagingClient.createBlurb(parent, user, image);
+   *   Blurb response = messagingClient.createBlurb(parent, image);
    * }
    * }</pre>
    *
    * @param parent
-   * @param user
    * @param image
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Blurb createBlurb(RoomName parent, String user, ByteString image) {
+  public final Blurb createBlurb(RoomName parent, ByteString image) {
     CreateBlurbRequest request =
         CreateBlurbRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
-            .setBlurb(Blurb.newBuilder().setUser(user).setImage(image).build())
+            .setBlurb(Blurb.newBuilder().setImage(image).build())
             .build();
     return createBlurb(request);
   }
@@ -688,84 +558,20 @@ public class MessagingClient implements BackgroundResource {
    * <pre>{@code
    * try (MessagingClient messagingClient = MessagingClient.create()) {
    *   RoomName parent = RoomName.of("[ROOM]");
-   *   String user = UserName.of("[USER]").toString();
    *   String text = "text3556653";
-   *   Blurb response = messagingClient.createBlurb(parent, user, text);
+   *   Blurb response = messagingClient.createBlurb(parent, text);
    * }
    * }</pre>
    *
    * @param parent
-   * @param user
    * @param text
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Blurb createBlurb(RoomName parent, String user, String text) {
+  public final Blurb createBlurb(RoomName parent, String text) {
     CreateBlurbRequest request =
         CreateBlurbRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
-            .setBlurb(Blurb.newBuilder().setUser(user).setText(text).build())
-            .build();
-    return createBlurb(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD.
-  /**
-   * Sample code:
-   *
-   * <pre>{@code
-   * try (MessagingClient messagingClient = MessagingClient.create()) {
-   *   String parent = ProfileName.of("[USER]").toString();
-   *   UserName user = UserName.of("[USER]");
-   *   ByteString image = ByteString.EMPTY;
-   *   Blurb response = messagingClient.createBlurb(parent, user, image);
-   * }
-   * }</pre>
-   *
-   * @param parent
-   * @param user
-   * @param image
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Blurb createBlurb(String parent, UserName user, ByteString image) {
-    CreateBlurbRequest request =
-        CreateBlurbRequest.newBuilder()
-            .setParent(parent)
-            .setBlurb(
-                Blurb.newBuilder()
-                    .setUser(user == null ? null : user.toString())
-                    .setImage(image)
-                    .build())
-            .build();
-    return createBlurb(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD.
-  /**
-   * Sample code:
-   *
-   * <pre>{@code
-   * try (MessagingClient messagingClient = MessagingClient.create()) {
-   *   String parent = ProfileName.of("[USER]").toString();
-   *   UserName user = UserName.of("[USER]");
-   *   String text = "text3556653";
-   *   Blurb response = messagingClient.createBlurb(parent, user, text);
-   * }
-   * }</pre>
-   *
-   * @param parent
-   * @param user
-   * @param text
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Blurb createBlurb(String parent, UserName user, String text) {
-    CreateBlurbRequest request =
-        CreateBlurbRequest.newBuilder()
-            .setParent(parent)
-            .setBlurb(
-                Blurb.newBuilder()
-                    .setUser(user == null ? null : user.toString())
-                    .setText(text)
-                    .build())
+            .setBlurb(Blurb.newBuilder().setText(text).build())
             .build();
     return createBlurb(request);
   }
@@ -777,22 +583,20 @@ public class MessagingClient implements BackgroundResource {
    * <pre>{@code
    * try (MessagingClient messagingClient = MessagingClient.create()) {
    *   String parent = ProfileName.of("[USER]").toString();
-   *   String user = UserName.of("[USER]").toString();
    *   ByteString image = ByteString.EMPTY;
-   *   Blurb response = messagingClient.createBlurb(parent, user, image);
+   *   Blurb response = messagingClient.createBlurb(parent, image);
    * }
    * }</pre>
    *
    * @param parent
-   * @param user
    * @param image
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Blurb createBlurb(String parent, String user, ByteString image) {
+  public final Blurb createBlurb(String parent, ByteString image) {
     CreateBlurbRequest request =
         CreateBlurbRequest.newBuilder()
             .setParent(parent)
-            .setBlurb(Blurb.newBuilder().setUser(user).setImage(image).build())
+            .setBlurb(Blurb.newBuilder().setImage(image).build())
             .build();
     return createBlurb(request);
   }
@@ -804,22 +608,20 @@ public class MessagingClient implements BackgroundResource {
    * <pre>{@code
    * try (MessagingClient messagingClient = MessagingClient.create()) {
    *   String parent = ProfileName.of("[USER]").toString();
-   *   String user = UserName.of("[USER]").toString();
    *   String text = "text3556653";
-   *   Blurb response = messagingClient.createBlurb(parent, user, text);
+   *   Blurb response = messagingClient.createBlurb(parent, text);
    * }
    * }</pre>
    *
    * @param parent
-   * @param user
    * @param text
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Blurb createBlurb(String parent, String user, String text) {
+  public final Blurb createBlurb(String parent, String text) {
     CreateBlurbRequest request =
         CreateBlurbRequest.newBuilder()
             .setParent(parent)
-            .setBlurb(Blurb.newBuilder().setUser(user).setText(text).build())
+            .setBlurb(Blurb.newBuilder().setText(text).build())
             .build();
     return createBlurb(request);
   }

diff --git a/src/test/java/com/google/api/generator/gapic/testdata/compliance.proto b/src/test/java/com/google/api/generator/gapic/testdata/compliance.proto
@@ -16,6 +16,7 @@ syntax = "proto3";
 
 import "google/api/annotations.proto";
 import "google/api/client.proto";
+import "google/cloud/extended_operations.proto";
 
 package google.showcase.v1beta1;