diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java b/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java index 9791c53e2..070913501 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java @@ -97,7 +97,7 @@ public abstract class ClientContext { public abstract String getEndpoint(); @Nullable - public abstract String getQuotaProjectID(); + public abstract String getQuotaProjectId(); /** Gets the {@link ApiTracerFactory} that will be used to generate traces for operations. */ @BetaApi("The surface for tracing is not stable yet and may change in the future.") @@ -114,7 +114,7 @@ public static Builder newBuilder() { .setStreamWatchdog(null) .setStreamWatchdogCheckInterval(Duration.ZERO) .setTracerFactory(NoopApiTracerFactory.getInstance()) - .setQuotaProjectID(null); + .setQuotaProjectId(null); } public abstract Builder toBuilder(); @@ -204,7 +204,7 @@ public static ClientContext create(StubSettings settings) throws IOException { .setClock(clock) .setDefaultCallContext(defaultCallContext) .setEndpoint(settings.getEndpoint()) - .setQuotaProjectID(settings.getQuotaProjectID()) + .setQuotaProjectId(settings.getQuotaProjectId()) .setStreamWatchdog(watchdog) .setStreamWatchdogCheckInterval(settings.getStreamWatchdogCheckInterval()) .setTracerFactory(settings.getTracerFactory()) @@ -234,7 +234,7 @@ public abstract static class Builder { public abstract Builder setEndpoint(String endpoint); - public abstract Builder setQuotaProjectID(String quotaProjectID); + public abstract Builder setQuotaProjectId(String QuotaProjectId); @BetaApi("The surface for streaming is not stable yet and may change in the future.") public abstract Builder setStreamWatchdog(Watchdog watchdog); diff --git a/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java b/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java index 88bc7af8a..7575fea2b 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/ClientSettings.java @@ -93,8 +93,8 @@ public final String getEndpoint() { return stubSettings.getEndpoint(); } - public final String getQuotaProjectID() { - return stubSettings.getQuotaProjectID(); + public final String getQuotaProjectId() { + return stubSettings.getQuotaProjectId(); } @BetaApi("The surface for streaming is not stable yet and may change in the future.") @@ -118,7 +118,7 @@ public String toString() { .add("internalHeaderProvider", getInternalHeaderProvider()) .add("clock", getClock()) .add("endpoint", getEndpoint()) - .add("quotaProjectID", getQuotaProjectID()) + .add("quotaProjectId", getQuotaProjectId()) .add("watchdogProvider", getWatchdogProvider()) .add("watchdogCheckInterval", getWatchdogCheckInterval()) .toString(); @@ -221,8 +221,8 @@ public B setEndpoint(String endpoint) { return self(); } - public B setQuotaProjectID(String quotaProjectID) { - stubSettings.setQuotaProjectID(quotaProjectID); + public B setQuotaProjectId(String quotaProjectId) { + stubSettings.setQuotaProjectId(quotaProjectId); return self(); } @@ -274,9 +274,9 @@ public String getEndpoint() { return stubSettings.getEndpoint(); } - /** Gets the QuotaProjectID that was previously set on this Builder. */ - public String getQuotaProjectID() { - return stubSettings.getQuotaProjectID(); + /** Gets the QuotaProjectId that was previously set on this Builder. */ + public String getQuotaProjectId() { + return stubSettings.getQuotaProjectId(); } @BetaApi("The surface for streaming is not stable yet and may change in the future.") @@ -309,7 +309,7 @@ public String toString() { .add("internalHeaderProvider", getInternalHeaderProvider()) .add("clock", getClock()) .add("endpoint", getEndpoint()) - .add("quotaProjectID", getQuotaProjectID()) + .add("quotaProjectId", getQuotaProjectId()) .add("watchdogProvider", getWatchdogProvider()) .add("watchdogCheckInterval", getWatchdogCheckInterval()) .toString(); diff --git a/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java b/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java index 193cfc3b6..a6d5e2246 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java +++ b/gax/src/main/java/com/google/api/gax/rpc/StubSettings.java @@ -71,7 +71,7 @@ public abstract class StubSettings> { private final TransportChannelProvider transportChannelProvider; private final ApiClock clock; private final String endpoint; - private final String quotaProjectID; + private final String quotaProjectId; @Nullable private final WatchdogProvider streamWatchdogProvider; @Nonnull private final Duration streamWatchdogCheckInterval; @Nonnull private final ApiTracerFactory tracerFactory; @@ -85,7 +85,7 @@ protected StubSettings(Builder builder) { this.internalHeaderProvider = builder.internalHeaderProvider; this.clock = builder.clock; this.endpoint = builder.endpoint; - this.quotaProjectID = builder.quotaProjectID; + this.quotaProjectId = builder.quotaProjectId; this.streamWatchdogProvider = builder.streamWatchdogProvider; this.streamWatchdogCheckInterval = builder.streamWatchdogCheckInterval; this.tracerFactory = builder.tracerFactory; @@ -121,8 +121,8 @@ public final String getEndpoint() { return endpoint; } - public final String getQuotaProjectID() { - return quotaProjectID; + public final String getQuotaProjectId() { + return quotaProjectId; } @BetaApi("The surface for streaming is not stable yet and may change in the future.") @@ -156,7 +156,7 @@ public String toString() { .add("internalHeaderProvider", internalHeaderProvider) .add("clock", clock) .add("endpoint", endpoint) - .add("quotaProjectID", quotaProjectID) + .add("quotaProjectId", quotaProjectId) .add("streamWatchdogProvider", streamWatchdogProvider) .add("streamWatchdogCheckInterval", streamWatchdogCheckInterval) .add("tracerFactory", tracerFactory) @@ -175,7 +175,7 @@ public abstract static class Builder< private TransportChannelProvider transportChannelProvider; private ApiClock clock; private String endpoint; - private String quotaProjectID; + private String quotaProjectId; @Nullable private WatchdogProvider streamWatchdogProvider; @Nonnull private Duration streamWatchdogCheckInterval; @Nonnull private ApiTracerFactory tracerFactory; @@ -189,16 +189,16 @@ protected Builder(StubSettings settings) { this.internalHeaderProvider = settings.internalHeaderProvider; this.clock = settings.clock; this.endpoint = settings.endpoint; - this.quotaProjectID = settings.quotaProjectID; + this.quotaProjectId = settings.quotaProjectId; this.streamWatchdogProvider = settings.streamWatchdogProvider; this.streamWatchdogCheckInterval = settings.streamWatchdogCheckInterval; this.tracerFactory = settings.tracerFactory; } /** Get Quota Project ID from Client Context * */ - private static String getQuotaProjectIDFromClientContext(ClientContext clientContext) { - if (clientContext.getQuotaProjectID() != null) { - return clientContext.getQuotaProjectID(); + private static String getQuotaProjectIdFromClientContext(ClientContext clientContext) { + if (clientContext.getQuotaProjectId() != null) { + return clientContext.getQuotaProjectId(); } if (clientContext.getCredentials() instanceof QuotaProjectIdProvider) { return ((QuotaProjectIdProvider) clientContext.getCredentials()).getQuotaProjectId(); @@ -221,7 +221,7 @@ protected Builder(ClientContext clientContext) { this.internalHeaderProvider = new NoHeaderProvider(); this.clock = NanoClock.getDefaultClock(); this.endpoint = null; - this.quotaProjectID = null; + this.quotaProjectId = null; this.streamWatchdogProvider = InstantiatingWatchdogProvider.create(); this.streamWatchdogCheckInterval = Duration.ofSeconds(10); this.tracerFactory = NoopApiTracerFactory.getInstance(); @@ -239,7 +239,7 @@ protected Builder(ClientContext clientContext) { FixedWatchdogProvider.create(clientContext.getStreamWatchdog()); this.streamWatchdogCheckInterval = clientContext.getStreamWatchdogCheckInterval(); this.tracerFactory = clientContext.getTracerFactory(); - this.quotaProjectID = getQuotaProjectIDFromClientContext(clientContext); + this.quotaProjectId = getQuotaProjectIdFromClientContext(clientContext); } } @@ -268,8 +268,8 @@ public B setCredentialsProvider(CredentialsProvider credentialsProvider) { this.credentialsProvider = Preconditions.checkNotNull(credentialsProvider); try { Credentials credentials = credentialsProvider.getCredentials(); - if (this.quotaProjectID == null && credentials instanceof QuotaProjectIdProvider) { - this.quotaProjectID = ((QuotaProjectIdProvider) credentials).getQuotaProjectId(); + if (this.quotaProjectId == null && credentials instanceof QuotaProjectIdProvider) { + this.quotaProjectId = ((QuotaProjectIdProvider) credentials).getQuotaProjectId(); } } catch (IOException e) { System.out.println("fail to fetch credentials"); @@ -287,9 +287,9 @@ public B setCredentialsProvider(CredentialsProvider credentialsProvider) { @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") public B setHeaderProvider(HeaderProvider headerProvider) { this.headerProvider = headerProvider; - if (this.quotaProjectID == null + if (this.quotaProjectId == null && headerProvider.getHeaders().containsKey(QUOTA_PROJECT_ID_HEADER_KEY)) { - this.quotaProjectID = headerProvider.getHeaders().get(QUOTA_PROJECT_ID_HEADER_KEY); + this.quotaProjectId = headerProvider.getHeaders().get(QUOTA_PROJECT_ID_HEADER_KEY); } return self(); } @@ -304,9 +304,9 @@ public B setHeaderProvider(HeaderProvider headerProvider) { @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") protected B setInternalHeaderProvider(HeaderProvider internalHeaderProvider) { this.internalHeaderProvider = internalHeaderProvider; - if (this.quotaProjectID == null + if (this.quotaProjectId == null && internalHeaderProvider.getHeaders().containsKey(QUOTA_PROJECT_ID_HEADER_KEY)) { - this.quotaProjectID = internalHeaderProvider.getHeaders().get(QUOTA_PROJECT_ID_HEADER_KEY); + this.quotaProjectId = internalHeaderProvider.getHeaders().get(QUOTA_PROJECT_ID_HEADER_KEY); } return self(); } @@ -346,8 +346,8 @@ public B setEndpoint(String endpoint) { return self(); } - public B setQuotaProjectID(String quotaProjectID) { - this.quotaProjectID = quotaProjectID; + public B setQuotaProjectId(String quotaProjectId) { + this.quotaProjectId = quotaProjectId; return self(); } @@ -417,9 +417,9 @@ public String getEndpoint() { return endpoint; } - /** Gets the QuotaProjectID that was previously set on this Builder. */ - public String getQuotaProjectID() { - return quotaProjectID; + /** Gets the QuotaProjectId that was previously set on this Builder. */ + public String getQuotaProjectId() { + return quotaProjectId; } @BetaApi("The surface for streaming is not stable yet and may change in the future.") @@ -454,7 +454,7 @@ public String toString() { .add("internalHeaderProvider", internalHeaderProvider) .add("clock", clock) .add("endpoint", endpoint) - .add("quotaProjectID", quotaProjectID) + .add("quotaProjectId", quotaProjectId) .add("streamWatchdogProvider", streamWatchdogProvider) .add("streamWatchdogCheckInterval", streamWatchdogCheckInterval) .add("tracerFactory", tracerFactory) diff --git a/gax/src/test/java/com/google/api/gax/rpc/ClientSettingsTest.java b/gax/src/test/java/com/google/api/gax/rpc/ClientSettingsTest.java index 8dc1c9ef2..4551b925c 100644 --- a/gax/src/test/java/com/google/api/gax/rpc/ClientSettingsTest.java +++ b/gax/src/test/java/com/google/api/gax/rpc/ClientSettingsTest.java @@ -119,7 +119,7 @@ public void testEmptyBuilder() throws Exception { Truth.assertThat(builder.getWatchdogProvider()) .isInstanceOf(InstantiatingWatchdogProvider.class); Truth.assertThat(builder.getWatchdogCheckInterval()).isGreaterThan(Duration.ZERO); - Truth.assertThat(builder.getQuotaProjectID()).isNull(); + Truth.assertThat(builder.getQuotaProjectId()).isNull(); FakeClientSettings settings = builder.build(); Truth.assertThat(settings.getExecutorProvider()) @@ -135,7 +135,7 @@ public void testEmptyBuilder() throws Exception { Truth.assertThat(settings.getWatchdogProvider()) .isInstanceOf(InstantiatingWatchdogProvider.class); Truth.assertThat(settings.getWatchdogCheckInterval()).isGreaterThan(Duration.ZERO); - Truth.assertThat((settings.getQuotaProjectID())).isSameInstanceAs(builder.getQuotaProjectID()); + Truth.assertThat((settings.getQuotaProjectId())).isSameInstanceAs(builder.getQuotaProjectId()); String settingsString = settings.toString(); Truth.assertThat(settingsString).contains("executorProvider"); @@ -145,7 +145,7 @@ public void testEmptyBuilder() throws Exception { Truth.assertThat(settingsString).contains("headerProvider"); Truth.assertThat(settingsString).contains("watchdogProvider"); Truth.assertThat(settingsString).contains("watchdogCheckInterval"); - Truth.assertThat(settingsString).contains(("quotaProjectID")); + Truth.assertThat(settingsString).contains(("quotaProjectId")); } @Test @@ -160,7 +160,7 @@ public void testBuilder() throws Exception { HeaderProvider internalHeaderProvider = Mockito.mock(HeaderProvider.class); WatchdogProvider watchdogProvider = Mockito.mock(WatchdogProvider.class); Duration watchdogCheckInterval = Duration.ofSeconds(13); - String quotaProjectID = "test_quota_project_id"; + String quotaProjectId = "test_quota_project_id"; builder.setExecutorProvider(executorProvider); builder.setTransportChannelProvider(transportProvider); @@ -170,7 +170,7 @@ public void testBuilder() throws Exception { builder.setClock(clock); builder.setWatchdogProvider(watchdogProvider); builder.setWatchdogCheckInterval(watchdogCheckInterval); - builder.setQuotaProjectID(quotaProjectID); + builder.setQuotaProjectId(quotaProjectId); Truth.assertThat(builder.getExecutorProvider()).isSameInstanceAs(executorProvider); Truth.assertThat(builder.getTransportChannelProvider()).isSameInstanceAs(transportProvider); @@ -180,7 +180,7 @@ public void testBuilder() throws Exception { Truth.assertThat(builder.getInternalHeaderProvider()).isSameInstanceAs(internalHeaderProvider); Truth.assertThat(builder.getWatchdogProvider()).isSameInstanceAs(watchdogProvider); Truth.assertThat(builder.getWatchdogCheckInterval()).isSameInstanceAs(watchdogCheckInterval); - Truth.assertThat(builder.getQuotaProjectID()).isEqualTo(quotaProjectID); + Truth.assertThat(builder.getQuotaProjectId()).isEqualTo(quotaProjectId); String builderString = builder.toString(); Truth.assertThat(builderString).contains("executorProvider"); @@ -191,7 +191,7 @@ public void testBuilder() throws Exception { Truth.assertThat(builderString).contains("internalHeaderProvider"); Truth.assertThat(builderString).contains("watchdogProvider"); Truth.assertThat(builderString).contains("watchdogCheckInterval"); - Truth.assertThat(builderString).contains("quotaProjectID"); + Truth.assertThat(builderString).contains("quotaProjectId"); } @Test @@ -217,7 +217,7 @@ public void testBuilderFromClientContext() throws Exception { .setHeaders(headers) .setStreamWatchdog(watchdog) .setStreamWatchdogCheckInterval(watchdogCheckInterval) - .setQuotaProjectID(QUOTA_PROJECT_ID_FROM_CONTEXT) + .setQuotaProjectId(QUOTA_PROJECT_ID_FROM_CONTEXT) .build(); FakeClientSettings.Builder builder = new FakeClientSettings.Builder(clientContext); @@ -232,7 +232,7 @@ public void testBuilderFromClientContext() throws Exception { Truth.assertThat(builder.getWatchdogProvider()).isInstanceOf(FixedWatchdogProvider.class); Truth.assertThat(builder.getWatchdogProvider().getWatchdog()).isSameInstanceAs(watchdog); Truth.assertThat(builder.getWatchdogCheckInterval()).isEqualTo(watchdogCheckInterval); - Truth.assertThat(builder.getQuotaProjectID()).isEqualTo(QUOTA_PROJECT_ID_FROM_CONTEXT); + Truth.assertThat(builder.getQuotaProjectId()).isEqualTo(QUOTA_PROJECT_ID_FROM_CONTEXT); } @Test @@ -247,7 +247,7 @@ public void testBuilderFromSettings() throws Exception { HeaderProvider internalHeaderProvider = Mockito.mock(HeaderProvider.class); WatchdogProvider watchdogProvider = Mockito.mock(WatchdogProvider.class); Duration watchdogCheckInterval = Duration.ofSeconds(14); - String quotaProjectID = "test_builder_from_settings_quotaProjectID"; + String quotaProjectId = "test_builder_from_settings_quotaProjectId"; builder.setExecutorProvider(executorProvider); builder.setTransportChannelProvider(transportProvider); @@ -257,7 +257,7 @@ public void testBuilderFromSettings() throws Exception { builder.setInternalHeaderProvider(internalHeaderProvider); builder.setWatchdogProvider(watchdogProvider); builder.setWatchdogCheckInterval(watchdogCheckInterval); - builder.setQuotaProjectID(quotaProjectID); + builder.setQuotaProjectId(quotaProjectId); FakeClientSettings settings = builder.build(); FakeClientSettings.Builder newBuilder = new FakeClientSettings.Builder(settings); @@ -271,7 +271,7 @@ public void testBuilderFromSettings() throws Exception { .isSameInstanceAs(internalHeaderProvider); Truth.assertThat(newBuilder.getWatchdogProvider()).isSameInstanceAs(watchdogProvider); Truth.assertThat(newBuilder.getWatchdogCheckInterval()).isEqualTo(watchdogCheckInterval); - Truth.assertThat(newBuilder.getQuotaProjectID()).isEqualTo(quotaProjectID); + Truth.assertThat(newBuilder.getQuotaProjectId()).isEqualTo(quotaProjectId); } @Test @@ -313,7 +313,7 @@ static GoogleCredentials loadCredentials(String credentialFile) { } @Test - public void testBuilderFromSettings_QuotaProjectID() { + public void testBuilderFromSettings_QuotaProjectId() { CredentialsProvider credentialsProvider_no_quota = Mockito.mock(CredentialsProvider.class); HeaderProvider headerProvider_no_quota = Mockito.mock(HeaderProvider.class); @@ -348,7 +348,7 @@ public Credentials getCredentials() throws IOException { builder_setQuotaOnly.setCredentialsProvider(credentialsProvider_no_quota); builder_setQuotaOnly.setHeaderProvider(headerProvider_no_quota); builder_setQuotaOnly.setInternalHeaderProvider(internalHeaderProvider_no_quota); - builder_setQuotaOnly.setQuotaProjectID(QUOTA_PROJECT_ID_FROM_BUILDERS); + builder_setQuotaOnly.setQuotaProjectId(QUOTA_PROJECT_ID_FROM_BUILDERS); // Case for setting quota_project_id from HeaderProvider Only // expect value is from HeaderProvider @@ -360,7 +360,7 @@ public Credentials getCredentials() throws IOException { FakeClientSettings.Builder builder_setQuotaFromHeadersAndBuilders = new FakeClientSettings.Builder(); builder_setQuotaFromHeadersOnly.setHeaderProvider(headerProvider_with_quota); - builder_setQuotaFromHeadersAndBuilders.setQuotaProjectID(QUOTA_PROJECT_ID_FROM_BUILDERS); + builder_setQuotaFromHeadersAndBuilders.setQuotaProjectId(QUOTA_PROJECT_ID_FROM_BUILDERS); // Case for setting quota_project_id from InternalHeaderProvider and set from builders // expect value is from InternalHeaderProvider @@ -375,7 +375,7 @@ public Credentials getCredentials() throws IOException { new FakeClientSettings.Builder(); builder_setQuotaFromInternalHeadersAndBuilders.setInternalHeaderProvider( internalHeaderProvider_with_quota); - builder_setQuotaFromInternalHeadersAndBuilders.setQuotaProjectID( + builder_setQuotaFromInternalHeadersAndBuilders.setQuotaProjectId( QUOTA_PROJECT_ID_FROM_BUILDERS); // Case for setting quota_project_id from CredentialProvider Only @@ -390,7 +390,7 @@ public Credentials getCredentials() throws IOException { new FakeClientSettings.Builder(); builder_setQuotaFromCredentialsProviderAndBuilder.setCredentialsProvider( credentialsProvider_with_quota); - builder_setQuotaFromCredentialsProviderAndBuilder.setQuotaProjectID( + builder_setQuotaFromCredentialsProviderAndBuilder.setQuotaProjectId( QUOTA_PROJECT_ID_FROM_BUILDERS); // Case for setting quota_project_id from All three sources @@ -399,46 +399,46 @@ public Credentials getCredentials() throws IOException { builder_setQuotaFromAllSources.setHeaderProvider(headerProvider_with_quota); builder_setQuotaFromAllSources.setInternalHeaderProvider(headerProvider_with_quota); builder_setQuotaFromAllSources.setCredentialsProvider(credentialsProvider_with_quota); - builder_setQuotaFromAllSources.setQuotaProjectID(QUOTA_PROJECT_ID_FROM_BUILDERS); + builder_setQuotaFromAllSources.setQuotaProjectId(QUOTA_PROJECT_ID_FROM_BUILDERS); // Case for setting quota_project_id from All three sources but set from builders first // expect value is from builders FakeClientSettings.Builder builder_setQuotaFromAllSourcesOrder = new FakeClientSettings.Builder(); - builder_setQuotaFromAllSourcesOrder.setQuotaProjectID(QUOTA_PROJECT_ID_FROM_BUILDERS); + builder_setQuotaFromAllSourcesOrder.setQuotaProjectId(QUOTA_PROJECT_ID_FROM_BUILDERS); builder_setQuotaFromAllSourcesOrder.setHeaderProvider(headerProvider_with_quota); builder_setQuotaFromAllSourcesOrder.setInternalHeaderProvider(headerProvider_with_quota); builder_setQuotaFromAllSourcesOrder.setCredentialsProvider(credentialsProvider_with_quota); - Truth.assertThat(builder_setQuotaOnly.getQuotaProjectID()) + Truth.assertThat(builder_setQuotaOnly.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_BUILDERS); - Truth.assertThat(builder_setQuotaFromHeadersOnly.getQuotaProjectID()) + Truth.assertThat(builder_setQuotaFromHeadersOnly.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_HEADER_VALUE); - Truth.assertThat(builder_setQuotaFromHeadersAndBuilders.getQuotaProjectID()) + Truth.assertThat(builder_setQuotaFromHeadersAndBuilders.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_BUILDERS); - Truth.assertThat((builder_setQuotaFromInternalHeadersOnly).getQuotaProjectID()) + Truth.assertThat((builder_setQuotaFromInternalHeadersOnly).getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_INTERNAL_HEADER_VALUE); - Truth.assertThat(builder_setQuotaFromInternalHeadersAndBuilders.getQuotaProjectID()) + Truth.assertThat(builder_setQuotaFromInternalHeadersAndBuilders.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_BUILDERS); - Truth.assertThat(builder_setQuotaFromCredentialsProvider.getQuotaProjectID()) + Truth.assertThat(builder_setQuotaFromCredentialsProvider.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_CREDENTIALS_VALUE); - Truth.assertThat(builder_setQuotaFromCredentialsProviderAndBuilder.getQuotaProjectID()) + Truth.assertThat(builder_setQuotaFromCredentialsProviderAndBuilder.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_BUILDERS); - Truth.assertThat(builder_setQuotaFromAllSources.getQuotaProjectID()) + Truth.assertThat(builder_setQuotaFromAllSources.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_BUILDERS); - Truth.assertThat(builder_setQuotaFromAllSourcesOrder.getQuotaProjectID()) + Truth.assertThat(builder_setQuotaFromAllSourcesOrder.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_BUILDERS); } @Test - public void testBuilderFromClientContext_QuotaProjectID() { + public void testBuilderFromClientContext_QuotaProjectId() { ApiCallContext callContext = FakeCallContext.createDefault(); ClientContext clientContextQuotaOnly = ClientContext.newBuilder() .setTransportChannel(Mockito.mock(TransportChannel.class)) .setDefaultCallContext(callContext) - .setQuotaProjectID(QUOTA_PROJECT_ID_FROM_CONTEXT) + .setQuotaProjectId(QUOTA_PROJECT_ID_FROM_CONTEXT) .build(); FakeClientSettings.Builder builderQuotaOnly = new FakeClientSettings.Builder(clientContextQuotaOnly); @@ -457,7 +457,7 @@ public void testBuilderFromClientContext_QuotaProjectID() { .setTransportChannel(Mockito.mock(TransportChannel.class)) .setDefaultCallContext(callContext) .setCredentials(credentialsWithQuotaProject) - .setQuotaProjectID(QUOTA_PROJECT_ID_FROM_CONTEXT) + .setQuotaProjectId(QUOTA_PROJECT_ID_FROM_CONTEXT) .build(); FakeClientSettings.Builder builderCredentialAndQuota = new FakeClientSettings.Builder(clientContextCredentialAndQuota); @@ -475,7 +475,7 @@ public void testBuilderFromClientContext_QuotaProjectID() { ClientContext.newBuilder() .setTransportChannel(Mockito.mock(TransportChannel.class)) .setDefaultCallContext(callContext) - .setQuotaProjectID(QUOTA_PROJECT_ID_FROM_CONTEXT) + .setQuotaProjectId(QUOTA_PROJECT_ID_FROM_CONTEXT) .setHeaders(ImmutableMap.of(QUOTA_PROJECT_ID_KEY, QUOTA_PROJECT_ID_FROM_HEADER_VALUE)) .build(); FakeClientSettings.Builder builderHeadersAndQuota = @@ -497,7 +497,7 @@ public void testBuilderFromClientContext_QuotaProjectID() { .setDefaultCallContext(callContext) .setInternalHeaders( ImmutableMap.of(QUOTA_PROJECT_ID_KEY, QUOTA_PROJECT_ID_FROM_INTERNAL_HEADER_VALUE)) - .setQuotaProjectID(QUOTA_PROJECT_ID_FROM_CONTEXT) + .setQuotaProjectId(QUOTA_PROJECT_ID_FROM_CONTEXT) .build(); FakeClientSettings.Builder builderInternalHeadersAndQuota = new FakeClientSettings.Builder(clientContextInternalHeadersAndQuota); @@ -509,27 +509,27 @@ public void testBuilderFromClientContext_QuotaProjectID() { .setHeaders( ImmutableMap.of(QUOTA_PROJECT_ID_KEY, QUOTA_PROJECT_ID_FROM_INTERNAL_HEADER_VALUE)) .setCredentials(credentialsWithQuotaProject) - .setQuotaProjectID(QUOTA_PROJECT_ID_FROM_CONTEXT) + .setQuotaProjectId(QUOTA_PROJECT_ID_FROM_CONTEXT) .setInternalHeaders( ImmutableMap.of(QUOTA_PROJECT_ID_KEY, QUOTA_PROJECT_ID_FROM_INTERNAL_HEADER_VALUE)) .build(); FakeClientSettings.Builder builderQuotaFromAllSources = new FakeClientSettings.Builder(clientContextQuotaFromAllSources); - Truth.assertThat(builderQuotaOnly.getQuotaProjectID()).isEqualTo(QUOTA_PROJECT_ID_FROM_CONTEXT); - Truth.assertThat(builderCredentialOnly.getQuotaProjectID()) + Truth.assertThat(builderQuotaOnly.getQuotaProjectId()).isEqualTo(QUOTA_PROJECT_ID_FROM_CONTEXT); + Truth.assertThat(builderCredentialOnly.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_CREDENTIALS_VALUE); - Truth.assertThat(builderCredentialAndQuota.getQuotaProjectID()) + Truth.assertThat(builderCredentialAndQuota.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_CONTEXT); - Truth.assertThat(builderHeadersOnly.getQuotaProjectID()) + Truth.assertThat(builderHeadersOnly.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_HEADER_VALUE); - Truth.assertThat(builderHeadersAndQuota.getQuotaProjectID()) + Truth.assertThat(builderHeadersAndQuota.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_CONTEXT); - Truth.assertThat(builderInternalHeadersOnly.getQuotaProjectID()) + Truth.assertThat(builderInternalHeadersOnly.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_INTERNAL_HEADER_VALUE); - Truth.assertThat(builderInternalHeadersAndQuota.getQuotaProjectID()) + Truth.assertThat(builderInternalHeadersAndQuota.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_CONTEXT); - Truth.assertThat(builderQuotaFromAllSources.getQuotaProjectID()) + Truth.assertThat(builderQuotaFromAllSources.getQuotaProjectId()) .isEqualTo(QUOTA_PROJECT_ID_FROM_CONTEXT); } }