chore: Refactor retrier creation from HttpStorageOptions to StorageOptions

Author: ShreyasSinha

google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java

@@ -32,8 +32,6 @@
 import com.google.cloud.http.HttpTransportOptions;
 import com.google.cloud.spi.ServiceRpcFactory;
 import com.google.cloud.storage.BlobWriteSessionConfig.WriterFactory;
-import com.google.cloud.storage.Retrying.DefaultRetrier;
-import com.google.cloud.storage.Retrying.HttpRetrier;
 import com.google.cloud.storage.Retrying.RetryingDependencies;
 import com.google.cloud.storage.Storage.BlobWriteOption;
 import com.google.cloud.storage.TransportCompatibility.Transport;
@@ -408,14 +406,7 @@ public Storage create(StorageOptions options) {
           }
           WriterFactory factory = blobWriteSessionConfig.createFactory(clock);
           StorageImpl storage =
-              new StorageImpl(
-                  httpStorageOptions,
-                  factory,
-                  new HttpRetrier(
-                      new DefaultRetrier(
-                          OtelStorageDecorator.retryContextDecorator(otel),
-                          RetryingDependencies.simple(
-                              options.getClock(), options.getRetrySettings()))));
+              new StorageImpl(httpStorageOptions, factory, options.createRetrier());
           return OtelStorageDecorator.decorate(storage, otel, Transport.HTTP);
         } catch (IOException e) {
           throw new IllegalStateException(

google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java

@@ -26,6 +26,10 @@
 import com.google.cloud.storage.HttpStorageOptions.HttpStorageDefaults;
 import com.google.cloud.storage.HttpStorageOptions.HttpStorageFactory;
 import com.google.cloud.storage.HttpStorageOptions.HttpStorageRpcFactory;
+import com.google.cloud.storage.Retrying.DefaultRetrier;
+import com.google.cloud.storage.Retrying.HttpRetrier;
+import com.google.cloud.storage.Retrying.Retrier;
+import com.google.cloud.storage.Retrying.RetryingDependencies;
 import com.google.cloud.storage.Storage.BlobWriteOption;
 import com.google.cloud.storage.TransportCompatibility.Transport;
 import com.google.cloud.storage.spi.StorageRpcFactory;
@@ -68,6 +72,13 @@ public abstract class StorageOptions extends ServiceOptions<Storage, StorageOpti
     VERSION = tmp;
   }
 
+  Retrier createRetrier() {
+    return new HttpRetrier(
+        new DefaultRetrier(
+            OtelStorageDecorator.retryContextDecorator(getOpenTelemetry()),
+            RetryingDependencies.simple(getClock(), getRetrySettings())));
+  }
+
   /**
    * @deprecated Use {@link HttpStorageFactory}
    */

samples/snippets/src/test/java/com/example/storage/ITBucketSnippets.java

@@ -101,6 +101,7 @@
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -425,6 +426,7 @@ public void testAddListRemoveBucketIamMembers() throws Throwable {
             .build());
   }
 
+  @Ignore("This test cannot run in an environment with Public Access Prevention enforced.")
   @Test
   public void testMakeBucketPublic() throws Throwable {
     MakeBucketPublic.makeBucketPublic(PROJECT_ID, BUCKET);

samples/snippets/src/test/java/com/example/storage/ITObjectSnippets.java

@@ -92,6 +92,7 @@
 import java.util.Random;
 import javax.net.ssl.HttpsURLConnection;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -167,6 +168,7 @@ public void testDownloadObjectIntoMemory() throws IOException {
     assertThat(snippetOutput).contains("The contents of " + objectName);
   }
 
+  @Ignore("This test cannot run in an environment with Public Access Prevention enforced.")
   @Test
   public void testDownloadPublicObject() throws Exception {
     try (TemporaryBucket tmpBucket =
@@ -436,6 +438,7 @@ public void testV4SignedURLs() throws IOException {
     }
   }
 
+  @Ignore("This test cannot run in an environment with Public Access Prevention enforced.")
   @Test
   public void testMakeObjectPublic() {
     String aclBlob = generator.randomObjectName();