fix!: fix datacatalog resource name config (#839)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 464572702

Source-Link: googleapis/googleapis@9f82a84

Source-Link: https://github.com/googleapis/googleapis-gen/commit/31de1ae540b75f19aa0dbfc5e0b01c4b5f5148cd
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzFkZTFhZTU0MGI3NWYxOWFhMGRiZmM1ZTBiMDFjNGI1ZjUxNDhjZCJ9

chore(bazel): update protobuf to v3.21.3
chore(bazel): update gax-java to 2.18.4

PiperOrigin-RevId: 463115700

Source-Link: googleapis/googleapis@52130a9

Source-Link: https://github.com/googleapis/googleapis-gen/commit/6a4d9d9bb3afb20b0f5fa4f5d9f6740b1d0eb19a
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNmE0ZDlkOWJiM2FmYjIwYjBmNWZhNGY1ZDlmNjc0MGIxZDBlYjE5YSJ9

google-cloud-datacatalog/pom.xml

@@ -66,6 +66,10 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax-httpjson</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.threeten</groupId>
       <artifactId>threetenbp</artifactId>
@@ -94,12 +98,24 @@
       <scope>test</scope>
     </dependency>
     <!-- Need testing utility classes for generated gRPC clients tests -->
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax</artifactId>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
       <classifier>testlib</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+    <groupId>com.google.api</groupId>
+      <artifactId>gax-httpjson</artifactId>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>

google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java

@@ -107,6 +107,20 @@
  * DataCatalogClient dataCatalogClient = DataCatalogClient.create(dataCatalogSettings);
  * }</pre>
  *
+ * <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
+ * the wire:
+ *
+ * <pre>{@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
+ * DataCatalogSettings dataCatalogSettings =
+ *     DataCatalogSettings.newBuilder()
+ *         .setTransportChannelProvider(
+ *             DataCatalogSettings.defaultHttpJsonTransportProviderBuilder().build())
+ *         .build();
+ * DataCatalogClient dataCatalogClient = DataCatalogClient.create(dataCatalogSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")
@@ -976,7 +990,7 @@ public final UnaryCallable<DeleteEntryGroupRequest, Empty> deleteEntryGroupCalla
    * // This snippet has been automatically generated for illustrative purposes only.
    * // It may require modifications to work in your environment.
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   EntryGroupName parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]");
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   for (EntryGroup element : dataCatalogClient.listEntryGroups(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -987,7 +1001,7 @@ public final UnaryCallable<DeleteEntryGroupRequest, Empty> deleteEntryGroupCalla
    *     <p>Can be provided as a URL.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListEntryGroupsPagedResponse listEntryGroups(EntryGroupName parent) {
+  public final ListEntryGroupsPagedResponse listEntryGroups(LocationName parent) {
     ListEntryGroupsRequest request =
         ListEntryGroupsRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -1005,7 +1019,7 @@ public final ListEntryGroupsPagedResponse listEntryGroups(EntryGroupName parent)
    * // This snippet has been automatically generated for illustrative purposes only.
    * // It may require modifications to work in your environment.
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString();
+   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
    *   for (EntryGroup element : dataCatalogClient.listEntryGroups(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -1033,7 +1047,7 @@ public final ListEntryGroupsPagedResponse listEntryGroups(String parent) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   ListEntryGroupsRequest request =
    *       ListEntryGroupsRequest.newBuilder()
-   *           .setParent(EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -1062,7 +1076,7 @@ public final ListEntryGroupsPagedResponse listEntryGroups(ListEntryGroupsRequest
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   ListEntryGroupsRequest request =
    *       ListEntryGroupsRequest.newBuilder()
-   *           .setParent(EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -1092,7 +1106,7 @@ public final ListEntryGroupsPagedResponse listEntryGroups(ListEntryGroupsRequest
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   ListEntryGroupsRequest request =
    *       ListEntryGroupsRequest.newBuilder()
-   *           .setParent(EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -3356,7 +3370,7 @@ public final void deleteTagTemplateField(DeleteTagTemplateFieldRequest request)
    * // This snippet has been automatically generated for illustrative purposes only.
    * // It may require modifications to work in your environment.
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   TagName parent = TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]");
+   *   EntryName parent = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
    *   Tag tag = Tag.newBuilder().build();
    *   Tag response = dataCatalogClient.createTag(parent, tag);
    * }
@@ -3370,7 +3384,7 @@ public final void deleteTagTemplateField(DeleteTagTemplateFieldRequest request)
    * @param tag Required. The tag to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Tag createTag(TagName parent, Tag tag) {
+  public final Tag createTag(EntryName parent, Tag tag) {
     CreateTagRequest request =
         CreateTagRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -3403,7 +3417,7 @@ public final Tag createTag(TagName parent, Tag tag) {
    * // It may require modifications to work in your environment.
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   String parent =
-   *       TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]").toString();
+   *       EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
    *   Tag tag = Tag.newBuilder().build();
    *   Tag response = dataCatalogClient.createTag(parent, tag);
    * }
@@ -3448,8 +3462,7 @@ public final Tag createTag(String parent, Tag tag) {
    *   CreateTagRequest request =
    *       CreateTagRequest.newBuilder()
    *           .setParent(
-   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
-   *                   .toString())
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setTag(Tag.newBuilder().build())
    *           .build();
    *   Tag response = dataCatalogClient.createTag(request);
@@ -3489,8 +3502,7 @@ public final Tag createTag(CreateTagRequest request) {
    *   CreateTagRequest request =
    *       CreateTagRequest.newBuilder()
    *           .setParent(
-   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
-   *                   .toString())
+   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
    *           .setTag(Tag.newBuilder().build())
    *           .build();
    *   ApiFuture<Tag> future = dataCatalogClient.createTagCallable().futureCall(request);

google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogSettings.java

@@ -26,6 +26,7 @@
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
@@ -274,11 +275,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
     return DataCatalogStubSettings.defaultCredentialsProviderBuilder();
   }
 
-  /** Returns a builder for the default ChannelProvider for this service. */
+  /** Returns a builder for the default gRPC ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
     return DataCatalogStubSettings.defaultGrpcTransportProviderBuilder();
   }
 
+  /** Returns a builder for the default REST ChannelProvider for this service. */
+  @BetaApi
+  public static InstantiatingHttpJsonChannelProvider.Builder
+      defaultHttpJsonTransportProviderBuilder() {
+    return DataCatalogStubSettings.defaultHttpJsonTransportProviderBuilder();
+  }
+
   public static TransportChannelProvider defaultTransportChannelProvider() {
     return DataCatalogStubSettings.defaultTransportChannelProvider();
   }
@@ -288,11 +296,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
     return DataCatalogStubSettings.defaultApiClientHeaderProviderBuilder();
   }
 
-  /** Returns a new builder for this class. */
+  /** Returns a new gRPC builder for this class. */
   public static Builder newBuilder() {
     return Builder.createDefault();
   }
 
+  /** Returns a new REST builder for this class. */
+  @BetaApi
+  public static Builder newHttpJsonBuilder() {
+    return Builder.createHttpJsonDefault();
+  }
+
   /** Returns a new builder for this class. */
   public static Builder newBuilder(ClientContext clientContext) {
     return new Builder(clientContext);
@@ -330,6 +344,11 @@ private static Builder createDefault() {
       return new Builder(DataCatalogStubSettings.newBuilder());
     }
 
+    @BetaApi
+    private static Builder createHttpJsonDefault() {
+      return new Builder(DataCatalogStubSettings.newHttpJsonBuilder());
+    }
+
     public DataCatalogStubSettings.Builder getStubSettingsBuilder() {
       return ((DataCatalogStubSettings.Builder) getStubSettings());
     }

google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java

@@ -110,6 +110,21 @@
  *     PolicyTagManagerClient.create(policyTagManagerSettings);
  * }</pre>
  *
+ * <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
+ * the wire:
+ *
+ * <pre>{@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
+ * PolicyTagManagerSettings policyTagManagerSettings =
+ *     PolicyTagManagerSettings.newBuilder()
+ *         .setTransportChannelProvider(
+ *             PolicyTagManagerSettings.defaultHttpJsonTransportProviderBuilder().build())
+ *         .build();
+ * PolicyTagManagerClient policyTagManagerClient =
+ *     PolicyTagManagerClient.create(policyTagManagerSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")

google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClient.java

@@ -99,6 +99,22 @@
  *     PolicyTagManagerSerializationClient.create(policyTagManagerSerializationSettings);
  * }</pre>
  *
+ * <p>To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over
+ * the wire:
+ *
+ * <pre>{@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
+ * PolicyTagManagerSerializationSettings policyTagManagerSerializationSettings =
+ *     PolicyTagManagerSerializationSettings.newBuilder()
+ *         .setTransportChannelProvider(
+ *             PolicyTagManagerSerializationSettings.defaultHttpJsonTransportProviderBuilder()
+ *                 .build())
+ *         .build();
+ * PolicyTagManagerSerializationClient policyTagManagerSerializationClient =
+ *     PolicyTagManagerSerializationClient.create(policyTagManagerSerializationSettings);
+ * }</pre>
+ *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")

google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationSettings.java

@@ -21,6 +21,7 @@
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
@@ -115,11 +116,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
     return PolicyTagManagerSerializationStubSettings.defaultCredentialsProviderBuilder();
   }
 
-  /** Returns a builder for the default ChannelProvider for this service. */
+  /** Returns a builder for the default gRPC ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
     return PolicyTagManagerSerializationStubSettings.defaultGrpcTransportProviderBuilder();
   }
 
+  /** Returns a builder for the default REST ChannelProvider for this service. */
+  @BetaApi
+  public static InstantiatingHttpJsonChannelProvider.Builder
+      defaultHttpJsonTransportProviderBuilder() {
+    return PolicyTagManagerSerializationStubSettings.defaultHttpJsonTransportProviderBuilder();
+  }
+
   public static TransportChannelProvider defaultTransportChannelProvider() {
     return PolicyTagManagerSerializationStubSettings.defaultTransportChannelProvider();
   }
@@ -129,11 +137,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
     return PolicyTagManagerSerializationStubSettings.defaultApiClientHeaderProviderBuilder();
   }
 
-  /** Returns a new builder for this class. */
+  /** Returns a new gRPC builder for this class. */
   public static Builder newBuilder() {
     return Builder.createDefault();
   }
 
+  /** Returns a new REST builder for this class. */
+  @BetaApi
+  public static Builder newHttpJsonBuilder() {
+    return Builder.createHttpJsonDefault();
+  }
+
   /** Returns a new builder for this class. */
   public static Builder newBuilder(ClientContext clientContext) {
     return new Builder(clientContext);
@@ -172,6 +186,11 @@ private static Builder createDefault() {
       return new Builder(PolicyTagManagerSerializationStubSettings.newBuilder());
     }
 
+    @BetaApi
+    private static Builder createHttpJsonDefault() {
+      return new Builder(PolicyTagManagerSerializationStubSettings.newHttpJsonBuilder());
+    }
+
     public PolicyTagManagerSerializationStubSettings.Builder getStubSettingsBuilder() {
       return ((PolicyTagManagerSerializationStubSettings.Builder) getStubSettings());
     }

google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSettings.java

@@ -24,6 +24,7 @@
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
+import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
 import com.google.api.gax.rpc.ClientSettings;
@@ -173,11 +174,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
     return PolicyTagManagerStubSettings.defaultCredentialsProviderBuilder();
   }
 
-  /** Returns a builder for the default ChannelProvider for this service. */
+  /** Returns a builder for the default gRPC ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
     return PolicyTagManagerStubSettings.defaultGrpcTransportProviderBuilder();
   }
 
+  /** Returns a builder for the default REST ChannelProvider for this service. */
+  @BetaApi
+  public static InstantiatingHttpJsonChannelProvider.Builder
+      defaultHttpJsonTransportProviderBuilder() {
+    return PolicyTagManagerStubSettings.defaultHttpJsonTransportProviderBuilder();
+  }
+
   public static TransportChannelProvider defaultTransportChannelProvider() {
     return PolicyTagManagerStubSettings.defaultTransportChannelProvider();
   }
@@ -187,11 +195,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
     return PolicyTagManagerStubSettings.defaultApiClientHeaderProviderBuilder();
   }
 
-  /** Returns a new builder for this class. */
+  /** Returns a new gRPC builder for this class. */
   public static Builder newBuilder() {
     return Builder.createDefault();
   }
 
+  /** Returns a new REST builder for this class. */
+  @BetaApi
+  public static Builder newHttpJsonBuilder() {
+    return Builder.createHttpJsonDefault();
+  }
+
   /** Returns a new builder for this class. */
   public static Builder newBuilder(ClientContext clientContext) {
     return new Builder(clientContext);
@@ -229,6 +243,11 @@ private static Builder createDefault() {
       return new Builder(PolicyTagManagerStubSettings.newBuilder());
     }
 
+    @BetaApi
+    private static Builder createHttpJsonDefault() {
+      return new Builder(PolicyTagManagerStubSettings.newHttpJsonBuilder());
+    }
+
     public PolicyTagManagerStubSettings.Builder getStubSettingsBuilder() {
       return ((PolicyTagManagerStubSettings.Builder) getStubSettings());
     }