From f300450de7023a84fd4e2503fdfa5a4f0f7fd4ea Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Tue, 12 Apr 2022 10:59:48 -0400
Subject: [PATCH] chore: privatize invocation id getters (#1351)

---
 .../main/java/com/google/cloud/storage/StorageOptions.java | 4 ++--
 .../com/google/cloud/storage/spi/v1/HttpStorageRpc.java    | 4 +---
 .../java/com/google/cloud/storage/StorageOptionsTest.java  | 7 ++++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java
index fa5b262af..d2bfa2760 100644
--- a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java
+++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java
@@ -143,7 +143,7 @@ public StorageRetryStrategy getStorageRetryStrategy() {
       return StorageRetryStrategy.getDefaultStorageRetryStrategy();
     }
 
-    public boolean isIncludeInvocationId() {
+    boolean isIncludeInvocationId() {
       return DEFAULT_INCLUDE_INVOCATION_ID;
     }
   }
@@ -173,7 +173,7 @@ RetryAlgorithmManager getRetryAlgorithmManager() {
   }
 
   /** Returns if Invocation ID is enabled and transmitted through x-goog-api-client header. */
-  public boolean isIncludeInvocationId() {
+  boolean isIncludeInvocationId() {
     return includeInvocationId;
   }
 
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
index e990a0047..70f349329 100644
--- a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
+++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -118,9 +118,7 @@ public HttpStorageRpc(StorageOptions options) {
     // Open Census initialization
     censusHttpModule = new CensusHttpModule(tracer, true);
     initializer = censusHttpModule.getHttpRequestInitializer(initializer);
-    if (options.isIncludeInvocationId()) {
-      initializer = new InvocationIdInitializer(initializer);
-    }
+    initializer = new InvocationIdInitializer(initializer);
     batchRequestInitializer = censusHttpModule.getHttpRequestInitializer(null);
     storage =
         new Storage.Builder(transport, new JacksonFactory(), initializer)
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java
index 743390dda..ac478ab34 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageOptionsTest.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.storage;
 
-import static com.google.cloud.storage.spi.v1.HttpRpcContextTest.*;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -29,6 +28,7 @@
 import java.util.Optional;
 import org.easymock.EasyMock;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class StorageOptionsTest {
@@ -88,7 +88,12 @@ public void testDisableInvocationId() {
     assertFalse(opts1.isIncludeInvocationId());
   }
 
+  /**
+   * Disabled until {@link StorageOptions#isIncludeInvocationId()} and {@link
+   * StorageOptions.Builder#setIncludeInvocationId(boolean)} are public.
+   */
   @Test
+  @Ignore
   public void testInvocationIdIsNotPassedThroughWhenDisabled() {
     MockLowLevelHttpResponse response =
         new MockLowLevelHttpResponse()