Skip to content

Commit ad4128c

Browse files
committed
chore: Address failing tests and GCA
1 parent 7952544 commit ad4128c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/DataFormatOptions.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ public abstract static class Builder {
6060

6161
public abstract Builder timestampFormatOptions(TimestampFormatOptions timestampFormatOptions);
6262

63-
abstract TimestampFormatOptions timestampFormatOptions();
64-
6563
public abstract DataFormatOptions build();
6664
}
6765

@@ -75,7 +73,7 @@ com.google.api.services.bigquery.model.DataFormatOptions toPb() {
7573

7674
static DataFormatOptions fromPb(
7775
com.google.api.services.bigquery.model.DataFormatOptions request) {
78-
AutoValue_DataFormatOptions.Builder builder = new AutoValue_DataFormatOptions.Builder();
76+
DataFormatOptions.Builder builder = newBuilder();
7977
if (request.getUseInt64Timestamp() != null) {
8078
builder.useInt64Timestamp(request.getUseInt64Timestamp());
8179
}

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryOptionsTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testInvalidTransport() {
4343

4444
@Test
4545
public void dataFormatOptions_createdByDefault() {
46-
BigQueryOptions options = BigQueryOptions.newBuilder().build();
46+
BigQueryOptions options = BigQueryOptions.newBuilder().setProjectId("project-id").build();
4747

4848
assertNotNull(options.getDataFormatOptions());
4949
assertFalse(options.getDataFormatOptions().useInt64Timestamp());
@@ -57,6 +57,7 @@ public void nonBuilderSetUseInt64Timestamp_capturedInDataFormatOptions() {
5757
BigQueryOptions options =
5858
BigQueryOptions.newBuilder()
5959
.setDataFormatOptions(DataFormatOptions.newBuilder().useInt64Timestamp(false).build())
60+
.setProjectId("project-id")
6061
.build();
6162
options.setUseInt64Timestamps(true);
6263

@@ -65,15 +66,16 @@ public void nonBuilderSetUseInt64Timestamp_capturedInDataFormatOptions() {
6566

6667
@Test
6768
public void nonBuilderSetUseInt64Timestamp_overridesEverything() {
68-
BigQueryOptions options = BigQueryOptions.newBuilder().build();
69+
BigQueryOptions options = BigQueryOptions.newBuilder().setProjectId("project-id").build();
6970
options.setUseInt64Timestamps(true);
7071

7172
assertTrue(options.getDataFormatOptions().useInt64Timestamp());
7273
}
7374

7475
@Test
7576
public void noDataFormatOptions_capturesUseInt64TimestampSetInBuilder() {
76-
BigQueryOptions options = BigQueryOptions.newBuilder().setUseInt64Timestamps(true).build();
77+
BigQueryOptions options =
78+
BigQueryOptions.newBuilder().setUseInt64Timestamps(true).setProjectId("project-id").build();
7779

7880
assertTrue(options.getDataFormatOptions().useInt64Timestamp());
7981
}
@@ -82,6 +84,7 @@ public void noDataFormatOptions_capturesUseInt64TimestampSetInBuilder() {
8284
public void dataFormatOptionsSetterHasPrecedence() {
8385
BigQueryOptions options =
8486
BigQueryOptions.newBuilder()
87+
.setProjectId("project-id")
8588
.setDataFormatOptions(DataFormatOptions.newBuilder().useInt64Timestamp(true).build())
8689
.setUseInt64Timestamps(false)
8790
.build();

0 commit comments

Comments
 (0)