Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit b6cb64a

Browse files
chore: clean up warnings pass 3 (#2847)
suppress warnings for refreshing channel, the usages cant be removed currently
1 parent 5dc6829 commit b6cb64a

14 files changed

Lines changed: 48 additions & 42 deletions

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,31 @@ public static Builder newBuilderForEmulator(int port) {
119119
* port number.
120120
*/
121121
public static Builder newBuilderForEmulator(String hostname, int port) {
122-
Builder builder = new Builder();
123-
124-
builder
125-
.stubSettings()
126-
.setCredentialsProvider(NoCredentialsProvider.create())
127-
.setEndpoint(hostname + ":" + port)
128-
// disable channel refreshing when creating an emulator
129-
.setRefreshingChannel(false)
130-
.setMetricsProvider(NoopMetricsProvider.INSTANCE) // disable exporting metrics for emulator
131-
.disableInternalMetrics()
132-
.setTransportChannelProvider(
133-
InstantiatingGrpcChannelProvider.newBuilder()
134-
.setMaxInboundMessageSize(256 * 1024 * 1024)
135-
.setChannelPoolSettings(ChannelPoolSettings.staticallySized(1))
136-
.setChannelConfigurator(ManagedChannelBuilder::usePlaintext)
137-
.setKeepAliveTimeDuration(
138-
java.time.Duration.ofSeconds(61)) // sends ping in this interval
139-
.setKeepAliveTimeoutDuration(
140-
java.time.Duration.ofSeconds(
141-
10)) // wait this long before considering the connection dead
142-
.build());
122+
BigtableDataSettings.Builder builder = new BigtableDataSettings.Builder();
123+
124+
// TODO: remove the suppression once setRefreshingChannel is no longer necessary
125+
@SuppressWarnings({"deprecation", "VariableUnused"})
126+
EnhancedBigtableStubSettings.Builder ignored =
127+
builder
128+
.stubSettings()
129+
.setCredentialsProvider(NoCredentialsProvider.create())
130+
.setEndpoint(hostname + ":" + port)
131+
// disable channel refreshing when creating an emulator
132+
.setRefreshingChannel(false)
133+
.setMetricsProvider(
134+
NoopMetricsProvider.INSTANCE) // disable exporting metrics for emulator
135+
.disableInternalMetrics()
136+
.setTransportChannelProvider(
137+
InstantiatingGrpcChannelProvider.newBuilder()
138+
.setMaxInboundMessageSize(256 * 1024 * 1024)
139+
.setChannelPoolSettings(ChannelPoolSettings.staticallySized(1))
140+
.setChannelConfigurator(ManagedChannelBuilder::usePlaintext)
141+
.setKeepAliveTimeDuration(
142+
java.time.Duration.ofSeconds(61)) // sends ping in this interval
143+
.setKeepAliveTimeoutDuration(
144+
java.time.Duration.ofSeconds(
145+
10)) // wait this long before considering the connection dead
146+
.build());
143147

144148
LOGGER.info("Connecting to the Bigtable emulator at " + hostname + ":" + port);
145149
return builder;

google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableClientContext.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public static BigtableClientContext create(
151151
ChannelPrimer channelPrimer = NoOpChannelPrimer.create();
152152

153153
// Inject channel priming if enabled
154-
if (builder.isRefreshingChannel()) {
154+
if (isRefreshingEnabled(builder)) {
155155
channelPrimer =
156156
BigtableChannelPrimer.create(
157157
builder.getProjectId(),
@@ -182,6 +182,11 @@ public static BigtableClientContext create(
182182
}
183183
}
184184

185+
@SuppressWarnings("deprecation")
186+
private static boolean isRefreshingEnabled(EnhancedBigtableStubSettings.Builder b) {
187+
return b.isRefreshingChannel();
188+
}
189+
185190
private static void configureGrpcOtel(
186191
InstantiatingGrpcChannelProvider.Builder transportProvider, Metrics metrics) {
187192
@SuppressWarnings("rawtypes")

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientFactoryTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,8 @@ public void testCreateForInstanceWithAppProfileHasCorrectSettings() throws Excep
255255
@Test
256256
public void testCreateWithRefreshingChannel() throws Exception {
257257
int poolSize = 3;
258+
// TODO: remove the suppression when setRefreshingChannel can be removed
259+
@SuppressWarnings("deprecation")
258260
BigtableDataSettings.Builder builder =
259261
BigtableDataSettings.newBuilderForEmulator(server.getPort())
260262
.setProjectId(DEFAULT_PROJECT_ID)

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataSettingsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public class BigtableDataSettingsTest {
2727

2828
@Test
2929
public void testToString() {
30+
// TODO: figure out how avoid using setRefreshingChannel
31+
@SuppressWarnings("deprecation")
3032
BigtableDataSettings settings =
3133
BigtableDataSettings.newBuilder()
3234
.setProjectId("our-project-2-12")

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/PreparedStatementImplTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public class PreparedStatementImplTest {
8080
public void setUp() throws IOException {
8181
service = new TestBigtableSqlService();
8282
serverRule.getServiceRegistry().addService(service);
83+
8384
BigtableDataSettings.Builder settings =
8485
BigtableDataSettings.newBuilder()
8586
.setProjectId(TestBigtableSqlService.DEFAULT_PROJECT_ID)
@@ -91,8 +92,6 @@ public void setUp() throws IOException {
9192
.setTransportChannelProvider(
9293
FixedTransportChannelProvider.create(
9394
GrpcTransportChannel.create(serverRule.getChannel())))
94-
// Refreshing channel doesn't work with FixedTransportChannelProvider
95-
.setRefreshingChannel(false)
9695
.build();
9796
// Remove log noise from client side metrics
9897
settings.setMetricsProvider(NoopMetricsProvider.INSTANCE).disableInternalMetrics();

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/tracers/BuiltinMetricsTracerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ public void sendHeaders(Metadata headers) {
234234
.setProjectId(PROJECT_ID)
235235
.setInstanceId(INSTANCE_ID)
236236
.setAppProfileId(APP_PROFILE_ID)
237-
.setRefreshingChannel(false)
238237
.build();
239238
EnhancedBigtableStubSettings.Builder stubSettingsBuilder =
240239
settings.getStubSettings().toBuilder();

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubCloseRetryTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public void setUp() throws Exception {
6868
BigtableDataSettings.newBuilderForEmulator(server.getPort())
6969
.setProjectId(PROJECT_ID)
7070
.setInstanceId(INSTANCE_ID)
71-
.setCredentialsProvider(NoCredentialsProvider.create())
72-
.setRefreshingChannel(false);
71+
.setCredentialsProvider(NoCredentialsProvider.create());
7372

7473
stub = EnhancedBigtableStub.create(settingBuilder.build().getStubSettings());
7574
}

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.threeten.bp.Duration;
5656

5757
@RunWith(JUnit4.class)
58+
@SuppressWarnings("deprecation") // TODO: remove this
5859
public class EnhancedBigtableStubSettingsTest {
5960
@Test
6061
public void instanceNameIsRequiredTest() {

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,8 @@ public void testBatchJwtAudience()
261261
ManagedChannel channel =
262262
ManagedChannelBuilder.forAddress("localhost", server.getPort()).usePlaintext().build();
263263

264+
// TODO: remove this suppression when setRefreshingChannel can be removed
265+
@SuppressWarnings("deprecation")
264266
EnhancedBigtableStubSettings settings =
265267
EnhancedBigtableStubSettings.newBuilder()
266268
.setProjectId("fake-project")
@@ -311,8 +313,9 @@ public void testFeatureFlags() throws InterruptedException, IOException, Executi
311313
}
312314

313315
@Test
314-
public void testPingAndWarmFeatureFlags()
315-
throws InterruptedException, IOException, ExecutionException {
316+
public void testPingAndWarmFeatureFlags() throws InterruptedException, IOException {
317+
// TODO: remove the suppression once setRefreshingChannel can be removed
318+
@SuppressWarnings("deprecation")
316319
EnhancedBigtableStubSettings settings =
317320
defaultSettings.toBuilder().setRefreshingChannel(true).build();
318321
try (EnhancedBigtableStub ignored = EnhancedBigtableStub.create(settings)) {
@@ -543,6 +546,8 @@ public void testCreateReadRowsRawCallable() throws InterruptedException {
543546

544547
@Test
545548
public void testChannelPrimerConfigured() throws IOException {
549+
// TODO: remove the suppression once setRefreshingChannel can be removed
550+
@SuppressWarnings("deprecation")
546551
EnhancedBigtableStubSettings settings =
547552
defaultSettings.toBuilder().setRefreshingChannel(true).build();
548553

@@ -712,8 +717,7 @@ public void testBulkMutationFlowControllerConfigured() throws Exception {
712717
@Test
713718
public void testCallContextPropagatedInMutationBatcher()
714719
throws IOException, InterruptedException, ExecutionException {
715-
EnhancedBigtableStubSettings settings =
716-
defaultSettings.toBuilder().setRefreshingChannel(true).build();
720+
EnhancedBigtableStubSettings settings = defaultSettings.toBuilder().build();
717721

718722
try (EnhancedBigtableStub stub = EnhancedBigtableStub.create(settings)) {
719723
// clear the previous contexts
@@ -739,8 +743,7 @@ public void testCallContextPropagatedInMutationBatcher()
739743
@Test
740744
public void testCallContextPropagatedInReadBatcher()
741745
throws IOException, InterruptedException, ExecutionException {
742-
EnhancedBigtableStubSettings settings =
743-
defaultSettings.toBuilder().setRefreshingChannel(true).build();
746+
EnhancedBigtableStubSettings settings = defaultSettings.toBuilder().build();
744747

745748
try (EnhancedBigtableStub stub = EnhancedBigtableStub.create(settings)) {
746749
// clear the previous contexts

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/RetryInfoTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ public void close(Status status, Metadata trailers) {
139139
BigtableDataSettings.Builder settings =
140140
BigtableDataSettings.newBuilderForEmulator(server.getPort())
141141
.setProjectId("fake-project")
142-
.setInstanceId("fake-instance")
143-
.setRefreshingChannel(false);
142+
.setInstanceId("fake-instance");
144143

145144
this.client = BigtableDataClient.create(settings.build());
146145
}

0 commit comments

Comments
 (0)