Skip to content

Commit 24f3e90

Browse files
committed
fix(bigtable): mock stubs without annotations for Java 8 compatibility
1 parent c2d3eb2 commit 24f3e90

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public class BigtableInstanceAdminClientTests {
141141
.build()))
142142
.build();
143143

144-
@Mock private BigtableInstanceAdminStub mockStub;
144+
private BigtableInstanceAdminStub mockStub;
145145

146146
@Mock
147147
private OperationCallable<
@@ -310,6 +310,8 @@ public class BigtableInstanceAdminClientTests {
310310

311311
@Before
312312
public void setUp() {
313+
mockStub =
314+
Mockito.mock(BigtableInstanceAdminStub.class, Mockito.withSettings().withoutAnnotations());
313315
adminClient = BigtableInstanceAdminClient.create(PROJECT_ID, mockStub);
314316
}
315317

java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClientV2Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public class BigtableInstanceAdminClientV2Test {
2828

2929
@Test
3030
public void testCreateWithStub() {
31-
BigtableInstanceAdminStub mockStub = Mockito.mock(BigtableInstanceAdminStub.class);
31+
BigtableInstanceAdminStub mockStub =
32+
Mockito.mock(BigtableInstanceAdminStub.class, Mockito.withSettings().withoutAnnotations());
3233
BigtableInstanceAdminClientV2 client = new BigtableInstanceAdminClientV2(mockStub);
3334

3435
assertThat(client).isNotNull();

java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public class BigtableTableAdminClientTests {
149149
NameUtil.formatTableName(PROJECT_ID, INSTANCE_ID, TABLE_ID);
150150

151151
private BigtableTableAdminClient adminClient;
152-
@Mock private EnhancedBigtableTableAdminStub mockStub;
152+
private EnhancedBigtableTableAdminStub mockStub;
153153

154154
@Mock
155155
private UnaryCallable<
@@ -290,6 +290,9 @@ public class BigtableTableAdminClientTests {
290290

291291
@Before
292292
public void setUp() {
293+
mockStub =
294+
Mockito.mock(
295+
EnhancedBigtableTableAdminStub.class, Mockito.withSettings().withoutAnnotations());
293296
adminClient = BigtableTableAdminClient.create(PROJECT_ID, INSTANCE_ID, mockStub);
294297
}
295298

java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientV2Test.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class BigtableTableAdminClientV2Test {
4848
private static final String TABLE_NAME =
4949
"projects/my-project/instances/my-instance/tables/my-table";
5050

51-
@Mock private GrpcBigtableTableAdminStub mockStub;
51+
private GrpcBigtableTableAdminStub mockStub;
5252

5353
@Mock private AwaitConsistencyCallableV2 mockAwaitConsistencyCallable;
5454

@@ -60,6 +60,8 @@ public class BigtableTableAdminClientV2Test {
6060

6161
@Before
6262
public void setUp() {
63+
mockStub =
64+
Mockito.mock(GrpcBigtableTableAdminStub.class, Mockito.withSettings().withoutAnnotations());
6365
client =
6466
new BigtableTableAdminClientV2(
6567
mockStub, null, false, mockAwaitConsistencyCallable, mockOptimizeRestoredTableCallable);

0 commit comments

Comments
 (0)