From aa3879e6501108475c6059e377dd8bc69d86e247 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 29 Jul 2021 20:02:16 +0000 Subject: [PATCH 1/5] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efbae908e..6cbe87c4c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.13.1 + 1.0.0 From 5819430776c805322c1409ae2fa4752b3aa68bb8 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Wed, 4 Aug 2021 14:44:06 -0400 Subject: [PATCH 2/5] chore: update declaration of some test types to accommodate new java8 overload resolution behavior --- .../google/cloud/bigquery/JobStatisticsTest.java | 13 +++++++++---- .../google/cloud/bigquery/it/ITBigQueryTest.java | 9 +++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java index a28eae26b..edd76f821 100644 --- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java +++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobStatisticsTest.java @@ -322,26 +322,31 @@ public void testIncomplete() { new com.google.api.services.bigquery.model.JobStatistics() .setCreationTime(1234L) .setStartTime(5678L)); + JobStatistics jobStatistics; job.setConfiguration( new com.google.api.services.bigquery.model.JobConfiguration() .setCopy(new com.google.api.services.bigquery.model.JobConfigurationTableCopy())); - assertThat(JobStatistics.fromPb(job)).isInstanceOf(CopyStatistics.class); + jobStatistics = JobStatistics.fromPb(job); + assertThat(jobStatistics).isInstanceOf(CopyStatistics.class); job.setConfiguration( new com.google.api.services.bigquery.model.JobConfiguration() .setLoad(new com.google.api.services.bigquery.model.JobConfigurationLoad())); - assertThat(JobStatistics.fromPb(job)).isInstanceOf(LoadStatistics.class); + jobStatistics = JobStatistics.fromPb(job); + assertThat(jobStatistics).isInstanceOf(LoadStatistics.class); job.setConfiguration( new com.google.api.services.bigquery.model.JobConfiguration() .setExtract(new com.google.api.services.bigquery.model.JobConfigurationExtract())); - assertThat(JobStatistics.fromPb(job)).isInstanceOf(ExtractStatistics.class); + jobStatistics = JobStatistics.fromPb(job); + assertThat(jobStatistics).isInstanceOf(ExtractStatistics.class); job.setConfiguration( new com.google.api.services.bigquery.model.JobConfiguration() .setQuery(new com.google.api.services.bigquery.model.JobConfigurationQuery())); - assertThat(JobStatistics.fromPb(job)).isInstanceOf(QueryStatistics.class); + jobStatistics = JobStatistics.fromPb(job); + assertThat(jobStatistics).isInstanceOf(QueryStatistics.class); } private void compareExtractStatistics(ExtractStatistics expected, ExtractStatistics value) { diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index 1e0291757..025e7d461 100644 --- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -1202,9 +1202,10 @@ public void testUpdateTimePartitioning() { .build(); Table table = bigquery.create(TableInfo.of(tableId, tableDefinition)); - assertThat(table.getDefinition()).isInstanceOf(StandardTableDefinition.class); + TableDefinition definition = table.getDefinition(); + assertThat(definition).isInstanceOf(StandardTableDefinition.class); assertThat( - ((StandardTableDefinition) table.getDefinition()) + ((StandardTableDefinition) definition) .getTimePartitioning() .getExpirationMs()) .isNull(); @@ -1220,7 +1221,7 @@ public void testUpdateTimePartitioning() { .build() .update(BigQuery.TableOption.fields(BigQuery.TableField.TIME_PARTITIONING)); assertThat( - ((StandardTableDefinition) table.getDefinition()) + ((StandardTableDefinition) definition) .getTimePartitioning() .getExpirationMs()) .isEqualTo(42L); @@ -1236,7 +1237,7 @@ public void testUpdateTimePartitioning() { .build() .update(BigQuery.TableOption.fields(BigQuery.TableField.TIME_PARTITIONING)); assertThat( - ((StandardTableDefinition) table.getDefinition()) + ((StandardTableDefinition) definition) .getTimePartitioning() .getExpirationMs()) .isNull(); From f59cbc0f06f95c675256be6085f9d634291e4e90 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Wed, 4 Aug 2021 15:50:37 -0400 Subject: [PATCH 3/5] chore: run :format --- .../google/cloud/bigquery/it/ITBigQueryTest.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index 025e7d461..d8203b316 100644 --- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -1204,10 +1204,7 @@ public void testUpdateTimePartitioning() { Table table = bigquery.create(TableInfo.of(tableId, tableDefinition)); TableDefinition definition = table.getDefinition(); assertThat(definition).isInstanceOf(StandardTableDefinition.class); - assertThat( - ((StandardTableDefinition) definition) - .getTimePartitioning() - .getExpirationMs()) + assertThat(((StandardTableDefinition) definition).getTimePartitioning().getExpirationMs()) .isNull(); table = @@ -1220,10 +1217,7 @@ public void testUpdateTimePartitioning() { .build()) .build() .update(BigQuery.TableOption.fields(BigQuery.TableField.TIME_PARTITIONING)); - assertThat( - ((StandardTableDefinition) definition) - .getTimePartitioning() - .getExpirationMs()) + assertThat(((StandardTableDefinition) definition).getTimePartitioning().getExpirationMs()) .isEqualTo(42L); table = @@ -1236,10 +1230,7 @@ public void testUpdateTimePartitioning() { .build()) .build() .update(BigQuery.TableOption.fields(BigQuery.TableField.TIME_PARTITIONING)); - assertThat( - ((StandardTableDefinition) definition) - .getTimePartitioning() - .getExpirationMs()) + assertThat(((StandardTableDefinition) definition).getTimePartitioning().getExpirationMs()) .isNull(); table.delete(); From 301b66988313723b4a0ea4bf896f2dd114ce834c Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Thu, 5 Aug 2021 13:37:20 -0400 Subject: [PATCH 4/5] fix broken IT --- .../test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index d8203b316..24d3a9bd4 100644 --- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -1217,7 +1217,8 @@ public void testUpdateTimePartitioning() { .build()) .build() .update(BigQuery.TableOption.fields(BigQuery.TableField.TIME_PARTITIONING)); - assertThat(((StandardTableDefinition) definition).getTimePartitioning().getExpirationMs()) + TableDefinition updatedDefinition = table.getDefinition(); + assertThat(((StandardTableDefinition) updatedDefinition).getTimePartitioning().getExpirationMs()) .isEqualTo(42L); table = From 984f6f48036784171542b43b25dc7e373af17ac2 Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Thu, 5 Aug 2021 13:40:59 -0400 Subject: [PATCH 5/5] fix lint --- .../java/com/google/cloud/bigquery/it/ITBigQueryTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java index 24d3a9bd4..ff4068940 100644 --- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java +++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java @@ -1217,8 +1217,9 @@ public void testUpdateTimePartitioning() { .build()) .build() .update(BigQuery.TableOption.fields(BigQuery.TableField.TIME_PARTITIONING)); - TableDefinition updatedDefinition = table.getDefinition(); - assertThat(((StandardTableDefinition) updatedDefinition).getTimePartitioning().getExpirationMs()) + TableDefinition updatedDefinition = table.getDefinition(); + assertThat( + ((StandardTableDefinition) updatedDefinition).getTimePartitioning().getExpirationMs()) .isEqualTo(42L); table =