fix: disable REGAPIC transport in storage v2 (#1762)

* chore(storage): disable REGAPIC transport in storage v2

PiperOrigin-RevId: 486689296

Source-Link: googleapis/googleapis@2cba3a6

Source-Link: https://github.com/googleapis/googleapis-gen/commit/6e449349cf24aa7de3c1754671ff3f51b3b40068
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNmU0NDkzNDljZjI0YWE3ZGUzYzE3NTQ2NzFmZjNmNTFiM2I0MDA2OCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: update clirr config to allow removal of REGAPIC

* chore: update dependency config to allow removal of REGAPIC

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: BenWhitehead <[email protected]>

gapic-google-cloud-storage-v2/clirr-ignored-differences.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <!-- Remove REGAPIC client which GCS does not support -->
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/storage/v2/StorageSettings</className>
+    <method>* *HttpJson*Builder()</method>
+  </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/storage/v2/stub/StorageStubSettings</className>
+    <method>* *HttpJson*Builder()</method>
+  </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/storage/v2/stub/StorageStubSettings</className>
+    <method>* defaultGrpcApiClientHeaderProviderBuilder()</method>
+  </difference>
+
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/storage/v2/stub/HttpJsonStorageCallableFactory</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/storage/v2/stub/HttpJsonStorageStub</className>
+  </difference>
+
+</differences>

gapic-google-cloud-storage-v2/pom.xml

@@ -62,10 +62,6 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.api</groupId>
-      <artifactId>gax-httpjson</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -81,12 +77,6 @@
       <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>
 

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java

@@ -128,19 +128,6 @@
  * StorageClient storageClient = StorageClient.create(storageSettings);
  * }</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 and should be regarded as a code template only.
- * // It will require modifications to work:
- * // - It may require correct/in-range values for request initialization.
- * // - It may require specifying regional endpoints when creating the service client as shown in
- * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
- * StorageSettings storageSettings = StorageSettings.newHttpJsonBuilder().build();
- * StorageClient storageClient = StorageClient.create(storageSettings);
- * }</pre>
- *
  * <p>Please refer to the GitHub repository's samples for more quickstart code snippets.
  */
 @Generated("by gapic-generator-java")

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageSettings.java

@@ -26,7 +26,6 @@
 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;
@@ -266,18 +265,11 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
     return StorageStubSettings.defaultCredentialsProviderBuilder();
   }
 
-  /** Returns a builder for the default gRPC ChannelProvider for this service. */
+  /** Returns a builder for the default ChannelProvider for this service. */
   public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
     return StorageStubSettings.defaultGrpcTransportProviderBuilder();
   }
 
-  /** Returns a builder for the default REST ChannelProvider for this service. */
-  @BetaApi
-  public static InstantiatingHttpJsonChannelProvider.Builder
-      defaultHttpJsonTransportProviderBuilder() {
-    return StorageStubSettings.defaultHttpJsonTransportProviderBuilder();
-  }
-
   public static TransportChannelProvider defaultTransportChannelProvider() {
     return StorageStubSettings.defaultTransportChannelProvider();
   }
@@ -287,17 +279,11 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
     return StorageStubSettings.defaultApiClientHeaderProviderBuilder();
   }
 
-  /** Returns a new gRPC builder for this class. */
+  /** Returns a new 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);
@@ -335,11 +321,6 @@ private static Builder createDefault() {
       return new Builder(StorageStubSettings.newBuilder());
     }
 
-    @BetaApi
-    private static Builder createHttpJsonDefault() {
-      return new Builder(StorageStubSettings.newHttpJsonBuilder());
-    }
-
     public StorageStubSettings.Builder getStubSettingsBuilder() {
       return ((StorageStubSettings.Builder) getStubSettings());
     }