Skip to content

Commit 7c93bb5

Browse files
committed
maxResults always > 0
1 parent fc113f8 commit 7c93bb5

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,9 @@ public void setProjectId(String projectId) {
671671
}
672672

673673
public void setMaxResults(Long maxResults) {
674-
if (maxResults != null) {
675-
validateNonNegative(maxResults, BigQueryJdbcUrlUtility.MAX_RESULTS_PROPERTY_NAME);
674+
if (maxResults != null && maxResults <= 0) {
675+
throw new BigQueryJdbcRuntimeException(
676+
"Invalid value for MaxResults. It must be greater than 0.");
676677
}
677678
this.maxResults = maxResults;
678679
}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,18 +228,16 @@ public void testInvalidConnectionProperties() {
228228

229229
String url6 = "jdbc:bigquery://;RetryMaxDelay=-1";
230230
assertThrows(BigQueryJdbcRuntimeException.class, () -> DataSource.fromUrl(url6));
231-
}
232231

233-
@Test
234-
public void testValidZeroConnectionProperties() {
235-
String url = "jdbc:bigquery://;MaxResults=0";
236-
assertDoesNotThrow(() -> DataSource.fromUrl(url));
232+
String url7 = "jdbc:bigquery://;MaxResults=0";
233+
assertThrows(BigQueryJdbcRuntimeException.class, () -> DataSource.fromUrl(url7));
237234
}
238235

239236
@Test
240237
public void testInvalidSetterValues() {
241238
DataSource ds = new DataSource();
242239
assertThrows(BigQueryJdbcRuntimeException.class, () -> ds.setMaxResults(-1L));
240+
assertThrows(BigQueryJdbcRuntimeException.class, () -> ds.setMaxResults(0L));
243241
assertThrows(BigQueryJdbcRuntimeException.class, () -> ds.setTimeout(-1));
244242
assertThrows(BigQueryJdbcRuntimeException.class, () -> ds.setJobTimeout(-1));
245243
assertThrows(BigQueryJdbcRuntimeException.class, () -> ds.setRetryInitialDelay(-1));

0 commit comments

Comments
 (0)