Skip to content

Commit 902f799

Browse files
committed
remove getMaxResults for listProjects
1 parent f816861 commit 902f799

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnection.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.api.gax.rpc.TransportChannelProvider;
2727
import com.google.auth.Credentials;
2828
import com.google.cloud.bigquery.BigQuery;
29-
import com.google.cloud.bigquery.BigQuery.ProjectListOption;
3029
import com.google.cloud.bigquery.BigQueryException;
3130
import com.google.cloud.bigquery.BigQueryOptions;
3231
import com.google.cloud.bigquery.ConnectionProperty;
@@ -1332,8 +1331,7 @@ public synchronized List<String> getDiscoveredProjects() throws SQLException {
13321331
try {
13331332
BigQuery bigQuery = getBigQuery();
13341333
List<String> projects = new ArrayList<>();
1335-
Page<Project> projectPage =
1336-
bigQuery.listProjects(ProjectListOption.pageSize(getMaxResults()));
1334+
Page<Project> projectPage = bigQuery.listProjects();
13371335
for (Project project : projectPage.iterateAll()) {
13381336
projects.add(project.getProjectId());
13391337
}

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryConnectionTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static org.junit.jupiter.api.Assertions.assertSame;
2424
import static org.junit.jupiter.api.Assertions.assertThrows;
2525
import static org.junit.jupiter.api.Assertions.assertTrue;
26-
import static org.mockito.Mockito.any;
2726
import static org.mockito.Mockito.mock;
2827
import static org.mockito.Mockito.times;
2928
import static org.mockito.Mockito.verify;
@@ -543,15 +542,15 @@ public void testGetDiscoveredProjects_Success() throws Exception {
543542
when(project2.getProjectId()).thenReturn("discovered-p2");
544543

545544
when(mockPage.iterateAll()).thenReturn(Arrays.asList(project1, project2));
546-
when(mockBigQuery.listProjects(any(BigQuery.ProjectListOption.class))).thenReturn(mockPage);
545+
when(mockBigQuery.listProjects()).thenReturn(mockPage);
547546

548547
List<String> discovered = connection.getDiscoveredProjects();
549548
assertEquals(Arrays.asList("discovered-p1", "discovered-p2"), discovered);
550549

551550
// Verify caching: second call should not invoke listProjects again
552551
List<String> discoveredCached = connection.getDiscoveredProjects();
553552
assertSame(discovered, discoveredCached);
554-
verify(mockBigQuery, times(1)).listProjects(any(BigQuery.ProjectListOption.class));
553+
verify(mockBigQuery, times(1)).listProjects();
555554
}
556555
}
557556

@@ -562,7 +561,7 @@ public void testGetDiscoveredProjects_BigQueryExceptionThrown() throws Exception
562561
connection.bigQuery = mockBigQuery;
563562

564563
BigQueryException exception = new BigQueryException(403, "Access Denied");
565-
when(mockBigQuery.listProjects(any(BigQuery.ProjectListOption.class))).thenThrow(exception);
564+
when(mockBigQuery.listProjects()).thenThrow(exception);
566565

567566
// Verify that it throws BigQueryJdbcException
568567
BigQueryJdbcException ex =
@@ -582,7 +581,7 @@ public void testGetDiscoveredProjects_BigQueryExceptionThrown() throws Exception
582581
() -> {
583582
connection.getDiscoveredProjects();
584583
});
585-
verify(mockBigQuery, times(2)).listProjects(any(BigQuery.ProjectListOption.class));
584+
verify(mockBigQuery, times(2)).listProjects();
586585
}
587586
}
588587

@@ -593,7 +592,7 @@ public void testGetDiscoveredProjects_OtherExceptionThrown() throws Exception {
593592
connection.bigQuery = mockBigQuery;
594593

595594
RuntimeException exception = new RuntimeException("Generic Network Failure");
596-
when(mockBigQuery.listProjects(any(BigQuery.ProjectListOption.class))).thenThrow(exception);
595+
when(mockBigQuery.listProjects()).thenThrow(exception);
597596

598597
// Verify that it throws BigQueryJdbcException
599598
BigQueryJdbcException ex =

0 commit comments

Comments
 (0)